X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fanalyzer.cpp;h=2c9cf058d7a565d3849acca028e150d878f4e85c;hb=74ea8208bb1aa1d9afc9657a4cdfac6714241887;hp=d15a7477984886db2e4c22262869f019275f9454;hpb=09366b5da31707942f66e386cd0c07e5ece17b7f;p=builder.git diff --git a/source/analyzer.cpp b/source/analyzer.cpp index d15a747..2c9cf05 100644 --- a/source/analyzer.cpp +++ b/source/analyzer.cpp @@ -30,6 +30,9 @@ void Analyzer::analyze() const Target::Dependencies &depends = i->second->get_dependencies(); for(Target::Dependencies::const_iterator j=depends.begin(); j!=depends.end(); ++j) rdepends[*j].insert(i->second); + const Target::Dependencies &tdepends = i->second->get_transitive_dependencies(); + for(Target::Dependencies::const_iterator j=tdepends.begin(); j!=tdepends.end(); ++j) + rdepends[*j].insert(i->second); } } @@ -109,7 +112,11 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth) depends.assign(rdeps.begin(), rdeps.end()); } else + { depends = tgt.get_dependencies(); + const Target::Dependencies &tdeps = tgt.get_transitive_dependencies(); + depends.insert(depends.end(), tdeps.begin(), tdeps.end()); + } depends.sort(full_paths ? target_order_full : target_order);