diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-01-15 10:49:02 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:43:32 -0500 |
| commit | b6e3c0cf0df9294b2c2ac5f97cfd11500c7e713d (patch) | |
| tree | e655769c912259125d02a8ecc9993a6175614574 /source4/build | |
| parent | d363192d6466d3b1654284227addc745ca5d0a81 (diff) | |
| download | samba-b6e3c0cf0df9294b2c2ac5f97cfd11500c7e713d.tar.gz samba-b6e3c0cf0df9294b2c2ac5f97cfd11500c7e713d.tar.bz2 samba-b6e3c0cf0df9294b2c2ac5f97cfd11500c7e713d.zip | |
r20802: - don't add the same Makefile vars twice...
- this fixes a lot of warnings on Tru64
maybe this also fixes the build on Tru64 and HPUX...
metze
(This used to be commit a154fd04c84323d2e9e537e78fd95e29428cfd8a)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index e3853e8534..48379b279d 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -215,6 +215,7 @@ sub SharedLibrary($$) my ($self,$ctx) = @_; my $init_obj = ""; + my $has_static_lib = 0; if ($ctx->{TYPE} eq "LIBRARY") { push (@{$self->{shared_libs}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION})); @@ -237,9 +238,13 @@ sub SharedLibrary($$) } } - $self->output("$ctx->{TYPE}_$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); - $self->_prepare_list($ctx, "OBJ_LIST"); - $self->_prepare_list($ctx, "FULL_OBJ_LIST"); + $has_static_lib = 1 if grep(/STATIC_LIBRARY/, @{$ctx->{OUTPUT_TYPE}}); + + if (not $has_static_lib) { + $self->output("$ctx->{TYPE}_$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); + $self->_prepare_list($ctx, "OBJ_LIST"); + $self->_prepare_list($ctx, "FULL_OBJ_LIST"); + } $self->_prepare_list($ctx, "DEPEND_LIST"); $self->_prepare_list($ctx, "LINK_FLAGS"); |