Rework the Target class hierarchy

[builder.git] / source / compile.cpp

diff --git a/source/compile.cpp b/source/compile.cpp
index 4157ccb58f0afa305fb035bd33088eb3d5906aa0..da1cfefc636adf55e3e05890cec9c43134af026b 100644 (file)
--- 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;
@@ -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());