X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=43ecb7ba313a1a68ce9fefb139997ace0e203584;hb=6f76342d14c7b7ec7b9629fcfd40199bca1e5e0f;hp=7646ee4555949f0240d0287ea0a1fff9c54f272a;hpb=37ba195304d671390d3e11ebe1bf4c3b2298841b;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index 7646ee4..43ecb7b 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -3,7 +3,7 @@
 #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"
@@ -60,7 +60,8 @@ void Target::add_depend(Target *dep)
 	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));
+	if(state>PREPARING)
+		dep->signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
 }
 
 void Target::prepare()
@@ -75,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();
@@ -82,6 +88,9 @@ 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()
@@ -104,16 +113,17 @@ 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;
-	signal_bubble_rebuild.emit();
 
 	builder.get_logger().log("rebuild", format("Rebuilding %s: %s", name, reason));
+
+	signal_bubble_rebuild.emit();
 }
 
 void Target::build_finished(bool /*success*/)