X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcompile.cpp;h=f6a4dd65dc4add29b60ede81725fb2d4d62d24c8;hb=0458300fda4f345f865a7f3ee4fc0f2020a91983;hp=4157ccb58f0afa305fb035bd33088eb3d5906aa0;hpb=242c55b17e6608b29a77ca17a5b677e202a3ca90;p=builder.git

diff --git a/source/compile.cpp b/source/compile.cpp
index 4157ccb..f6a4dd6 100644
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -12,6 +12,7 @@ Distributed under the LGPL
 #include "compile.h"
 #include "component.h"
 #include "objectfile.h"
+#include "sourcefile.h"
 #include "sourcepackage.h"
 
 using namespace std;
@@ -20,24 +21,23 @@ using namespace Msp;
 Compile::Compile(Builder &b, const ObjectFile &obj):
 	ExternalAction(b)
 {
-	const Component &comp=obj.get_component();
+	const Component &comp = obj.get_component();
 
-	work_dir=comp.get_package().get_source();
+	work_dir = comp.get_package().get_source();
 
-	const TargetList &deps=obj.get_depends();
-	FS::Path spath=deps.front()->get_name();
+	FS::Path spath = obj.get_source().get_path();
 
-	string ext=FS::extpart(spath.str());
-	const char *tool=0;
+	string ext = FS::extpart(spath.str());
+	const char *tool = 0;
 	if(ext==".cpp" || ext==".cc")
-		tool="CXX";
+		tool = "CXX";
 	else
-		tool="CC";
+		tool = "CC";
 
 	argv.push_back(builder.get_current_arch().get_tool(tool));
 	argv.push_back("-c");
 
-	const BuildInfo &binfo=comp.get_build_info();
+	const BuildInfo &binfo = comp.get_build_info();
 	for(list<string>::const_iterator i=binfo.warnings.begin(); i!=binfo.warnings.end(); ++i)
 		argv.push_back("-W"+*i);
 	for(list<string>::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i)
@@ -47,7 +47,7 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 	for(list<string>::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
 		argv.push_back("-D"+*i);
 
-	FS::Path opath=obj.get_name();
+	FS::Path opath = obj.get_path();
 	argv.push_back("-o");
 	argv.push_back(relative(opath, work_dir).str());
 	argv.push_back(relative(spath, work_dir).str());
@@ -55,7 +55,7 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 	if(!builder.get_dry_run())
 		FS::mkpath(FS::dirname(opath), 0755);
 
-	announce(comp.get_package().get_name(), tool, relative(opath, work_dir).str());
+	announce(comp.get_package().get_name(), tool, basename(opath));
 
 	launch();
 }