More flexible way to manage filename patterns

[builder.git] / source / executable.cpp

diff --git a/source/executable.cpp b/source/executable.cpp
index 4758d5fd0752a6de93db096965bf693249772454..9cd493d01c440935050cd51a6f70be65e9b8a5f0 100644 (file)
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,8 +1,17 @@
+#include "builder.h"
 #include "component.h"
 #include "executable.h"
 #include "sourcepackage.h"
 
-Executable::Executable(Builder &b, const Component &c, const std::list<ObjectFile *> &objs):
-       FileTarget(b, &c.get_package(), generate_target_path(c)),
-       Binary(b, c, objs)
+using namespace std;
+using namespace Msp;
+
+Executable::Executable(Builder &b, const FS::Path &p):
+       Binary(b, p)
 { }
+
+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)
+{
+       install_location = "bin";
+}