X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcomponent.cpp;h=5a735d09c4e6561484704d33e388906d542e404c;hb=740d7cdd71fc2f068e44bfc6c8cc7e9565de16f6;hp=23bd37417142235a7d13878f76f03a58a704d210;hpb=69cdee2c53972c1dd7e1b9d83ddcd8f6c3c589f7;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 23bd374..5a735d0 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -38,6 +38,8 @@ void Component::prepare()
 
 void Component::create_build_info()
 {
+	BuildInfo final_build_info;
+
 	const PackageList &pkg_reqs = package.get_required_packages();
 	PackageList direct_reqs = requires;
 	direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end());
@@ -48,7 +50,7 @@ void Component::create_build_info()
 		BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
 		if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
 			level = BuildInfo::DEPENDENCY;
-		build_info.update_from((*i)->get_exported_build_info(), level);
+		final_build_info.update_from((*i)->get_exported_build_info(), level);
 
 		const PackageList &reqs = (*i)->get_required_packages();
 		for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
@@ -56,13 +58,16 @@ void Component::create_build_info()
 				all_reqs.push_back(*j);
 	}
 
-	build_info.update_from(package.get_build_info());
+	final_build_info.update_from(package.get_build_info());
 
 	for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
 		*i = (package.get_source_directory() / *i).str();
 	for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
 		*i = (package.get_source_directory() / *i).str();
 
+	final_build_info.update_from(build_info);
+	build_info = final_build_info;
+
 	if(type==LIBRARY || type==MODULE)
 		if(build_info.libmode<BuildInfo::DYNAMIC)
 			build_info.libmode = BuildInfo::DYNAMIC;
@@ -81,8 +86,6 @@ void Component::create_targets() const
 {
 	Builder &builder = package.get_builder();
 	const Toolchain &toolchain = builder.get_toolchain();
-	Target *world = builder.get_target("world");
-	Target *def_tgt = builder.get_target("default");
 
 	PathList source_filenames = collect_source_files();
 	list<Target *> inst_list;
@@ -149,10 +152,7 @@ void Component::create_targets() const
 			source = new File(builder, package, source_filenames.front());
 		Target *result = dcomp.create_target(*source);
 
-		if(&package==builder.get_main_package() && deflt)
-			def_tgt->add_dependency(*result);
-		else
-			world->add_dependency(*result);
+		builder.add_primary_target(*result);
 		if(install)
 			inst_list.push_back(result);
 	}
@@ -194,10 +194,7 @@ void Component::create_targets() const
 
 		for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
 		{
-			if(&package==builder.get_main_package() && deflt)
-				def_tgt->add_dependency(**i);
-			else
-				world->add_dependency(**i);
+			builder.add_primary_target(**i);
 			if(install)
 				inst_list.push_back(*i);
 		}