X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fexecutable.cpp;h=2460f024d0f3f04647a3ba80279409c1639d1b48;hb=2f1e3b296bb8a2c4fcb73d7339cf7d0d6f9d1459;hp=4758d5fd0752a6de93db096965bf693249772454;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git

diff --git a/source/executable.cpp b/source/executable.cpp
index 4758d5f..2460f02 100644
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,8 +1,19 @@
+#include "builder.h"
 #include "component.h"
 #include "executable.h"
 #include "sourcepackage.h"
 
+using namespace std;
+using namespace Msp;
+
 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)
-{ }
+	Binary(b, c, generate_filename(c), objs)
+{
+	install_location = "bin";
+}
+
+string Executable::generate_filename(const Component &comp)
+{
+	const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+	return arch.get_executable_patterns().front().apply(comp.get_name());
+}