X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsharedlibrary.cpp;h=9f983ef1d666fc7a690ed17da7a7cdb135e7ccaf;hb=2606b03da59dc10e3826b833a2fceb0831d79972;hp=c4f42e574ed7a484150966c063d9513d6bb72437;hpb=632361796a7ddadf8a726526c937fab22281fb7b;p=builder.git

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index c4f42e5..9f983ef 100644
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -1,5 +1,6 @@
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include "builder.h"
 #include "component.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
@@ -7,10 +8,17 @@
 using namespace std;
 using namespace Msp;
 
+SharedLibrary::SharedLibrary(Builder &b, const Msp::FS::Path &p):
+	Binary(b, p)
+{
+	libname = FS::basepart(FS::basename(path));
+	if(!libname.compare(0, 3, "lib"))
+		libname = libname.substr(3);
+}
+
 SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
-	FileTarget(b, &c.get_package(), generate_target_path(c)),
-	Binary(b, c, objs),
-	Library(b, &c.get_package(), path, c.get_name()),
+	Binary(b, c, generate_filename(c), objs),
+	libname(c.get_name()),
 	soname(create_soname(c))
 {
 	install_location = "lib";
@@ -21,6 +29,17 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
 	}
 }
 
+string SharedLibrary::generate_filename(const Component &comp)
+{
+	if(comp.get_type()==Component::MODULE)
+		return comp.get_name()+".m";
+	else
+	{
+		const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+		return arch.get_shared_library_patterns().front().apply(comp.get_name());
+	}
+}
+
 string SharedLibrary::create_soname(const Component &c)
 {
 	const string &ver = c.get_package().get_version();