X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstaticlibrary.cpp;h=853d1b45c4916557321703b9a58d9862644b309f;hb=c3968651eb8a2ba66a95398f0571dd5afd37225c;hp=8e3950f7d97eea35e62c805fa99540f2c6b1d411;hpb=f2b26f1929a8209a746bcf4944165b0ba9ef303f;p=builder.git

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index 8e3950f..853d1b4 100644
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -12,17 +12,35 @@ StaticLibrary::StaticLibrary(Builder &b, const FS::Path &p):
 { }
 
 StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
-	FileTarget(b, c.get_package(), c.get_package().get_out_dir()/generate_filename(c))
+	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);
+	for(ObjectFile *o: objs)
+		add_dependency(*o);
 
 	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());
+	return arch.create_filename<StaticLibrary>(comp.get_name());
+}
+
+void StaticLibrary::add_required_library(const string &lib)
+{
+	build_info.libs.push_back(lib);
+}
+
+void StaticLibrary::add_library_path(const FS::Path &pth)
+{
+	build_info.libpath.push_back(pth);
+}
+
+void StaticLibrary::collect_build_info(BuildInfo &binfo) const
+{
+	Target::collect_build_info(binfo);
+	binfo.update_from(build_info);
 }