diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-15 02:25:16 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-15 02:25:16 +0200 |
| commit | 08baea013b73607df0c86f24506912c7e6af6f7e (patch) | |
| tree | 2552f5cc7b5e547ebcc9dc09d4085a344ad1d3e0 /source4/build/smb_build/makefile.pm | |
| parent | b62d7aa8eb2da784186b8cd903775dd12c3f34f7 (diff) | |
| download | samba-08baea013b73607df0c86f24506912c7e6af6f7e.tar.gz samba-08baea013b73607df0c86f24506912c7e6af6f7e.tar.bz2 samba-08baea013b73607df0c86f24506912c7e6af6f7e.zip | |
Move SOVERSION, VERSION and PC_FILE out of smb_build but use make variables directly instead.
(This used to be commit 9d0ae012b0b463278cd054d06788aa998acc2da2)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 9518c2eabe..81aac2fc46 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -214,9 +214,6 @@ sub SharedLibraryPrimitives($$) { my ($self,$ctx) = @_; - $self->output("$ctx->{NAME}_SOVERSION = $ctx->{SO_VERSION}\n") if (defined($ctx->{SO_VERSION})); - $self->output("$ctx->{NAME}_VERSION = $ctx->{VERSION}\n") if (defined($ctx->{VERSION})); - if (not grep(/STATIC_LIBRARY/, @{$ctx->{OUTPUT_TYPE}})) { $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); $self->_prepare_list($ctx, "FULL_OBJ_LIST"); @@ -231,7 +228,7 @@ sub SharedLibrary($$) $ctx->{LIBRARY_SONAME} = ""; } - $self->output("SHARED_LIBS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n") if (defined($ctx->{SO_VERSION})); + $self->output("SHARED_LIBS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n"); $self->_prepare_list($ctx, "DEPEND_LIST"); $self->_prepare_list($ctx, "LINK_FLAGS"); |