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

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 874f069..c0a233f 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;
@@ -19,6 +25,12 @@ ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &src):
 	add_depend(&src);
 }
 
+/**
+Processes as many new dependences as possible.  Some may be left unprocessed
+if their own dependencies are not ready, requiring another call to this
+function.  Use the get_deps_ready() function to determine whether this is the
+case.
+*/
 void ObjectFile::find_depends()
 {
 	for(TargetList::iterator i=new_deps.begin(); i!=new_deps.end();)
@@ -41,6 +53,9 @@ Action *ObjectFile::build()
 	return Target::build(new Compile(builder, *this));
 }
 
+/**
+Recursively looks for header targets and adds them as dependencies.
+*/
 void ObjectFile::find_depends(Target *tgt)
 {
 	const string &tname=tgt->get_name();
@@ -56,15 +71,21 @@ 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);
 	}
 }
 
+/**
+Adds a target to the dependency list as well as the new dependencies list.
+*/
 void ObjectFile::add_depend(Target *tgt)
 {
 	Target::add_depend(tgt);
@@ -73,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()/(splitext(basename(src)).base+".o")).str();
 }