Consolidate various target state variables into a single state

[builder.git] / source / filetarget.cpp

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index f04e3101281d4a8f9cb10791503591c3a7caf0cb..decb4bf793d68015066e1dede84f044e340ae836 100644 (file)
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -39,7 +39,7 @@ 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)
@@ -56,7 +56,7 @@ void FileTarget::check_rebuild()
        }
 
        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");
 }