X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=d73c59450f97501bcab4d32554fc33f9ef8724ce;hb=3e8bf5032e744b5fc3e7680af48f2abacc67addc;hp=59dc1f9d190991a4bf5fbbfd9f7761515f932aff;hpb=0458300fda4f345f865a7f3ee4fc0f2020a91983;p=builder.git diff --git a/source/binary.cpp b/source/binary.cpp index 59dc1f9..d73c594 100644 --- 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 #include #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,7 +40,7 @@ void Binary::find_depends() const list &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); @@ -76,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();