Full chaining now works, fixed a bug I didn't notice a few minutes ago...

2 files changed, 4 insertions, 1 deletions

diff --git a/build.conf b/build.conf
index 18e4eec..6da97e2 100644
--- a/build.conf
+++ b/build.conf
@@ -4,7 +4,7 @@ default action: check targets()
 "clean" action: clean targets()
 "rebuild" action: clean "build", check "build"
 
-set "CXXFLAGS" += "-ggdb -Ilibbu++/src"
+set "CXXFLAGS" += "-ggdb"
 set "LDFLAGS" += "-Llibbu++ -lbu++ -ldl"
 
 "build":
diff --git a/src/rule.cpp b/src/rule.cpp
index f1b0317..61ea632 100644
--- a/src/rule.cpp
+++ b/src/rule.cpp
@@ -20,6 +20,7 @@ StringList Rule::execute( Build &bld, StringList &lInput, PerformList &lPerf )
 
         for( RuleList::iterator i = rl.begin(); i != rl.end(); i++ )
         {
+                (*i)->setTarget( sTarget );
                 StringList tmp = (*i)->execute( bld, lInput, lPerf );
                 lOutput.insert( lOutput.end(), tmp.begin(), tmp.end() );
         }
@@ -89,6 +90,7 @@ StringList Rule::execute( Build &bld, StringList &lInput, PerformList &lPerf )
                         {
                                 VarMap mTmp;
                                 StringList cont;
+                                cont.push_front( sTarget );
                                 cont.push_front( (*i) );
                                 std::string target = bld.replVars( (*j), &cont, NULL );
                                 mTmp["target"] = target;
@@ -104,6 +106,7 @@ StringList Rule::execute( Build &bld, StringList &lInput, PerformList &lPerf )
                                          k != lPerform.end(); k++ )
                                 {
                                         StringList cont2;
+                                        cont2.push_front( sTarget );
                                         cont2.push_front( (*i) );
                                         cont2.push_front( target );
                                         Perform *p = (*k)->duplicate( bld, &cont2, &mTmp );