Get rid of the install flags, which weren't entirely correct anyway

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 1aab4b1fdef5a2f16fc04d4a674a0b5efb043a71..577438b3528dce736aa3c22077e0857a24f5a0b4 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,8 +1,9 @@
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
+#include <msp/strings/format.h>
 #include "builder.h"
 #include "filetarget.h"
-#include "package.h"
+#include "sourcepackage.h"
 #include "target.h"
 #include "task.h"
 #include "tool.h"
@@ -54,12 +55,13 @@ void Target::force_rebuild()
        mark_rebuild("Forced rebuild");
 }
 
-void Target::add_depend(Target *dep)
+void Target::add_depend(Target &dep)
 {
-       if(dep==this)
+       if(&dep==this)
                throw invalid_argument("Target::add_depend");
-       depends.push_back(dep);
-       dep->signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
+       depends.push_back(&dep);
+       if(state>PREPARING)
+               dep.signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
 }
 
 void Target::prepare()
@@ -74,6 +76,11 @@ void Target::prepare()
 
        state = PREPARING;
        find_depends();
+       if(tool)
+       {
+               if(FileTarget *tool_exe = tool->get_executable())
+                       add_depend(*tool_exe);
+       }
 
        for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
                (*i)->prepare();
@@ -81,12 +88,16 @@ void Target::prepare()
        check_rebuild();
        if(state==PREPARING)
                state = UPTODATE;
+
+       for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
+               (*i)->signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
 }
 
 Task *Target::build()
 {
        if(!tool)
        {
+               // This special case is needed for VirtualTargets
                state = UPTODATE;
                return 0;
        }
@@ -103,13 +114,16 @@ Task *Target::build()
        return task;
 }
 
-void Target::mark_rebuild(const std::string &reason)
+void Target::mark_rebuild(const string &reason)
 {
        if(reason.empty())
                throw invalid_argument("No reason given for rebuilding "+name);
 
        state = REBUILD;
        rebuild_reason = reason;
+
+       builder.get_logger().log("rebuild", format("Rebuilding %s: %s", name, reason));
+
        signal_bubble_rebuild.emit();
 }