Get rid of the Library and SystemLibrary classes as unnecessary abstractions

[builder.git] / source / staticlibrary.cpp

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index c5998867ecb2368a11b3cd0bb59648d84e6442fb..556ee54295963e8c55b7483947f6289160207da1 100644 (file)
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -1,31 +1,23 @@
-/* $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"
 #include "sourcepackage.h"
 #include "staticlibrary.h"
 
 using namespace std;
+using namespace Msp;
+
+StaticLibrary::StaticLibrary(Builder &b, const FS::Path &p):
+       FileTarget(b, 0, p)
+{ }
 
 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)
+       FileTarget(b, &c.get_package(), generate_target_path(c))
 {
-       buildable = true;
+       component = &c;
        for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
                add_depend(*i);
-}
 
-Action *StaticLibrary::create_action()
-{
-       return new Archive(builder, *this);
+       install_location = "lib";
 }
 
 Msp::FS::Path StaticLibrary::generate_target_path(const Component &c)