Reorder class members

[builder.git] / source / staticlibrary.cpp

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index df0cc7cb5811e9b2386f7fa398d9356a91ab1906..a72f8e01fd478b5b97522d562f50e7af44fa9550 100644 (file)
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -1,7 +1,14 @@
+/* $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 "package.h"
+#include "sourcepackage.h"
 #include "staticlibrary.h"
 
 using namespace std;
@@ -15,12 +22,12 @@ StaticLibrary::StaticLibrary(Builder &b, const Component &c, const std::list<Obj
                add_depend(*i);
 }
 
-Action *StaticLibrary::build()
+Action *StaticLibrary::create_action()
 {
-       return Target::build(new Archive(builder, *this));;
+       return new Archive(builder, *this);
 }
 
 string StaticLibrary::generate_target_name(const Component &c)
 {
-       return (c.get_package().get_source()/("lib"+c.get_name()+".a")).str();
+       return (c.get_package().get_out_dir()/("lib"+c.get_name()+".a")).str();
 }