X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=862ddbe5836197c500ae99cf05f324c419bacbe5;hb=6e02286dcbd62b8f5ef56987c2298d54b689ad9c;hp=3d8014755de2b90dd2c81ff528f2e91029ca5278;hpb=1c43971ed99fd2f72ae171d6cdafabab74e37f4e;p=builder.git

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 3d80147..862ddbe 100644
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -6,6 +6,7 @@
 #include "builder.h"
 #include "filetarget.h"
 #include "sourcepackage.h"
+#include "task.h"
 #include "tool.h"
 
 using namespace std;
@@ -63,12 +64,13 @@ string FileTarget::generate_name(Builder &builder, const SourcePackage *pkg, con
 void FileTarget::touch()
 {
 	mtime = Time::now();
+	modified();
 	signal_bubble_rebuild.emit();
 }
 
 void FileTarget::check_rebuild()
 {
-	if(!tool)
+	if(!tool || needs_rebuild())
 		return;
 
 	if(!mtime)
@@ -85,16 +87,27 @@ void FileTarget::check_rebuild()
 		}
 	}
 
+	if(!needs_rebuild())
+	{
+		// Some side effects might not exist
+		for(Dependencies::iterator i=side_effects.begin(); (i!=side_effects.end() && !needs_rebuild()); ++i)
+			if((*i)->needs_rebuild())
+				mark_rebuild((*i)->get_name()+" needs rebuilding");
+	}
+
 	if(!needs_rebuild() && package)
 	{
 		if(package->get_config().get_mtime()>mtime)
 			mark_rebuild("Package options changed");
 
-		string build_sig = create_build_signature();
-		if(package->get_cache().has_key(this, "build_sig"))
+		if(tool->get_executable())
 		{
-			if(package->get_cache().get_value(this, "build_sig")!=build_sig)
-				mark_rebuild("Build signature changed");
+			string build_sig = create_build_signature();
+			if(package->get_cache().has_key(this, "build_sig"))
+			{
+				if(package->get_cache().get_value(this, "build_sig")!=build_sig)
+					mark_rebuild("Build signature changed");
+			}
 		}
 	}
 }
@@ -108,12 +121,10 @@ string FileTarget::create_build_signature() const
 	return tool->create_build_signature(binfo);
 }
 
-Task *FileTarget::build()
+void FileTarget::build(Task &task)
 {
-	if(tool && !builder.get_dry_run() && mtime)
-		FS::unlink(path);
-
-	return Target::build();
+	task.add_file(path);
+	task.set_unlink(true);
 }
 
 void FileTarget::build_finished(bool success)