X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=1bff8761dd49d2a4a1da3b1f2b2d90bc42a19970;hb=40177b0cfc0d4e67f971941f632e4f1f7e7c3f88;hp=bd1ee1aa82b523c450faeb6c72357e9d6651fc8d;hpb=bd2a50ecb9f582c6e9569ffc9f33d41f10363c5f;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index bd1ee1a..1bff876 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -21,8 +21,7 @@
 #include "gnuccompiler.h"
 #include "gnucxxcompiler.h"
 #include "gnulinker.h"
-#include "header.h"
-#include "install.h"
+#include "installedfile.h"
 #include "misc.h"
 #include "package.h"
 #include "pkgconfig.h"
@@ -270,7 +269,7 @@ int Builder::main()
 				if(j->second->get_package()==i->second)
 				{
 					++count;
-					if(j->second->get_rebuild())
+					if(j->second->needs_rebuild())
 						++to_be_built;
 				}
 			if(count)
@@ -507,7 +506,7 @@ int Builder::create_targets()
 		if(spkg->get_install_flags()&(SourcePackage::LIB|SourcePackage::INCLUDE))
 		{
 			PkgConfig *pc = new PkgConfig(*this, *spkg);
-			install->add_depend(new Install(*this, *spkg, *pc));
+			install->add_depend(new InstalledFile(*this, *spkg, *pc));
 		}
 	}
 
@@ -566,7 +565,7 @@ int Builder::do_build()
 
 	unsigned total = 0;
 	for(map<string, Target *>::const_iterator i=targets.begin(); i!=targets.end(); ++i)
-		if(i->second->is_buildable() && i->second->get_rebuild())
+		if(i->second->is_buildable() && i->second->needs_rebuild())
 			++total;
 
 	if(!total)
@@ -640,7 +639,7 @@ int Builder::do_clean()
 	// Cleaning doesn't care about ordering, so a simpler method can be used
 
 	set<Target *> clean_tgts;
-	TargetList queue;
+	list<Target *> queue;
 	queue.push_back(get_target("cmdline"));
 
 	while(!queue.empty())
@@ -651,8 +650,8 @@ int Builder::do_clean()
 		if(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2))
 			clean_tgts.insert(tgt);
 
-		const TargetList &deps = tgt->get_depends();
-		for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+		const Target::Dependencies &deps = tgt->get_depends();
+		for(list<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
 			if(!clean_tgts.count(*i))
 				queue.push_back(*i);
 	}