X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstaticlibrary.cpp;h=9ee4a9a79771326c019206bc402645e32aa0b2b8;hb=407b96515a5246384847d1835a2d69704e941ea1;hp=df0cc7cb5811e9b2386f7fa398d9356a91ab1906;hpb=4fcc283a4bb1f695bd124006906bcdaba053193f;p=builder.git

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index df0cc7c..9ee4a9a 100644
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -1,26 +1,30 @@
-#include "archive.h"
+#include "builder.h"
 #include "component.h"
 #include "objectfile.h"
-#include "package.h"
+#include "sourcepackage.h"
 #include "staticlibrary.h"
 
 using namespace std;
+using namespace Msp;
 
-StaticLibrary::StaticLibrary(Builder &b, const Component &c, const std::list<ObjectFile *> &objs):
-	Target(b, &c.get_package(), generate_target_name(c)),
-	comp(c)
+StaticLibrary::StaticLibrary(Builder &b, const FS::Path &p):
+	FileTarget(b, p)
+{ }
+
+StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
+	FileTarget(b, c.get_package(), c.get_package().get_output_directory()/generate_filename(c))
 {
-	buildable=true;
+	component = &c;
 	for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
-		add_depend(*i);
-}
+		add_dependency(**i);
 
-Action *StaticLibrary::build()
-{
-	return Target::build(new Archive(builder, *this));;
+	install_location = "lib";
+	nested_build_sig = true;
+	arch_in_build_sig = true;
 }
 
-string StaticLibrary::generate_target_name(const Component &c)
+string StaticLibrary::generate_filename(const Component &comp)
 {
-	return (c.get_package().get_source()/("lib"+c.get_name()+".a")).str();
+	const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+	return arch.get_static_library_patterns().front().apply(comp.get_name());
 }