X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=0536755bb26788354d5e147e021f38fe64d0af36;hb=0f7867524bf87a389ff5d4f9d3290d68a254b693;hp=97b5c75a523b34b0cfeff3d0c48413781a109834;hpb=55269a63b0875be0b172453714f9190d30fb1dff;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 97b5c75..0536755 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -11,7 +11,8 @@ using namespace Msp;
 
 ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
 	FileTarget(b, c.get_package(), generate_target_path(c, s.get_path())),
-	source(s)
+	source(s),
+	used_in_shlib(false)
 {
 	component = &c;
 	add_dependency(source);
@@ -20,7 +21,12 @@ ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
 FS::Path ObjectFile::generate_target_path(const Component &comp, const FS::Path &src)
 {
 	const SourcePackage &pkg = comp.get_package();
-	FS::Path rel_src = FS::relative(src, pkg.get_source_directory()).str();
+	FS::Path temp_dir = pkg.get_temp_directory()/comp.get_name();
+	FS::Path rel_src;
+	if(FS::descendant_depth(src, temp_dir)>=0)
+		rel_src = FS::relative(src, temp_dir);
+	else
+		rel_src = FS::relative(src, pkg.get_source_directory());
 	string fn;
 	for(FS::Path::Iterator i=rel_src.begin(); i!=rel_src.end(); ++i)
 	{
@@ -29,7 +35,18 @@ FS::Path ObjectFile::generate_target_path(const Component &comp, const FS::Path
 		if(*i!=".")
 			fn += *i;
 	}
-	return pkg.get_temp_directory()/comp.get_name()/(FS::basepart(fn)+".o");
+	return temp_dir/(FS::basepart(fn)+".o");
+}
+
+void ObjectFile::set_used_in_shared_library(bool u)
+{
+	used_in_shlib = u;
+}
+
+void ObjectFile::collect_build_info(BuildInfo &binfo) const
+{
+	Target::collect_build_info(binfo);
+	binfo.update_from(component->get_build_info_for_path(source.get_path()));
 }
 
 void ObjectFile::find_dependencies()
@@ -86,5 +103,9 @@ void ObjectFile::find_dependencies(FileTarget *tgt)
 
 	for(Dependencies::const_iterator i=deps_to_add.begin(); i!=deps_to_add.end(); ++i)
 		if(find(depends.begin(), depends.end(), *i)==depends.end())
+		{
 			add_dependency(**i);
+			if((*i)->get_real_target()->is_buildable())
+				(*i)->signal_modified.connect(sigc::mem_fun(this, static_cast<void (ObjectFile::*)()>(&ObjectFile::find_dependencies)));
+		}
 }