Split Binary filename generation to Executable and SharedLibrary

[builder.git] / source / installedfile.cpp

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index a9c34733837ac2e4902b5cdb15146d10ae9c6af7..5ed3139cd38d5d9fdd407dafb5813e1b3d7cd896 100644 (file)
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -3,7 +3,6 @@
 #include "copy.h"
 #include "executable.h"
 #include "datafile.h"
-#include "header.h"
 #include "installedfile.h"
 #include "package.h"
 #include "pkgconfig.h"
@@ -17,7 +16,6 @@ InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s,
        FileTarget(b, &p, generate_target_path(b.get_prefix(), s, loc)),
        source(s)
 {
-       buildable = true;
        add_depend(&source);
 
        if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&source))
@@ -39,7 +37,7 @@ void InstalledFile::check_rebuild()
                mark_rebuild("Does not exist");
        else if(source.get_mtime()>mtime || source.get_size()!=size)
                mark_rebuild(source.get_name()+" has changed");
-       else if(source.get_rebuild())
+       else if(source.needs_rebuild())
                mark_rebuild(source.get_name()+" needs rebuilding");
 }