X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=39372a415c0e67350d0a4862282a74e489dd213e;hb=1d687970cc35e54c3335f4aa2fdef23424fe0a06;hp=e020c1b02981b391cb0172a03e7b98d49a189313;hpb=8fa75f16e653e22f188bc09c5d04c3cdb5cf8c52;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index e020c1b..39372a4 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -14,25 +14,16 @@ ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
 	comp(c),
 	source(s)	
 {
-	buildable = true;
 	add_depend(&source);
 }
 
 void ObjectFile::find_depends()
 {
-	for(Dependencies::iterator i=new_deps.begin(); i!=new_deps.end();)
+	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
 	{
-		Target *tgt = *i;
-		if(tgt->get_depends_ready())
-		{
-			i = new_deps.erase(i);
-			find_depends(dynamic_cast<FileTarget *>(tgt));
-		}
-		else
-			++i;
+		(*i)->prepare();
+		find_depends(dynamic_cast<FileTarget *>(*i));
 	}
-
-	deps_ready = new_deps.empty();
 }
 
 
@@ -71,12 +62,6 @@ void ObjectFile::find_depends(FileTarget *tgt)
 			add_depend(*i);
 }
 
-void ObjectFile::add_depend(Target *tgt)
-{
-	Target::add_depend(tgt);
-	new_deps.push_back(tgt);
-}
-
 FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
 {
 	const SourcePackage &pkg = comp.get_package();