X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinarycomponent.cpp;h=49c4897ce69d7d25492ebe1521257dca04c77062;hb=54d0a3516164312bf9d04f455e2aad2af225aa51;hp=565e8bc1759ad6fb3bffdda89e3626fbde021012;hpb=2611acdbc78657d28d2d4efea06c3b6369882a15;p=builder.git

diff --git a/source/binarycomponent.cpp b/source/binarycomponent.cpp
index 565e8bc..49c4897 100644
--- a/source/binarycomponent.cpp
+++ b/source/binarycomponent.cpp
@@ -56,7 +56,7 @@ void BinaryComponent::create_targets() const
 
 	list<Target *> objs;
 	SourceList source_filenames = collect_source_files();
-	for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
+	for(SourceList::iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
 	{
 		string ext = FS::extpart(FS::basename(*i));
 		Target *src = 0;
@@ -64,12 +64,30 @@ void BinaryComponent::create_targets() const
 		Tool *gen = pkg_tools.get_tool_for_suffix(ext);
 		if(gen)
 		{
-			Target *tmpl = gen->create_source(*this, *i);
-			if(tmpl)
+			list<Target *> templates;
+			templates.push_back(gen->create_source(*this, *i));
+
+			Tool::ProcessingUnit processing_unit = gen->get_processing_unit();
+			if(processing_unit!=Tool::ONE_FILE)
 			{
-				src = gen->create_target(*tmpl);
-				ext = FS::extpart(FS::basename(dynamic_cast<FileTarget &>(*src).get_path()));
+				FS::Path source_dir = FS::dirname(*i);
+				SourceList::iterator j = i;
+				for(++j; j!=source_filenames.end(); )
+				{
+					if((processing_unit!=Tool::DIRECTORY || FS::dirname(*j)==source_dir) &&
+						pkg_tools.get_tool_for_suffix(FS::extpart(FS::basename(*j)))==gen)
+					{
+						templates.push_back(gen->create_source(*this, *j));
+						// Remove additional files so they won't get processed again
+						source_filenames.erase(j++);
+					}
+					else
+						++j;
+				}
 			}
+
+			src = gen->create_target(templates);
+			ext = FS::extpart(FS::basename(dynamic_cast<FileTarget &>(*src).get_path()));
 		}
 
 		Tool *tool = toolchain.get_tool_for_suffix(ext, true);