X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstaticlibrary.cpp;h=c5998867ecb2368a11b3cd0bb59648d84e6442fb;hb=75bdcf13fbd285e2006337ec606ca28fa4ddae9e;hp=a72f8e01fd478b5b97522d562f50e7af44fa9550;hpb=242c55b17e6608b29a77ca17a5b677e202a3ca90;p=builder.git diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp index a72f8e0..c599886 100644 --- a/source/staticlibrary.cpp +++ b/source/staticlibrary.cpp @@ -13,11 +13,12 @@ Distributed under the LGPL using namespace std; -StaticLibrary::StaticLibrary(Builder &b, const Component &c, const std::list &objs): - Target(b, &c.get_package(), generate_target_name(c)), +StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list &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::const_iterator i=objs.begin(); i!=objs.end(); ++i) add_depend(*i); } @@ -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"); }