Code reorganizing and cleanup

[builder.git] / source / compile.cpp

diff --git a/source/compile.cpp b/source/compile.cpp
index d823c30a5ace4d90aab67ec050e9fa8cc1e2379f..fd802bbb54e76d2a960ae140e40003a174aa03a4 100644 (file)
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -3,18 +3,21 @@
 #include "buildinfo.h"
 #include "compile.h"
 #include "component.h"
+#include "objectfile.h"
 #include "package.h"
 
 using namespace std;
 using namespace Msp;
 
-Compile::Compile(Builder &b, const Path::Path &s, const Path::Path &o, const Component &c):
-       ExternalAction(b),
-       source(s),
-       object(o),
-       comp(c)
+Compile::Compile(Builder &b, const ObjectFile &obj):
+       ExternalAction(b)
 {
-       string ext=Path::splitext(source.str()).ext;
+       const Component &comp=obj.get_component();
+
+       const TargetList &deps=obj.get_depends();
+       Path::Path spath=deps.front()->get_name();
+
+       string ext=Path::splitext(spath.str()).ext;
        const char *tool=0;
        if(ext==".cpp" || ext==".cc")
        {
@@ -36,14 +39,15 @@ Compile::Compile(Builder &b, const Path::Path &s, const Path::Path &o, const Com
        for(list<string>::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
                argv.push_back("-D"+*i);
        
+       Path::Path opath=obj.get_name();
        argv.push_back("-o");
-       argv.push_back(object.str());
-       argv.push_back(source.str());
+       argv.push_back(opath.str());
+       argv.push_back(spath.str());
 
        if(!builder.get_dry_run())
-               Path::mkpath(object.subpath(0, object.size()-1), 0755);
+               Path::mkpath(opath.subpath(0, opath.size()-1), 0755);
 
-       announce(comp.get_package().get_name(), tool, relative(object.str(), comp.get_package().get_source()).str());
+       announce(comp.get_package().get_name(), tool, relative(opath, comp.get_package().get_source()).str());
 
        launch();
 }