X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=b8445c14079c8e73946862aa1d34e4d4954cbd4d;hb=be6c1ae1dcc97cb3e3019c0384f1bc933fcd321c;hp=59dc1f9d190991a4bf5fbbfd9f7761515f932aff;hpb=0458300fda4f345f865a7f3ee4fc0f2020a91983;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index 59dc1f9..b8445c1 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 <msp/fs/utils.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;
@@ -24,9 +16,15 @@ Binary::Binary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
 	FileTarget(b, &c.get_package(), generate_target_path(c)),
 	comp(c)
 {
-	buildable = true;
 	for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
 		add_depend(*i);
+
+	if(c.get_type()==Component::LIBRARY)
+		install_location = "lib";
+	else if(c.get_type()==Component::MODULE)
+		install_location = "lib/"+package->get_name();
+	else if(c.get_type()==Component::PROGRAM)
+		install_location = "bin";
 }
 
 void Binary::find_depends()
@@ -48,7 +46,7 @@ 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);
@@ -76,11 +74,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();