X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=11d2925d83514ce4849f08fcff0bf6a9d92c8f9e;hb=1a75d7e01d0704f83633f696a312744de272b4c4;hp=7db9880c051b52633310b4bddfacf04b867283c7;hpb=dcaf06c2bba4e02a312cd6af24ddc96410e7be4e;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 7db9880..11d2925 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"
@@ -61,9 +61,9 @@ void Component::create_build_info()
 
 	build_info.update_from(pkg.get_build_info());
 
-	for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
+	for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
 		*i = (pkg.get_source() / *i).str();
-	for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
+	for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
 		*i = (pkg.get_source() / *i).str();
 
 	if(pkg.get_library_mode()!=DYNAMIC)
@@ -76,17 +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.unique();
+		build_info.strip = lexical_cast<bool>(pkg.get_config().get_option("strip").value);
 }
 
 void Component::create_targets() const
@@ -177,7 +167,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)
@@ -283,7 +273,7 @@ void Component::Loader::source(const string &s)
 
 void Component::Loader::require(const string &n)
 {
-	Package *req = comp.pkg.get_builder().get_package(n);
+	Package *req = comp.pkg.get_builder().get_package_manager().find_package(n);
 	if(req)
 		comp.requires.push_back(req);
 }