X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstaticlibrary.cpp;h=f69f98f85fd141e7e0a386d7be01c6c3bf44780e;hb=bd2a50ecb9f582c6e9569ffc9f33d41f10363c5f;hp=529aacc193aea8bb30acd58125d99ece41faa32f;hpb=57bdb055acb0453c75b22cb64f35cc0e817a2827;p=builder.git

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index 529aacc..f69f98f 100644
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -1,26 +1,21 @@
-#include "archive.h"
 #include "component.h"
 #include "objectfile.h"
-#include "package.h"
+#include "sourcepackage.h"
 #include "staticlibrary.h"
 
 using namespace std;
 
-StaticLibrary::StaticLibrary(Builder &b, const Component &c, const std::list<ObjectFile *> &objs):
-	Target(b, &c.get_package(), generate_target_name(c)),
+StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
+	FileTarget(b, &c.get_package(), generate_target_path(c)),
+	Library(b, package, path, c.get_name()),
 	comp(c)
 {
-	buildable=true;
+	buildable = true;
 	for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
 		add_depend(*i);
 }
 
-Action *StaticLibrary::build()
+Msp::FS::Path StaticLibrary::generate_target_path(const Component &c)
 {
-	return Target::build(new Archive(builder, *this));;
-}
-
-string StaticLibrary::generate_target_name(const Component &c)
-{
-	return (c.get_package().get_out_dir()/("lib"+c.get_name()+".a")).str();
+	return c.get_package().get_out_dir()/("lib"+c.get_name()+".a");
 }