X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=c0a233f56d8f51fe3d916ec4c70776330314d7ed;hb=69ad3610053e140cb5108f53e4c46a0583e33559;hp=5022bdd0a636774e7ac648c727ea06e2c3b28d34;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 5022bdd..c0a233f 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -11,8 +11,8 @@ Distributed under the LGPL
 #include "component.h"
 #include "install.h"
 #include "objectfile.h"
-#include "package.h"
 #include "sourcefile.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
@@ -94,5 +94,5 @@ void ObjectFile::add_depend(Target *tgt)
 
 string ObjectFile::generate_target_name(const Component &comp, const string &src)
 {
-	return (comp.get_package().get_temp_dir()/comp.get_name()/(Path::splitext(src.substr(src.rfind('/')+1)).base+".o")).str();
+	return (comp.get_package().get_temp_dir()/comp.get_name()/(splitext(basename(src)).base+".o")).str();
 }