diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-29 02:45:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:09 -0500 |
| commit | 9220144604e0050cd823fd107c311bf9013cd5a5 (patch) | |
| tree | 286605a746d941038b4e4ab8775b5520f965aba6 /source4/build | |
| parent | be948e60e78cbd75bf0d545418fc02f71fc47b12 (diff) | |
| download | samba-9220144604e0050cd823fd107c311bf9013cd5a5.tar.gz samba-9220144604e0050cd823fd107c311bf9013cd5a5.tar.bz2 samba-9220144604e0050cd823fd107c311bf9013cd5a5.zip | |
r15313: Fix some dependencies in dso mode
(This used to be commit f0afe9e2ff16515df1b3226b479b19ea3e9c3d0c)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/input.pm | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 8f7e5e4838..0bef89bb5e 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -117,6 +117,8 @@ sub import_integrated($$) my ($lib, $depend) = @_; foreach my $mod (values %$depend) { + next if(not defined($mod->{OUTPUT_TYPE})); + next if($mod->{OUTPUT_TYPE} ne "INTEGRATED"); next if(not defined($mod->{SUBSYSTEM})); next if($mod->{SUBSYSTEM} ne $lib->{NAME}); next if($mod->{ENABLE} ne "YES"); diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index bf12de628f..e6865d5e60 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -240,6 +240,7 @@ 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"); $self->_prepare_list($ctx, "DEPEND_LIST"); @@ -324,6 +325,7 @@ sub StaticLibrary($$) push (@{$self->{static_libs}}, $ctx->{TARGET}); + $self->output("$ctx->{TYPE}_$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); $self->_prepare_list($ctx, "OBJ_LIST"); $self->_prepare_list($ctx, "FULL_OBJ_LIST"); |