X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=809e70d40ba769b5ec4e64b00c5ad75557d78dbb;hb=654de39b62a9a58fd8e1b5a557361d628345788b;hp=2aab39b430906eec4f2bde29ed1a0357c1af7dab;hpb=74266a6e650f019063cdcd1c9a7bd26d8f99041b;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 2aab39b..809e70d 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,12 +1,18 @@
-#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"
 #include "component.h"
 #include "install.h"
 #include "objectfile.h"
-#include "package.h"
 #include "sourcefile.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
@@ -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);
 	}
 }
@@ -85,5 +94,5 @@ void ObjectFile::add_depend(Target *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();
+	return (comp.get_package().get_temp_dir()/comp.get_name()/(Path::splitext(src.substr(src.rfind('/')+1)).base+".o")).str();
 }