X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=c5a87fde883117e61d2cafdce85bae1a4656213e;hb=bdc8b6638b486aa668b4a9c6c5cce5f6b5f18222;hp=c0a233f56d8f51fe3d916ec4c70776330314d7ed;hpb=4d0d003b022943d8a0e39ba19078bab8d32d8857;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index c0a233f..c5a87fd 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -5,6 +5,7 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <algorithm>
 #include <msp/path/utils.h>
 #include "builder.h"
 #include "compile.h"
@@ -48,10 +49,6 @@ void ObjectFile::find_depends()
 	deps_ready=new_deps.empty();
 }
 
-Action *ObjectFile::build()
-{
-	return Target::build(new Compile(builder, *this));
-}
 
 /**
 Recursively looks for header targets and adds them as dependencies.
@@ -71,13 +68,12 @@ 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, arch, path, incpath);
+		Target *hdr2=builder.get_header(*i, path, incpath);
 		if(hdr2 && find(depends.begin(), depends.end(), hdr2)==depends.end())
 			add_depend(hdr2);
 	}
@@ -92,7 +88,13 @@ void ObjectFile::add_depend(Target *tgt)
 	new_deps.push_back(tgt);
 }
 
+Action *ObjectFile::create_action()
+{
+	return new Compile(builder, *this);
+}
+
 string ObjectFile::generate_target_name(const Component &comp, const string &src)
 {
-	return (comp.get_package().get_temp_dir()/comp.get_name()/(splitext(basename(src)).base+".o")).str();
+	const SourcePackage &pkg=comp.get_package();
+	return (pkg.get_temp_dir()/comp.get_name()/(splitext(basename(src)).base+".o")).str();
 }