X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstaticlibrary.cpp;h=13c4e6798bbc519f100f7bde175f1dceecabdf8c;hb=40177b0cfc0d4e67f971941f632e4f1f7e7c3f88;hp=54fd7926f3e0c644bb62a2a464e21135176f1321;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index 54fd792..13c4e67 100644
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -1,33 +1,22 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#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;
 	for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
 		add_depend(*i);
-}
 
-Action *StaticLibrary::build()
-{
-	return Target::build(new Archive(builder, *this));;
+	install_location = "lib";
 }
 
-string StaticLibrary::generate_target_name(const Component &c)
+Msp::FS::Path StaticLibrary::generate_target_path(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");
 }