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

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 3f4ba20..c5a87fd 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,12 +1,19 @@
-#include <msp/algo.h>
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
+#include <algorithm>
 #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;
@@ -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_temp_dir()/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()/(splitext(basename(src)).base+".o")).str();
 }