X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=d23e1b3d1cc34825250b44b81570094514c69682;hb=55269a63b0875be0b172453714f9190d30fb1dff;hp=d0cc1e9822922726f5a5cce8f2af3c5fa0a7b7af;hpb=9e28243c9687608ec3c32954b4031490296ae877;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index d0cc1e9..d23e1b3 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -59,15 +59,14 @@ void Component::create_build_info()
 	}
 
 	final_build_info.update_from(package.get_build_info());
+	final_build_info.update_from(build_info);
+	build_info = final_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;
-
 	for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i)
 	{
 		/* Select an include path that contains all the sources for this and the
@@ -211,13 +210,28 @@ void Component::create_targets() const
 	if(type==PROGRAM || type==LIBRARY || type==MODULE)
 	{
 		list<Target *> objs;
+		const Toolchain &pkg_tools = package.get_toolchain();
 		for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
 		{
 			string ext = FS::extpart(FS::basename(*i));
+			Target *src = 0;
+
+			Tool *gen = pkg_tools.get_tool_for_suffix(ext);
+			if(gen)
+			{
+				Target *tmpl = gen->create_source(*this, *i);
+				if(tmpl)
+				{
+					src = gen->create_target(*tmpl);
+					ext = FS::extpart(FS::basename(dynamic_cast<FileTarget &>(*src).get_path()));
+				}
+			}
+
 			Tool *tool = toolchain.get_tool_for_suffix(ext, true);
 			if(tool)
 			{
-				Target *src = tool->create_source(*this, *i);
+				if(!src)
+					src = tool->create_source(*this, *i);
 				if(!src)
 					continue;
 
@@ -227,8 +241,16 @@ void Component::create_targets() const
 					objs.push_back(obj);
 				}
 
-				if(type==LIBRARY && install && dynamic_cast<FileTarget *>(src)->is_installable())
-					build_graph.add_installed_target(*src);
+				if(type==LIBRARY && install)
+				{
+					if(dynamic_cast<FileTarget *>(src)->is_installable())
+						build_graph.add_installed_target(*src);
+
+					const Target::Dependencies &side_effects = src->get_side_effects();
+					for(Target::Dependencies::const_iterator j=side_effects.begin(); j!=side_effects.end(); ++j)
+						if(dynamic_cast<FileTarget *>(*j)->is_installable())
+							build_graph.add_installed_target(**j);
+				}
 			}
 		}
 
@@ -348,6 +370,8 @@ void Component::Loader::require(const string &n)
 	Package *req = obj.package.get_builder().get_package_manager().find_package(n);
 	if(req)
 		obj.requires.push_back(req);
+	else
+		obj.problems.push_back(format("Required package %s not found", n));
 }
 
 void Component::Loader::source(const string &s)