X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fanalyzer.cpp;h=7ea1fff8c58aa0d1dbcb2e25ffca4e93b1d68e3e;hb=4cc08a580ddcdc025d2ca23c336e76c11414d8e0;hp=58c2b9035ee82e8589086f1e83aa1a7283e463a9;hpb=b818bf324c0c6c379ba2e695834eedb784a68929;p=builder.git

diff --git a/source/analyzer.cpp b/source/analyzer.cpp
index 58c2b90..7ea1fff 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"
 
@@ -26,7 +26,7 @@ void Analyzer::analyze()
 		const Builder::TargetMap &targets = builder.get_targets();
 		for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
 		{
-			const Target::Dependencies &depends = i->second->get_depends();
+			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);
 		}
@@ -45,7 +45,7 @@ void Analyzer::analyze()
 	Target &cmdline = *builder.get_target("cmdline");
 	if(mode==RDEPS)
 	{
-		const Target::Dependencies &deps = cmdline.get_depends();
+		const Target::Dependencies &deps = cmdline.get_dependencies();
 		for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
 			build_depend_table(**i, 0);
 	}
@@ -108,7 +108,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 			depends.assign(rdeps.begin(), rdeps.end());
 		}
 		else
-			depends = tgt.get_depends();
+			depends = tgt.get_dependencies();
 
 		depends.sort(full_paths ? target_order_full : target_order);