X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=ea63655368b7eadc60b9c4fcdc0335c25f83f18f;hb=92ab07ba1704c3d66dcc5e3e6a1c78e5d2738515;hp=d0524e84dab7af88e1d48f40c63fdded7b00e677;hpb=edb6076ccae6347acb84868563144a63e6ceba02;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index d0524e8..ea63655 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -27,7 +27,7 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
 	source_dir(FS::dirname(f)),
 	build_type(0),
 	config(*this),
-	deps_cache(*this)
+	cache(*this)
 {
 	config.load();
 
@@ -61,47 +61,52 @@ FS::Path SourcePackage::get_temp_dir() const
 FS::Path SourcePackage::get_out_dir() const
 {
 	const Architecture &arch = builder.get_current_arch();
-	string detail = (build_type ? build_type->get_name() : string());
 	if(arch.is_native())
-		return source_dir/detail;
+		return source_dir;
 	else
-		return source_dir/arch.get_name()/detail;
+		return source_dir/arch.get_name();
 }
 
 void SourcePackage::create_build_info()
 {
+	BuildInfo final_build_info;
+
 	if(build_type)
-		build_info.update_from(build_type->get_build_info());
+		final_build_info.update_from(build_type->get_build_info());
+
+	final_build_info.update_from(build_info);
+	build_info = final_build_info;
 
 	build_info.incpath.push_back((builder.get_prefix()/"include").str());
 	build_info.libpath.push_back((builder.get_prefix()/"lib").str());
 
-	bool export_paths = false;
-	for(ComponentList::const_iterator i=components.begin(); (!export_paths && i!=components.end()); ++i)
-		export_paths = (i->get_type()==Component::LIBRARY);
-
-	if(export_paths)
-	{
-		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
-		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
-	}
-
 	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
 		if(lexical_cast<bool>(config.get_option("with_"+i->name).value))
 			build_info.defines["WITH_"+toupper(i->name)] = "1";
 
+	bool export_paths = false;
 	for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)
 	{
 		i->prepare();
 		i->create_build_info();
+
 		if(i->get_type()==Component::LIBRARY)
+		{
 			export_binfo.libs.push_back(i->get_name());
+			export_paths = true;
+		}
+	}
+
+	if(export_paths)
+	{
+		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
+		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
 	}
 }
 
 void SourcePackage::create_targets()
 {
-	deps_cache.load();
+	cache.load();
 
 	bool pc_needed = false;
 	for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
@@ -121,7 +126,7 @@ void SourcePackage::create_targets()
 void SourcePackage::save_caches()
 {
 	config.save();
-	deps_cache.save();
+	cache.save();
 }