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);
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)
{
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);
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)));
+ }
}