Move the Component reference to Target and make it a pointer

[builder.git] / source / staticlibrary.cpp

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index b61f70a03333a59256590559c7ad6495fceb94e4..45ec3df5b64a0251ae00506706f7b4ae81314de6 100644 (file)
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -1,4 +1,3 @@
-#include "archive.h"
 #include "component.h"
 #include "objectfile.h"
 #include "sourcepackage.h"
@@ -8,17 +7,13 @@ using namespace std;
 
 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)
+       Library(b, package, path, c.get_name())
 {
-       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)