Drop some deprecated datafile statements from Component

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index 590471f3a0f75e286f55c6afd4f04f2c62a4b447..d73c59450f97501bcab4d32554fc33f9ef8724ce 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -1,20 +1,12 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/fs/utils.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "binary.h"
 #include "builder.h"
 #include "component.h"
-#include "install.h"
 #include "link.h"
 #include "objectfile.h"
-#include "package.h"
 #include "sharedlibrary.h"
+#include "sourcepackage.h"
 #include "staticlibrary.h"
 
 using namespace std;
@@ -48,13 +40,12 @@ void Binary::find_depends()
                const list<string> &libs = c->get_build_info().libs;
                for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
                {
-                       Target *lib = builder.get_library(*i, libpath, libmode);
+                       Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
                        if(lib)
                        {
                                dep_libs.push_back(lib);
 
-                               if(Install *inst = dynamic_cast<Install *>(lib))
-                                       lib = &inst->get_source();
+                               lib = lib->get_real_target();
                                if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
                                        queue.push_back(&stlib->get_component());
                        }
@@ -77,11 +68,6 @@ void Binary::find_depends()
        deps_ready = true;
 }
 
-Action *Binary::create_action()
-{
-       return new Link(builder, *this);
-}
-
 FS::Path Binary::generate_target_path(const Component &c)
 {
        const SourcePackage &pkg = c.get_package();