diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-03-09 14:39:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:54:02 -0500 |
| commit | 6500444a2d74c7d921e7300939f459a83b95ea14 (patch) | |
| tree | 28867a5bdc55e7bc4877b604c2103c77e9397184 /source4/build/smb_build/output.pm | |
| parent | 5ead79baffdf33465d0b650ebb17af009d2af757 (diff) | |
| download | samba-6500444a2d74c7d921e7300939f459a83b95ea14.tar.gz samba-6500444a2d74c7d921e7300939f459a83b95ea14.tar.bz2 samba-6500444a2d74c7d921e7300939f459a83b95ea14.zip | |
r14072: - only add the 'lib' prefix to libraries not modules
- fix installation of plugins (and make it a bit more verbose
- get rid of the '#define libfoo_module_init init_module'
and genereated a wrapper function in bin/libfoo_module_init_module.c
- change the standard visibility for modules to hidden
- a few make clean fixes
metze
(This used to be commit 89b5667ab0f761e679fdee0f5c3d94942e67e28e)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 02e30ceeb5..0897232f98 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -43,15 +43,23 @@ sub generate_shared_library($) { my $lib = shift; my $link_name; + my $lib_name; @{$lib->{DEPEND_LIST}} = (); @{$lib->{LINK_LIST}} = ("\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)"); - $link_name = $lib->{NAME}; - $link_name =~ s/^LIB//; - $link_name = lc($link_name); + $link_name = lc($lib->{NAME}); + $lib_name = $link_name; + + if ($lib->{TYPE} eq "LIBRARY") { + $link_name = $lib->{NAME}; + $link_name =~ s/^LIB//; + $link_name = lc($link_name); + $lib_name = "lib$link_name"; + $lib->{OUTPUT} = "-l$link_name"; + } - $lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_NAME} = "lib$link_name.\$(SHLIBEXT)"; + $lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_NAME} = "$lib_name.\$(SHLIBEXT)"; $lib->{TARGET} = "bin/$lib->{LIBRARY_NAME}"; if (defined($lib->{MAJOR_VERSION})) { $lib->{LIBRARY_SONAME} = $lib->{LIBRARY_NAME}.".$lib->{MAJOR_VERSION}"; @@ -59,7 +67,6 @@ sub generate_shared_library($) $lib->{TARGET} = "bin/$lib->{LIBRARY_REALNAME}"; @{$lib->{LINK_FLAGS}} = ("\$(SONAMEFLAG)$lib->{LIBRARY_SONAME}"); } - $lib->{OUTPUT} = "-l$link_name"; } sub generate_static_library($) |