X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstaticlibrary.cpp;h=b61f70a03333a59256590559c7ad6495fceb94e4;hb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;hp=a72f8e01fd478b5b97522d562f50e7af44fa9550;hpb=242c55b17e6608b29a77ca17a5b677e202a3ca90;p=builder.git

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index a72f8e0..b61f70a 100644
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "archive.h"
 #include "component.h"
 #include "objectfile.h"
@@ -13,11 +6,12 @@ Distributed under the LGPL
 
 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);
 }
@@ -27,7 +21,7 @@ Action *StaticLibrary::create_action()
 	return new Archive(builder, *this);
 }
 
-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");
 }