X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=bba701d23bc48ca87d03f42790a78f4640a5f907;hb=b0eb979b0dc79269cb3bb5bb2e67ef4e80689cfe;hp=3e531f7ae8a09d2b8fb3def6265ee5e5659cc552;hpb=cbb3c4c6aab7b04f7bd2178fb8f12846d532a472;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 3e531f7..bba701d 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,3 +1,4 @@
+#include <msp/algo.h>
 #include <msp/path/utils.h>
 #include "builder.h"
 #include "compile.h"
@@ -20,7 +21,19 @@ ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &src):
 
 void ObjectFile::find_depends()
 {
-	find_depends(depends.front());
+	for(list<Target *>::iterator i=new_deps.begin(); i!=new_deps.end();)
+	{
+		Target *tgt=*i;
+		if(tgt->get_depends_ready())
+		{
+			i=new_deps.erase(i);
+			find_depends(tgt);
+		}
+		else
+			++i;
+	}
+
+	deps_ready=new_deps.empty();
 }
 
 Action *ObjectFile::build()
@@ -30,6 +43,9 @@ Action *ObjectFile::build()
 
 void ObjectFile::find_depends(Target *tgt)
 {
+	const string &tname=tgt->get_name();
+	string path=tname.substr(0, tname.rfind('/'));
+
 	SourceFile *src=dynamic_cast<SourceFile *>(tgt);
 	if(!src)
 	{
@@ -40,18 +56,21 @@ void ObjectFile::find_depends(Target *tgt)
 	if(!src)
 		return;
 
-	const string &sname=src->get_name();
-	string path=sname.substr(0, sname.rfind('/'));
-
 	const list<string> &includes=src->get_includes();
 	for(list<string>::const_iterator i=includes.begin(); i!=includes.end(); ++i)
 	{
 		Target *hdr2=builder.get_header(*i, path, package->get_build_info().incpath);
-		if(hdr2)
+		if(hdr2 && !contains(depends, hdr2))
 			add_depend(hdr2);
 	}
 }
 
+void ObjectFile::add_depend(Target *tgt)
+{
+	Target::add_depend(tgt);
+	new_deps.push_back(tgt);
+}
+
 string ObjectFile::generate_target_name(const Component &comp, const string &src)
 {
 	return (comp.get_package().get_source()/"temp"/comp.get_name()/(Path::splitext(src.substr(src.rfind('/')+1)).base+".o")).str();