X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=0dcb62f01a057dfc66085f3524ccf5553d586cc5;hb=64f01c486e48f260a5d895092806ee341ef23198;hp=81124b9465fef1102c5bddd4e66494139e4f47f6;hpb=c01dc113eca278100ad0b4572082da619d52662e;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index 81124b9..0dcb62f 100644
--- 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,15 +12,15 @@ 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()
@@ -29,10 +28,7 @@ void Binary::find_depends()
 	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;
@@ -42,22 +38,21 @@ void Binary::find_depends()
 		const Component *c = queue.front();
 		queue.erase(queue.begin());
 
-		const StringList &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 &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));
 		}
 	}
 
@@ -69,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_depend(**i);
 	}
 }