X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=68c9b1800097ad6ef014ae5b5a86122e52d392cf;hb=7606161ee4a6fd13c2f5ddca413ba3582df66f03;hp=db78917c70fdf63fe1aef7fb95fa599629ca34f9;hpb=0dea0d850f6690de07933794592916d11c9d3f49;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index db78917..68c9b18 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -79,6 +79,12 @@ void Component::create_build_info()
 		for(SourceList::const_iterator j=use_sources.begin(); j!=use_sources.end(); ++j)
 			base = FS::common_ancestor(base, *j);
 		build_info.incpath.push_back(base);
+		build_info.libs.push_back((*i)->get_name());
+		if(!(*i)->get_install())
+		{
+		    build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC;
+			build_info.libpath.push_back((*i)->get_package().get_source_directory());
+		}
 	}
 
 	if(type==LIBRARY || type==MODULE)
@@ -203,24 +209,6 @@ void Component::create_targets() const
 		else
 			results.push_back(linker.create_target(objs));
 
-		const Target::Dependencies &world_deps = builder.get_target("world")->get_dependencies();
-		for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i)
-		{
-			/* The world target depends on all primary targets; look for the
-			static library belonging to the component.  This is a bit roundabout
-			way but gets the job done. */
-			bool found = false;
-			for(Target::Dependencies::const_iterator j=world_deps.begin(); j!=world_deps.end(); ++j)
-				if((*j)->get_component()==*i && dynamic_cast<StaticLibrary *>(*j))
-				{
-					results.front()->add_dependency(**j);
-					found = true;
-					break;
-				}
-			if(!found)
-				builder.problem(package.get_name(), format("Can't find static library %s for component %s", (*i)->get_name(), name));
-		}
-
 		for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
 		{
 			builder.add_primary_target(**i);