Distributed under the LGPL
*/
-#include <msp/path/utils.h>
+#include <algorithm>
+#include <msp/fs/utils.h>
#include "builder.h"
#include "compile.h"
#include "component.h"
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.
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);
}
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()/(FS::basepart(FS::basename(src))+".o")).str();
}