X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=cc4796cdee867cd9d9aea23d311951d4f091965a;hb=632361796a7ddadf8a726526c937fab22281fb7b;hp=2780070f4543e897bf33fff5c66b679793dcb614;hpb=8fa75f16e653e22f188bc09c5d04c3cdb5cf8c52;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 2780070..cc4796c 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -6,10 +6,10 @@
 #include <msp/strings/lexicalcast.h>
 #include "builder.h"
 #include "component.h"
+#include "csourcefile.h"
 #include "datafile.h"
 #include "executable.h"
 #include "file.h"
-#include "header.h"
 #include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
@@ -48,15 +48,10 @@ void Component::create_build_info()
 	PackageList all_reqs = direct_reqs;
 	for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
 	{
+		BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
 		if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
-			build_info.add((*i)->get_exported_binfo());
-		else
-		{
-			const BuildInfo &ebi = (*i)->get_exported_binfo();
-			build_info.cflags.insert(build_info.cflags.end(), ebi.cflags.begin(), ebi.cflags.end());
-			build_info.incpath.insert(build_info.incpath.end(), ebi.incpath.begin(), ebi.incpath.end());
-			build_info.defines.insert(build_info.defines.end(), ebi.defines.begin(), ebi.defines.end());
-		}
+			level = BuildInfo::DEPENDENCY;
+		build_info.update_from((*i)->get_exported_binfo(), level);
 
 		const PackageList &reqs = (*i)->get_requires();
 		for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
@@ -64,7 +59,7 @@ void Component::create_build_info()
 				all_reqs.push_back(*j);
 	}
 
-	build_info.add(pkg.get_build_info());
+	build_info.update_from(pkg.get_build_info());
 
 	for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
 		*i = (pkg.get_source() / *i).str();
@@ -81,15 +76,7 @@ void Component::create_build_info()
 	}
 
 	if(type==PROGRAM)
-	{
-		string strip = pkg.get_config().get_option("strip").value;
-		if(lexical_cast<bool>(strip))
-			build_info.ldflags.push_back("-s");
-	}
-	else if(type==LIBRARY)
-	{
-		build_info.cflags.push_back("-fPIC");
-	}
+		build_info.strip = lexical_cast<bool>(pkg.get_config().get_option("strip").value);
 
 	build_info.unique();
 }
@@ -182,7 +169,7 @@ void Component::create_targets() const
 			{
 				FileTarget *hdr = builder.get_vfs().get_target(*i);
 				if(!hdr)
-					hdr = new Header(builder, *this, i->str());
+					hdr = new CSourceFile(builder, *this, *i);
 
 				// Install headers if requested
 				if(type==HEADERS && install)
@@ -265,11 +252,8 @@ Component::Loader::Loader(Component &c):
 {
 	add("source",          &Loader::source);
 	add("install",         &Component::install);
-	add("install_headers", &Loader::install_headers);
 	add("build_info",      &Loader::build_info);
 	add("require",         &Loader::require);
-	add("modular",         &Loader::modular);
-	add("host",            &Loader::host);
 	add("default",         &Component::deflt);
 }
 
@@ -296,30 +280,6 @@ void Component::Loader::require(const string &n)
 		comp.requires.push_back(req);
 }
 
-void Component::Loader::modular()
-{
-	IO::print("%s: Note: modular is deprecated\n", get_source());
-	comp.build_info.ldflags.push_back("-rdynamic");
-	comp.build_info.libs.push_back("dl");
-}
-
-void Component::Loader::host(const string &)
-{
-	IO::print("%s: Note: host is deprecated\n", get_source());
-}
-
-void Component::Loader::install_headers(const string &p)
-{
-	IO::print("%s: Note: install_headers is deprecated\n", get_source());
-	if(comp.type==HEADERS)
-	{
-		comp.name = p;
-		comp.install = true;
-	}
-	else
-		inst_hdr = p;
-}
-
 void Component::Loader::build_info()
 {
 	load_sub(comp.build_info);