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

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 2aab39b..778f746 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,12 +1,19 @@
-#include <msp/algo.h>
-#include <msp/path/utils.h>
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
+#include <algorithm>
+#include <msp/fs/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;
@@ -42,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.
@@ -65,11 +68,13 @@ void ObjectFile::find_depends(Target *tgt)
 	if(!src)
 		return;
 
+	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, path, incpath);
+		if(hdr2 && find(depends.begin(), depends.end(), hdr2)==depends.end())
 			add_depend(hdr2);
 	}
 }
@@ -83,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_source()/"temp"/comp.get_name()/(Path::splitext(src.substr(src.rfind('/')+1)).base+".o")).str();
+	const SourcePackage &pkg=comp.get_package();
+	return (pkg.get_temp_dir()/comp.get_name()/(FS::basepart(FS::basename(src))+".o")).str();
 }