X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fanalyzer.cpp;h=b04049683461f93f2e94fb5e66a6c00b5a68fdc1;hb=30b1243ff16b908ae18b4ab9d70f772c9196b949;hp=70f5f2076f3a68de00f74479f5f36f2565edee14;hpb=8fa75f16e653e22f188bc09c5d04c3cdb5cf8c52;p=builder.git

diff --git a/source/analyzer.cpp b/source/analyzer.cpp
index 70f5f20..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<const ObjectFile *>(&tgt))
 			return build_depend_table(obj->get_source(), depth);
 	}
-	else if(mode==REBUILD && !tgt.get_rebuild() && !real->get_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;
@@ -94,13 +94,8 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 	else
 		row.push_back("");
 
-	if(tgt.get_rebuild())
-	{
-		if(tgt.get_rebuild_reason().empty())
-			row.push_back("Yes (no reason)");
-		else
-			row.push_back(tgt.get_rebuild_reason());
-	}
+	if(tgt.needs_rebuild())
+		row.push_back(tgt.get_rebuild_reason());
 
 	table.push_back(row);