X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=3f8b004ce172af9a96b36ee6af13d7a586c6de75;hb=9134ce7f2225eb301c7b6c9aca8521c4e82dc065;hp=88fe71443bc2b4497c51a590a2a262b0fcbe6223;hpb=af52dd8fd91fd0ef3dcd0faff524b4508c946aef;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 88fe714..3f8b004 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -30,13 +30,10 @@ Component::Component(SourcePackage &p, Type t, const string &n):
 	deflt(true)
 { }
 
-void Component::configure(const StringMap &opts, unsigned flag)
+void Component::prepare()
 {
-	for(StringList::iterator i=sources.begin(); i!=sources.end(); ++i)
-		*i = (pkg.get_source()/pkg.expand_string(*i)).str();
-
 	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-		(*i)->configure(opts, flag&2);
+		(*i)->prepare();
 }
 
 void Component::create_build_info()
@@ -66,7 +63,11 @@ void Component::create_build_info()
 	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)
+	if(type==LIBRARY || type==MODULE)
+		if(build_info.libmode<BuildInfo::DYNAMIC)
+			build_info.libmode = BuildInfo::DYNAMIC;
+
+	if(build_info.libmode<BuildInfo::DYNAMIC)
 	{
 		for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
 		{
@@ -219,6 +220,7 @@ PathList Component::collect_source_files() const
 		FS::Path path(*i);
 		if(FS::is_dir(path))
 		{
+			pkg.get_builder().get_logger().log("files", format("Traversing %s", path));
 			list<string> sfiles = list_files(path);
 			for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
 				files.push_back(path / *j);
@@ -244,7 +246,7 @@ Component::Loader::Loader(Component &c):
 
 void Component::Loader::source(const string &s)
 {
-	obj.sources.push_back(s);
+	obj.sources.push_back((obj.pkg.get_source()/s).str());
 }
 
 void Component::Loader::require(const string &n)