Rework the Target class hierarchy

[builder.git] / source / staticlibrary.cpp

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index a72f8e01fd478b5b97522d562f50e7af44fa9550..b7e4eff1d43941391393986f92c1acecd1bdab43 100644 (file)
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -13,8 +13,9 @@ 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;
@@ -27,7 +28,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");
 }