X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=7208f424bd1b001493cec14420df2d92bf7c4fae;hb=153372211c242e539754680b5fe979e3be61ebfe;hp=97e52552b8d553ae3d360245a56bd15a440efc91;hpb=50baabc242633d531d3f9542e9a64491b6e12c6c;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 97e5255..7208f42 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -11,7 +11,7 @@ using namespace Msp;
 
 ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
 	FileTarget(b, c.get_package(), generate_target_path(c, s.get_path())),
-	source(s)	
+	source(s)
 {
 	component = &c;
 	add_dependency(source);
@@ -44,7 +44,7 @@ void ObjectFile::find_dependencies()
 void ObjectFile::find_dependencies(FileTarget *tgt)
 {
 	FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
-	const Dependencies &tdeps = rtgt->get_dependencies();
+	const Dependencies &tdeps = rtgt->get_transitive_dependencies();
 	Dependencies deps_to_add;
 	if(rtgt==tgt)
 	{
@@ -65,6 +65,19 @@ void ObjectFile::find_dependencies(FileTarget *tgt)
 				FS::Path displaced = tgt->get_path()/FS::relative(file->get_path(), rtgt->get_path());
 				if(Target *ddep = builder.get_vfs().get_target(displaced))
 					deps_to_add.push_back(ddep);
+				else
+				{
+					const Component *tcomp = file->get_component();
+					const Component::OverlayList &overlays = tcomp->get_overlays();
+					string last_dir = FS::basename(FS::dirname(displaced));
+					for(Component::OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+						if(last_dir==*j)
+						{
+							displaced = displaced.subpath(0, displaced.size()-2)/FS::basename(file->get_path());
+							if((ddep = builder.get_vfs().get_target(displaced)))
+								deps_to_add.push_back(ddep);
+						}
+				}
 			}
 			else
 				deps_to_add.push_back(*i);
@@ -73,5 +86,9 @@ void ObjectFile::find_dependencies(FileTarget *tgt)
 
 	for(Dependencies::const_iterator i=deps_to_add.begin(); i!=deps_to_add.end(); ++i)
 		if(find(depends.begin(), depends.end(), *i)==depends.end())
+		{
 			add_dependency(**i);
+			if((*i)->get_real_target()->is_buildable())
+				(*i)->signal_modified.connect(sigc::mem_fun(this, static_cast<void (ObjectFile::*)()>(&ObjectFile::find_dependencies)));
+		}
 }