-#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;
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);
}
}
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();
}