X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstaticlibrary.cpp;h=039eb8e7e52c117a8e5b3dfa14bbf25b1064ddbd;hb=451ef4f33b5a57dcb56bd7cb671bed359ac86247;hp=be88b41bf31d61a34257ea75bfc726df4dca5adf;hpb=ba75b70d983e1af41cd96a9d95d03e03a0edbc00;p=builder.git

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index be88b41..039eb8e 100644
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -7,16 +7,12 @@
 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):
+StaticLibrary::StaticLibrary(Builder &b, const Component &c, const vector<ObjectFile *> &objs):
 	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_dependency(**i);
+	for(ObjectFile *o: objs)
+		add_dependency(*o);
 
 	install_location = "lib";
 	nested_build_sig = true;
@@ -26,7 +22,7 @@ StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list<ObjectFi
 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());
+	return arch.create_filename<StaticLibrary>(comp.get_name());
 }
 
 void StaticLibrary::add_required_library(const string &lib)