Include the environment channel in verbose level 2

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index 17ec7353998f7fc7078c70d56bbb99762dfb7fa2..7a3e7a5b6a34e0a58694323fd203f87c42bfd7e0 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"
@@ -13,24 +12,21 @@ using namespace std;
 using namespace Msp;
 
 Binary::Binary(Builder &b, const FS::Path &p):
-       FileTarget(b, 0, p)
+       FileTarget(b, p)
 { }
 
-Binary::Binary(Builder &b, const Component &c, const std::string &p, const list<ObjectFile *> &objs):
-       FileTarget(b, &c.get_package(), c.get_package().get_out_dir()/p)
+Binary::Binary(Builder &b, const Component &c, const string &p, const list<ObjectFile *> &objs):
+       FileTarget(b, c.get_package(), c.get_package().get_out_dir()/p)
 {
        component = &c;
        for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
-               add_depend(*i);
+               add_depend(**i);
 }
 
 void Binary::find_depends()
 {
        if(!component)
-       {
-               deps_ready = true;
                return;
-       }
 
        const SourcePackage &spkg = component->get_package();
        LibMode libmode = spkg.get_library_mode();
@@ -45,10 +41,10 @@ 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;
-               for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
+               const BuildInfo::WordList &libs = c->get_build_info().libs;
+               for(BuildInfo::WordList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
                {
                        Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
                        if(lib)
@@ -72,8 +68,6 @@ void Binary::find_depends()
                for(list<Target *>::iterator j=i; (last && j!=dep_libs.end()); ++j)
                        last = (j==i || *j!=*i);
                if(last)
-                       add_depend(*i);
+                       add_depend(**i);
        }
-
-       deps_ready = true;
 }