diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 20:56:46 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 20:56:46 +0100 |
| commit | fe5b7c4986b54985880fa8bc38248dab1cc5e9b0 (patch) | |
| tree | 7655e1eabdc4db2572e173fc7904e8b4b9207790 /source4/build | |
| parent | f6dec9de4715892abab6cc9f75c2eb6c70f75947 (diff) | |
| download | samba-fe5b7c4986b54985880fa8bc38248dab1cc5e9b0.tar.gz samba-fe5b7c4986b54985880fa8bc38248dab1cc5e9b0.tar.bz2 samba-fe5b7c4986b54985880fa8bc38248dab1cc5e9b0.zip | |
Some more mergedobj fixes.
(This used to be commit c481d88d37346885f7809f73035a2bc9f2468848)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/input.pm | 16 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 1 |
2 files changed, 4 insertions, 13 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 02eafe2033..825b033fb9 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -76,8 +76,6 @@ sub check_module($$$) die("Module $mod->{NAME} does not have a SUBSYSTEM set") if not defined($mod->{SUBSYSTEM}); - my $use_default = 0; - if (not exists($INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS})) { $INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS} = []; } @@ -126,9 +124,7 @@ sub check_library($$$) return if ($lib->{ENABLE} ne "YES"); - unless (defined($lib->{OUTPUT_TYPE})) { - $lib->{OUTPUT_TYPE} = $default_ot; - } + unless (defined($lib->{OUTPUT_TYPE})) { $lib->{OUTPUT_TYPE} = $default_ot; } if (defined($lib->{VERSION}) and not defined($lib->{SO_VERSION})) { print "$lib->{NAME}: Please specify SO_VERSION when specifying VERSION\n"; @@ -141,12 +137,8 @@ sub check_library($$$) } unless (defined($lib->{INIT_FUNCTION_TYPE})) { $lib->{INIT_FUNCTION_TYPE} = "NTSTATUS (*) (void)"; } - unless (defined($lib->{INIT_FUNCTION_SENTINEL})) { $lib->{INIT_FUNCTION_SENTINEL} = "NULL"; } - - unless(defined($lib->{INSTALLDIR})) { - $lib->{INSTALLDIR} = "LIBDIR"; - } + unless (defined($lib->{INSTALLDIR})) { $lib->{INSTALLDIR} = "LIBDIR"; } add_libreplace($lib); } @@ -281,9 +273,7 @@ sub check($$$$$) } } - foreach my $k (keys %$INPUT) { - my $part = $INPUT->{$k}; - + foreach my $part (values %$INPUT) { $part->{LINK_FLAGS} = []; $part->{FULL_OBJ_LIST} = ["\$($part->{NAME}_OBJ_LIST)"]; diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 34092c69bd..16b46ed343 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -281,6 +281,7 @@ sub MergedObj($$) { my ($self, $ctx) = @_; + $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); $self->_prepare_list($ctx, "OBJ_LIST"); $self->_prepare_list($ctx, "FULL_OBJ_LIST"); push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)"); |