Improve target names in announces

[builder.git] / source / compile.cpp

diff --git a/source/compile.cpp b/source/compile.cpp
index 634ccd81ff433cc31d6d7febe4a11cc3da36b98f..4a0e85ed5cab98db2a74e125d4541cae53d7e512 100644 (file)
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -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;
@@ -24,8 +25,7 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 
        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;
@@ -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();
 }