find_dependencies should not be public

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index 7a3e7a5b6a34e0a58694323fd203f87c42bfd7e0..6fd6161989f24450ca4352b60126f474d545f366 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -20,18 +20,15 @@ Binary::Binary(Builder &b, const Component &c, const string &p, const list<Objec
 {
        component = &c;
        for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
-               add_depend(**i);
+               add_dependency(**i);
 }
 
-void Binary::find_depends()
+void Binary::find_dependencies()
 {
        if(!component)
                return;
 
-       const SourcePackage &spkg = component->get_package();
-       LibMode libmode = spkg.get_library_mode();
-       if(dynamic_cast<SharedLibrary *>(this))
-               libmode = DYNAMIC;
+       BuildInfo::LibraryMode libmode = component->get_build_info().libmode;
 
        list<const Component *> queue;
        list<Target *> dep_libs;
@@ -41,22 +38,21 @@ void Binary::find_depends()
                const Component *c = queue.front();
                queue.erase(queue.begin());
 
-               const BuildInfo::PathList &libpath = c->get_build_info().libpath;
-
-               const BuildInfo::WordList &libs = c->get_build_info().libs;
-               for(BuildInfo::WordList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
+               const BuildInfo &binfo = c->get_build_info();
+               for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
                {
-                       Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
+                       Target *lib = builder.get_vfs().find_library(*i, binfo.libpath, libmode);
                        if(lib)
                        {
                                dep_libs.push_back(lib);
 
                                lib = lib->get_real_target();
                                if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
-                                       queue.push_back(stlib->get_component());
+                                       if(stlib->get_component())
+                                               queue.push_back(stlib->get_component());
                        }
                        else
-                               builder.problem(spkg.get_name(), format("Couldn't find library %s for %s", *i, name));
+                               builder.problem(package->get_name(), format("Couldn't find library %s for %s", *i, name));
                }
        }
 
@@ -68,6 +64,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_dependency(**i);
        }
 }