X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=decb4bf793d68015066e1dede84f044e340ae836;hb=be6c1ae1dcc97cb3e3019c0384f1bc933fcd321c;hp=ad3786c76611d3012adcd154ef6bcfbac3210485;hpb=0b16c3de0f9dc01bd8a9708008f9435fe0252df1;p=builder.git

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index ad3786c..decb4bf 100644
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -30,7 +30,7 @@ void FileTarget::touch()
 
 void FileTarget::check_rebuild()
 {
-	if(!buildable)
+	if(!tool)
 		return;
 
 	if(builder.get_build_all())
@@ -39,24 +39,24 @@ void FileTarget::check_rebuild()
 		mark_rebuild("Does not exist");
 	else
 	{
-		for(Dependencies::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
+		for(Dependencies::iterator i=depends.begin(); (i!=depends.end() && !needs_rebuild()); ++i)
 		{
 			FileTarget *ft = dynamic_cast<FileTarget *>(*i);
 			if(ft && ft->get_mtime()>mtime)
 				mark_rebuild((*i)->get_name()+" has changed");
-			else if((*i)->get_rebuild())
+			else if((*i)->needs_rebuild())
 				mark_rebuild((*i)->get_name()+" needs rebuilding");
 			else
 			{
 				Target *real = ft->get_real_target();
-				if(real->get_rebuild())
+				if(real->needs_rebuild())
 					mark_rebuild(real->get_name()+" needs rebuilding");
 			}
 		}
 	}
 
 	const SourcePackage *spkg = dynamic_cast<const SourcePackage *>(package);
-	if(!rebuild && spkg && spkg->get_config().get_mtime()>mtime)
+	if(!needs_rebuild() && spkg && spkg->get_config().get_mtime()>mtime)
 		mark_rebuild("Package options changed");
 }