Split Binary filename generation to Executable and SharedLibrary

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index b6f29f845108b300c30218c80d7a66dde8af5f14..0c39f6d48befd871ff7883ac7d53d72755723c47 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -21,15 +21,13 @@
 #include "gnuccompiler.h"
 #include "gnucxxcompiler.h"
 #include "gnulinker.h"
-#include "header.h"
-#include "install.h"
+#include "installedfile.h"
 #include "misc.h"
 #include "package.h"
 #include "pkgconfig.h"
 #include "pkgconfiggenerator.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
-#include "systemlibrary.h"
 #include "tar.h"
 #include "task.h"
 #include "virtualtarget.h"
@@ -270,7 +268,7 @@ int Builder::main()
                                if(j->second->get_package()==i->second)
                                {
                                        ++count;
-                                       if(j->second->get_rebuild())
+                                       if(j->second->needs_rebuild())
                                                ++to_be_built;
                                }
                        if(count)
@@ -507,7 +505,7 @@ int Builder::create_targets()
                if(spkg->get_install_flags()&(SourcePackage::LIB|SourcePackage::INCLUDE))
                {
                        PkgConfig *pc = new PkgConfig(*this, *spkg);
-                       install->add_depend(new Install(*this, *spkg, *pc));
+                       install->add_depend(new InstalledFile(*this, *spkg, *pc));
                }
        }
 
@@ -566,7 +564,7 @@ int Builder::do_build()
 
        unsigned total = 0;
        for(map<string, Target *>::const_iterator i=targets.begin(); i!=targets.end(); ++i)
-               if(i->second->is_buildable() && i->second->get_rebuild())
+               if(i->second->is_buildable() && i->second->needs_rebuild())
                        ++total;
 
        if(!total)