X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=cd870592530f74b0220b6e5ed9692c090db16e8b;hb=409a427f912f9c203b102beed0816b53b250931f;hp=ba20f7d8bde6428e0a951536a78f9d7cc8385a7c;hpb=3aad704c2d2fac737424a0a2697874927bd95c37;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index ba20f7d..cd87059 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -19,11 +19,11 @@ using namespace std;
 using namespace Msp;
 
 ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
-	FileTarget(b, &c.get_package(), generate_target_path(c, FS::basename(s.get_path()))),
+	FileTarget(b, &c.get_package(), generate_target_path(c, FS::relative(s.get_path(), c.get_package().get_source()).str())),
 	comp(c),
 	source(s)	
 {
-	buildable=true;
+	buildable = true;
 	add_depend(&source);
 }
 
@@ -31,44 +31,36 @@ void ObjectFile::find_depends()
 {
 	for(TargetList::iterator i=new_deps.begin(); i!=new_deps.end();)
 	{
-		Target *tgt=*i;
+		Target *tgt = *i;
 		if(tgt->get_depends_ready())
 		{
-			i=new_deps.erase(i);
+			i = new_deps.erase(i);
 			find_depends(tgt);
 		}
 		else
 			++i;
 	}
 
-	deps_ready=new_deps.empty();
+	deps_ready = new_deps.empty();
 }
 
 
 void ObjectFile::find_depends(Target *tgt)
 {
-	SourceFile *src=dynamic_cast<SourceFile *>(tgt);
-	FileTarget *file=src;
-	if(!src)
-	{
-		if(Install *inst=dynamic_cast<Install *>(tgt))
-		{
-			file=inst;
-			src=dynamic_cast<SourceFile *>(&inst->get_source());
-		}
-	}
-	if(!src)
+	SourceFile *src = dynamic_cast<SourceFile *>(tgt->get_real_target());
+	FileTarget *file = dynamic_cast<FileTarget *>(tgt);
+	if(!src || !file)
 		return;
 
-	FS::Path spath=FS::dirname(file->get_path());
-	const StringList &incpath=comp.get_build_info().incpath;
+	FS::Path spath = FS::dirname(file->get_path());
+	const StringList &incpath = comp.get_build_info().incpath;
 
-	const list<string> &includes=src->get_includes();
+	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, spath, incpath);
-		if(hdr2 && find(depends.begin(), depends.end(), hdr2)==depends.end())
-			add_depend(hdr2);
+		Target *hdr = builder.get_header(*i, spath, incpath);
+		if(hdr && find(depends.begin(), depends.end(), hdr)==depends.end())
+			add_depend(hdr);
 	}
 }
 
@@ -85,6 +77,12 @@ Action *ObjectFile::create_action()
 
 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(src)+".o");
+	const SourcePackage &pkg = comp.get_package();
+	string fn = FS::basepart(src)+".o";
+	if(!fn.compare(0, 2, "./"))
+		fn.erase(0, 2);
+	for(string::iterator i=fn.begin(); i!=fn.end(); ++i)
+		if(*i=='/')
+			*i = '_';
+	return pkg.get_temp_dir()/comp.get_name()/fn;
 }