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

diff --git a/source/executable.cpp b/source/executable.cpp
index 2dfeee8..4758d5f 100644
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,28 +1,8 @@
 #include "component.h"
 #include "executable.h"
-#include "objectfile.h"
-#include "package.h"
+#include "sourcepackage.h"
 
-using namespace std;
-
-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);
-}
-
-string Executable::generate_target_name(const Component &comp)
-{
-	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();
-}
+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)
+{ }