X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=fd1c9758d8f498e04f227bd752cb80f866e4fd30;hb=66d1078c04849ec17a7343d0494d6ed087e04318;hp=683c724306d1f56db62a9585b69aeaf78cadbff7;hpb=242c55b17e6608b29a77ca17a5b677e202a3ca90;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 683c724..fd1c975 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -18,12 +18,13 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &src):
-	Target(b, &c.get_package(), generate_target_name(c, src.get_name())),
-	comp(c)
+ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
+	FileTarget(b, &c.get_package(), generate_target_path(c, FS::basename(s.get_path()))),
+	comp(c),
+	source(s)	
 {
 	buildable=true;
-	add_depend(&src);
+	add_depend(&source);
 }
 
 void ObjectFile::find_depends()
@@ -46,25 +47,22 @@ void ObjectFile::find_depends()
 
 void ObjectFile::find_depends(Target *tgt)
 {
-	const string &tname=tgt->get_name();
-	string path=tname.substr(0, tname.rfind('/'));
-
 	SourceFile *src=dynamic_cast<SourceFile *>(tgt);
 	if(!src)
 	{
-		Install *inst=dynamic_cast<Install *>(tgt);
-		if(inst)
-			src=dynamic_cast<SourceFile *>(inst->get_depends().front());
+		if(Install *inst=dynamic_cast<Install *>(tgt))
+			src=dynamic_cast<SourceFile *>(&inst->get_source());
 	}
 	if(!src)
 		return;
 
+	FS::Path spath=src->get_path();
 	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, incpath);
+		Target *hdr2=builder.get_header(*i, spath, incpath);
 		if(hdr2 && find(depends.begin(), depends.end(), hdr2)==depends.end())
 			add_depend(hdr2);
 	}
@@ -81,8 +79,8 @@ Action *ObjectFile::create_action()
 	return new Compile(builder, *this);
 }
 
-string ObjectFile::generate_target_name(const Component &comp, const string &src)
+FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
 {
 	const SourcePackage &pkg=comp.get_package();
-	return (pkg.get_temp_dir()/comp.get_name()/(FS::basepart(FS::basename(src))+".o")).str();
+	return pkg.get_temp_dir()/comp.get_name()/(FS::basepart(src)+".o");
 }