diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-16 21:36:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:32 -0500 |
| commit | b785a7c40c185512207ef8da837a766933073032 (patch) | |
| tree | e419a3e7dfaf2bd9d71b1c345a235f65fac002ea /source4/build/smb_build | |
| parent | 4469fa31e3e3b2d62da7686fd6426bb44be09830 (diff) | |
| download | samba-b785a7c40c185512207ef8da837a766933073032.tar.gz samba-b785a7c40c185512207ef8da837a766933073032.tar.bz2 samba-b785a7c40c185512207ef8da837a766933073032.zip | |
r14492: Fix shared libs - set SO_VERSION to 0 everywhere for now.
(This used to be commit 4682bc5ce047d81586447b9df82c91ed1fe677cf)
Diffstat (limited to 'source4/build/smb_build')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 5 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index c6752ecde6..7bb7dedb53 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -23,6 +23,7 @@ sub new($$$) $self->{bin_progs} = []; $self->{static_libs} = []; $self->{shared_libs} = []; + $self->{installable_shared_libs} = []; $self->{headers} = []; $self->{shared_modules} = []; $self->{plugins} = []; @@ -213,6 +214,7 @@ sub SharedLibrary($$) if ($ctx->{TYPE} eq "LIBRARY") { push (@{$self->{shared_libs}}, "$ctx->{DEBUGDIR}/$ctx->{LIBRARY_REALNAME}"); + push (@{$self->{installable_shared_libs}}, "$installdir/$ctx->{LIBRARY_REALNAME}"); } elsif ($ctx->{TYPE} eq "MODULE") { push (@{$self->{shared_modules}}, "$ctx->{DEBUGDIR}/$ctx->{LIBRARY_REALNAME}"); push (@{$self->{plugins}}, "$installdir/$ctx->{LIBRARY_REALNAME}"); @@ -442,7 +444,7 @@ sub PkgConfig($$) smb_build::env::PkgConfig($self, $path, $link_name, - $ctx->{OUTPUT}, + "-l$link_name", "", "$ctx->{VERSION}", $ctx->{DESCRIPTION} @@ -491,6 +493,7 @@ sub write($$) $self->output("BINARIES = " . array2oneperline($self->{binaries}) . "\n"); $self->output("STATIC_LIBS = " . array2oneperline($self->{static_libs}) . "\n"); $self->output("SHARED_LIBS = " . array2oneperline($self->{shared_libs}) . "\n"); + $self->output("INSTALLABLE_SHARED_LIBS = " . array2oneperline($self->{installable_shared_libs}) . "\n"); $self->output("PUBLIC_HEADERS = " . array2oneperline($self->{headers}) . "\n"); $self->output("PC_FILES = " . array2oneperline($self->{pc_files}) . "\n"); $self->output("ALL_OBJS = " . array2oneperline($self->{all_objs}) . "\n"); diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 21885bed8c..594d1d48c7 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -66,7 +66,7 @@ sub generate_shared_library($) $lib->{LIBRARY_SONAME} = $lib->{LIBRARY_NAME}.".$lib->{SO_VERSION}"; $lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_NAME}.".$lib->{VERSION}"; } elsif ($lib->{TYPE} eq "MODULE") { - $lib->{DEBUDIR} = "bin/modules/$lib->{SUBSYSTEM}"; + $lib->{DEBUGDIR} = "bin/modules/$lib->{SUBSYSTEM}"; } $lib->{TARGET} = "$lib->{DEBUGDIR}/$lib->{LIBRARY_REALNAME}"; $lib->{OUTPUT} = $lib->{TARGET}; |