X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=dd75e9a4a98b4d18206a8e7cf7c1512746557902;hb=33202532d4afbebdef4047f6bd216eca22d27813;hp=7f031ec2dd384a1b86e0e4f61f7797d4f0803798;hpb=0d95fee118a3fcd78f153dca5721d9fe19b6f6bf;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index 7f031ec..dd75e9a 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -39,6 +39,9 @@ void Target::add_side_effect(Target &se)
 	if(tool)
 		se.set_tool(*tool);
 	se.primary_target = this;
+	/* Side effects are checked for rebuild after the primary target.  Recheck
+	the primary if a side effect is marked for rebuild. */
+	se.signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
 }
 
 Target *Target::get_buildable_target()
@@ -139,10 +142,17 @@ void Target::prepare()
 
 Task *Target::build()
 {
+	if(primary_target)
+		return primary_target->build();
+
 	Task *task = tool->run(*this);
 	task->signal_finished.connect(sigc::mem_fun(this, &Target::build_finished));
 	state = BUILDING;
 
+	build(*task);
+	for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
+		(*i)->build(*task);
+
 	return task;
 }