X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fanalyzer.cpp;h=b04049683461f93f2e94fb5e66a6c00b5a68fdc1;hb=5881b8499dc159564d2f69c3b037e16b4d1af4db;hp=98e71a88f32963648aff12e416231198bb11c8e0;hpb=4f5571c3098953378253234b476a5a2b07974065;p=builder.git diff --git a/source/analyzer.cpp b/source/analyzer.cpp index 98e71a8..b040496 100644 --- a/source/analyzer.cpp +++ b/source/analyzer.cpp @@ -3,8 +3,8 @@ #include "analyzer.h" #include "builder.h" #include "objectfile.h" -#include "package.h" #include "sourcefile.h" +#include "sourcepackage.h" #include "target.h" #include "tool.h" @@ -66,7 +66,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth) if(const ObjectFile *obj = dynamic_cast(&tgt)) return build_depend_table(obj->get_source(), depth); } - else if(mode==REBUILD && !tgt.needs_rebuild() && !real->needs_rebuild()) + else if(mode==REBUILD && !tgt.needs_rebuild()) /* All targets that depend on to-be-built targets will be rebuilt themselves, so we can stop here. */ return; @@ -95,12 +95,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth) row.push_back(""); if(tgt.needs_rebuild()) - { - if(tgt.get_rebuild_reason().empty()) - row.push_back("Yes (no reason)"); - else - row.push_back(tgt.get_rebuild_reason()); - } + row.push_back(tgt.get_rebuild_reason()); table.push_back(row);