X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=2a60c2986bac2ec89f1454995f89283fe5d973da;hb=2606b03da59dc10e3826b833a2fceb0831d79972;hp=bc4e110d8700002f822bca478d0e6aa6fde6a8be;hpb=bd2a50ecb9f582c6e9569ffc9f33d41f10363c5f;p=builder.git

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index bc4e110..2a60c29 100644
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -10,10 +10,12 @@ using namespace std;
 using namespace Msp;
 
 FileTarget::FileTarget(Builder &b, const Package *p, const FS::Path &a):
-	Target(b, p, make_name(p, a)),
+	Target(b, make_name(p, a)),
 	path(a),
 	size(0)
 {
+	package = p;
+
 	builder.get_vfs().register_path(path, this);
 
 	if(FS::Stat st = FS::lstat(path))
@@ -30,7 +32,7 @@ void FileTarget::touch()
 
 void FileTarget::check_rebuild()
 {
-	if(!buildable)
+	if(!tool)
 		return;
 
 	if(builder.get_build_all())
@@ -39,24 +41,24 @@ void FileTarget::check_rebuild()
 		mark_rebuild("Does not exist");
 	else
 	{
-		for(TargetList::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");
 }