sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-19 10:03:58 +03:00
Code

Some more mergedobj fixes.

Browse Source 
(This used to be commit c481d88d37346885f7809f73035a2bc9f2468848)
This commit is contained in:
Jelmer Vernooij 2008-02-16 20:56:46 +01:00
parent f6dec9de47
commit fe5b7c4986
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source4/build/smb_build/input.pm
View File

@ -76,8 +76,6 @@ sub check_module($$$)
die("Module $mod->{NAME} does not have a SUBSYSTEM set") if not defined($mod->{SUBSYSTEM}); 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})) { if (not exists($INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS})) {
$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS} = []; $INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS} = [];
} }
@ -126,9 +124,7 @@ sub check_library($$$)
return if ($lib->{ENABLE} ne "YES"); return if ($lib->{ENABLE} ne "YES");
unless (defined($lib->{OUTPUT_TYPE})) { unless (defined($lib->{OUTPUT_TYPE})) { $lib->{OUTPUT_TYPE} = $default_ot; }
$lib->{OUTPUT_TYPE} = $default_ot;
}
if (defined($lib->{VERSION}) and not defined($lib->{SO_VERSION})) { if (defined($lib->{VERSION}) and not defined($lib->{SO_VERSION})) {
print "$lib->{NAME}: Please specify SO_VERSION when specifying VERSION\n"; 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_TYPE})) { $lib->{INIT_FUNCTION_TYPE} = "NTSTATUS (*) (void)"; }
unless (defined($lib->{INIT_FUNCTION_SENTINEL})) { $lib->{INIT_FUNCTION_SENTINEL} = "NULL"; } 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); add_libreplace($lib);
} }
@ -281,9 +273,7 @@ sub check($$$$$)
} }
} }
foreach my $k (keys %$INPUT) { foreach my $part (values %$INPUT) {
my $part = $INPUT->{$k};
$part->{LINK_FLAGS} = []; $part->{LINK_FLAGS} = [];
$part->{FULL_OBJ_LIST} = ["\$($part->{NAME}_OBJ_LIST)"]; $part->{FULL_OBJ_LIST} = ["\$($part->{NAME}_OBJ_LIST)"];

1
source4/build/smb_build/makefile.pm
View File

@ -281,6 +281,7 @@ sub MergedObj($$)
{ {
my ($self, $ctx) = @_; my ($self, $ctx) = @_;
$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
$self->_prepare_list($ctx, "OBJ_LIST"); $self->_prepare_list($ctx, "OBJ_LIST");
$self->_prepare_list($ctx, "FULL_OBJ_LIST"); $self->_prepare_list($ctx, "FULL_OBJ_LIST");
push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)"); push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)");