X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstaticlibrary.cpp;h=5ff84770021f4b67af5b64e0c505f14f7e586a62;hb=42d80b43a463627e0e7edf6df3be9bd4b976d74c;hp=45ec3df5b64a0251ae00506706f7b4ae81314de6;hpb=632361796a7ddadf8a726526c937fab22281fb7b;p=builder.git

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index 45ec3df..5ff8477 100644
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -1,22 +1,41 @@
+#include "builder.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, 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())
+	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";
+	nested_build_sig = true;
+	arch_in_build_sig = true;
+}
+
+string StaticLibrary::generate_filename(const Component &comp)
+{
+	const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+	return arch.get_static_library_patterns().front().apply(comp.get_name());
+}
+
+void StaticLibrary::add_required_library(const string &lib)
+{
+	build_info.libs.push_back(lib);
 }
 
-Msp::FS::Path StaticLibrary::generate_target_path(const Component &c)
+void StaticLibrary::collect_build_info(BuildInfo &binfo) const
 {
-	return c.get_package().get_out_dir()/("lib"+c.get_name()+".a");
+	Target::collect_build_info(binfo);
+	binfo.update_from(build_info);
 }