X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=862ddbe5836197c500ae99cf05f324c419bacbe5;hb=e516e78510ad455eebc0e06645c9f12943117525;hp=b42580a099a0a95eb411bc34fa65345cd72a2b03;hpb=486adc75285b8b5d62a990dd9f9cd4737c8ab7f6;p=builder.git

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index b42580a..862ddbe 100644
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -70,7 +70,7 @@ void FileTarget::touch()
 
 void FileTarget::check_rebuild()
 {
-	if(!tool)
+	if(!tool || needs_rebuild())
 		return;
 
 	if(!mtime)
@@ -89,12 +89,10 @@ 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)
-		{
-			FileTarget *ft = dynamic_cast<FileTarget *>(*i);
-			if(ft && !ft->get_mtime())
-				mark_rebuild((*i)->get_name()+" does not exist");
-		}
+			if((*i)->needs_rebuild())
+				mark_rebuild((*i)->get_name()+" needs rebuilding");
 	}
 
 	if(!needs_rebuild() && package)
@@ -123,12 +121,10 @@ string FileTarget::create_build_signature() const
 	return tool->create_build_signature(binfo);
 }
 
-Task *FileTarget::build()
+void FileTarget::build(Task &task)
 {
-	Task *task = Target::build();
-	task->set_file(path);
-	task->set_unlink(true);
-	return task;
+	task.add_file(path);
+	task.set_unlink(true);
 }
 
 void FileTarget::build_finished(bool success)