Make targets depend on their tools

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index 17ec7353998f7fc7078c70d56bbb99762dfb7fa2..957d233d65ec3bff179d3e93703b5f5af1c57e7e 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -3,7 +3,6 @@
 #include "binary.h"
 #include "builder.h"
 #include "component.h"
-#include "link.h"
 #include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
@@ -27,10 +26,7 @@ Binary::Binary(Builder &b, const Component &c, const std::string &p, const list<
 void Binary::find_depends()
 {
        if(!component)
-       {
-               deps_ready = true;
                return;
-       }
 
        const SourcePackage &spkg = component->get_package();
        LibMode libmode = spkg.get_library_mode();
@@ -45,9 +41,9 @@ void Binary::find_depends()
                const Component *c = queue.front();
                queue.erase(queue.begin());
 
-               const StringList &libpath = c->get_build_info().libpath;
+               const BuildInfo::PathList &libpath = c->get_build_info().libpath;
 
-               const list<string> &libs = c->get_build_info().libs;
+               const BuildInfo::WordList &libs = c->get_build_info().libs;
                for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
                {
                        Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
@@ -74,6 +70,4 @@ void Binary::find_depends()
                if(last)
                        add_depend(*i);
        }
-
-       deps_ready = true;
 }