More flexible way to manage filename patterns

[builder.git] / source / executable.cpp

diff --git a/source/executable.cpp b/source/executable.cpp
index 2dfeee8affbbbce98ee5a812da75433ca60d32b2..9cd493d01c440935050cd51a6f70be65e9b8a5f0 100644 (file)
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,28 +1,17 @@
+#include "builder.h"
 #include "component.h"
 #include "executable.h"
-#include "objectfile.h"
-#include "package.h"
+#include "sourcepackage.h"
 
 using namespace std;
+using namespace Msp;
 
-Executable::Executable(Builder &b, const Component &c, const list<ObjectFile *> &objs):
-       Target(b, &c.get_package(), generate_target_name(c)),
-       comp(c)
-{
-       for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
-               add_depend(*i);
-}
+Executable::Executable(Builder &b, const FS::Path &p):
+       Binary(b, p)
+{ }
 
-string Executable::generate_target_name(const Component &comp)
+Executable::Executable(Builder &b, const Component &c, const list<ObjectFile *> &objs):
+       Binary(b, c, b.get_current_arch().create_filename<Executable>(c.get_name()), objs)
 {
-       string prefix;
-       string suffix;
-
-       if(comp.get_type()==Component::LIBRARY)
-       {
-               prefix="lib";
-               suffix=".so";
-       }
-
-       return (comp.get_package().get_source()/(prefix+comp.get_name()+suffix)).str();
+       install_location = "bin";
 }