X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=5022bdd0a636774e7ac648c727ea06e2c3b28d34;hb=7aeaa4ba965f596edad438c02e345a8843f7469a;hp=3f4ba2019f32a835449d72ce336f0f08076573d7;hpb=57bdb055acb0453c75b22cb64f35cc0e817a2827;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 3f4ba20..5022bdd 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,4 +1,10 @@
-#include <msp/algo.h>
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <msp/path/utils.h>
 #include "builder.h"
 #include "compile.h"
@@ -65,11 +71,14 @@ void ObjectFile::find_depends(Target *tgt)
 	if(!src)
 		return;
 
+	const string &arch=comp.get_package().get_arch();
+	const StringList &incpath=comp.get_build_info().incpath;
+
 	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, comp.get_build_info().incpath);
-		if(hdr2 && !contains(depends, hdr2))
+		Target *hdr2=builder.get_header(*i, arch, path, incpath);
+		if(hdr2 && find(depends.begin(), depends.end(), hdr2)==depends.end())
 			add_depend(hdr2);
 	}
 }