X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fanalyzer.cpp;h=70f5f2076f3a68de00f74479f5f36f2565edee14;hb=7e5ac6af8987bf12f3e338d00e96e8cb74f3534b;hp=dd8894c61b4d61a122c236c8c9116091658a0f2f;hpb=338eefb513953ae55e8e3614c009c242ba8ad74e;p=builder.git

diff --git a/source/analyzer.cpp b/source/analyzer.cpp
index dd8894c..70f5f20 100644
--- a/source/analyzer.cpp
+++ b/source/analyzer.cpp
@@ -2,7 +2,6 @@
 #include <msp/io/print.h>
 #include "analyzer.h"
 #include "builder.h"
-#include "install.h"
 #include "objectfile.h"
 #include "package.h"
 #include "sourcefile.h"
@@ -27,8 +26,8 @@ void Analyzer::analyze()
 		const Builder::TargetMap &targets = builder.get_targets();
 		for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
 		{
-			const TargetList &depends = i->second->get_depends();
-			for(TargetList::const_iterator j=depends.begin(); j!=depends.end(); ++j)
+			const Target::Dependencies &depends = i->second->get_depends();
+			for(Target::Dependencies::const_iterator j=depends.begin(); j!=depends.end(); ++j)
 				rdepends[*j].insert(i->second);
 		}
 	}
@@ -46,8 +45,8 @@ void Analyzer::analyze()
 	Target &cmdline = *builder.get_target("cmdline");
 	if(mode==RDEPS)
 	{
-		const TargetList &deps = cmdline.get_depends();
-		for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+		const Target::Dependencies &deps = cmdline.get_depends();
+		for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
 			build_depend_table(**i, 0);
 	}
 	else
@@ -107,7 +106,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 
 	if(!max_depth || depth<max_depth-1)
 	{
-		TargetList depends;
+		Target::Dependencies depends;
 		if(mode==RDEPS)
 		{
 			const set<Target *> &rdeps = rdepends[&tgt];
@@ -118,7 +117,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 
 		depends.sort(full_paths ? target_order_full : target_order);
 
-		for(TargetList::const_iterator i=depends.begin(); i!=depends.end(); ++i)
+		for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
 			build_depend_table(**i, depth+1);
 	}
 }