summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2005-03-31 20:07:16 (UTC)
committer Michael Krelin <hacker@klever.net>2005-03-31 20:07:16 (UTC)
commit185d182cd6d3e0593a3627837f3bb400b654e602 (patch) (side-by-side diff)
treebf848291cf5fb161df0a028ca9f3a3095f862d0b
parentc9a601eeae3457d28fb1dfd7592ce29d2b06f411 (diff)
downloadsitecing-185d182cd6d3e0593a3627837f3bb400b654e602.zip
sitecing-185d182cd6d3e0593a3627837f3bb400b654e602.tar.gz
sitecing-185d182cd6d3e0593a3627837f3bb400b654e602.tar.bz2
Yes, I did break dependency handling a bit.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--lib/component_factory.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/component_factory.cc b/lib/component_factory.cc
index 2a2eefe..5c18bb7 100644
--- a/lib/component_factory.cc
+++ b/lib/component_factory.cc
@@ -76,6 +76,7 @@ namespace sitecing {
deps.push_back(root_intermediate+str+".classname");
}
}
+ // XXX: intermediate_deps should be broken down
config_options *co_intermediate_deps = config.lookup_config(nos,config_options::flag_intermediate_deps);
if(co_intermediate_deps) {
for(list<string>::const_iterator i=co_intermediate_deps->intermediate_deps.begin();i!=co_intermediate_deps->intermediate_deps.end();++i)
@@ -101,7 +102,12 @@ namespace sitecing {
}
}
}
- // XXX: extra deps like IntermediateDeps?
+ // XXX: intermediate_deps should be broken down
+ config_options *co_intermediate_deps = config.lookup_config(nos,config_options::flag_intermediate_deps);
+ if(co_intermediate_deps) {
+ for(list<string>::const_iterator i=co_intermediate_deps->intermediate_deps.begin();i!=co_intermediate_deps->intermediate_deps.end();++i)
+ deps.push_back(*i);
+ }
}catch(utility_no_suffix& uns) { }
}
}catch(utility_no_prefix& unp) { }