X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=7db1b2d647939ac6456d48a0b8f12954ba56718c;hb=f0c501af5d99233efd3a45076ffbe69a71294863;hp=a27c067b6a881f8735124ccc7aae71a7b63f41d7;hpb=ad88e1ba08cf798e5f87796021c947cf500a02e1;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index a27c067..7db1b2d 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -17,6 +17,18 @@ ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
 	add_depend(&source);
 }
 
+FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
+{
+	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;
+}
+
 void ObjectFile::find_depends()
 {
 	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
@@ -26,7 +38,6 @@ void ObjectFile::find_depends()
 	}
 }
 
-
 void ObjectFile::find_depends(FileTarget *tgt)
 {
 	FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
@@ -61,15 +72,3 @@ void ObjectFile::find_depends(FileTarget *tgt)
 		if(find(depends.begin(), depends.end(), *i)==depends.end())
 			add_depend(*i);
 }
-
-FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
-{
-	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;
-}