Un-abbreviate function names

[builder.git] / source / staticlibrary.cpp

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index db04f0a80ef2ec9094acbace22d7b2187b78293d..29abc0d36efda33358038d8db90f703e2458f5e4 100644 (file)
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -8,15 +8,15 @@ using namespace std;
 using namespace Msp;
 
 StaticLibrary::StaticLibrary(Builder &b, const FS::Path &p):
-       FileTarget(b, 0, p)
+       FileTarget(b, p)
 { }
 
 StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
-       FileTarget(b, &c.get_package(), c.get_package().get_out_dir()/generate_filename(c))
+       FileTarget(b, c.get_package(), c.get_package().get_output_directory()/generate_filename(c))
 {
        component = &c;
        for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
-               add_depend(*i);
+               add_dependency(**i);
 
        install_location = "lib";
 }