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

r7766: Treat NOPROTO as boolean.

Browse Source 
Don't consider ALL_OBJS as a standard subsystem.
(This used to be commit 6b9a12249f152e9c4635d4f6c7f3a1b885c78ec6)
This commit is contained in:
Jelmer Vernooij 2005-06-19 23:05:43 +00:00 committed by Gerald (Jerry) Carter
parent f3661e2062
commit 18a1d6862f
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/build/smb_build/config_mk.pm
View File

@ -12,7 +12,7 @@ use smb_build::input;
use strict;
my %attribute_types = (
"NOPROTO" => "string",
"NOPROTO" => "bool",
"REQUIRED_SUBSYSTEMS" => "list",
"OUTPUT_TYPE" => "string",
"INIT_OBJ_FILES" => "list",

27
source4/build/smb_build/output.pm
View File

@ -66,15 +66,23 @@ sub create_output($)
my $depend = shift;
my $part;
$depend->{PROTO}{OUTPUT_TYPE} = "OBJLIST";
$depend->{PROTO}{TYPE} = "PROTO";
$depend->{PROTO}{NAME} = "PROTO";
$depend->{PROTO} = {
OUTPUT_TYPE => "OBJLIST",
TYPE => "PROTO",
NAME => "PROTO",
OBJ_LIST => []
};
$depend->{ALL_OBJS}{OUTPUT_TYPE} = "OBJLIST";
$depend->{ALL_OBJS}{TYPE} = "";
$depend->{ALL_OBJS}{NAME} = "ALL_OBJS";
$depend->{ALL_OBJS} = {
OUTPUT_TYPE => "OBJLIST",
TYPE => "",
NAME => "ALL_OBJS",
OBJ_LIST => []
};
foreach $part (values %{$depend}) {
next if $part->{NAME} eq "PROTO";
next if $part->{NAME} eq "ALL_OBJS";
next if not defined($part->{OUTPUT_TYPE});
generate_binary($part) if $part->{OUTPUT_TYPE} eq "BINARY";
@ -87,8 +95,11 @@ sub create_output($)
push(@{$part->{OBJ_LIST}}, @{$part->{ADD_OBJ_FILES}}) if defined($part->{ADD_OBJ_FILES});
push(@{$part->{OBJ_LIST}}, @{$part->{OBJ_FILES}}) if defined($part->{OBJ_FILES});
push(@{$depend->{ALL_OBJS}{OBJ_LIST}}, @{$part->{OBJ_LIST}}) if (defined(@{$part->{OBJ_LIST}}));
push(@{$depend->{PROTO}{OBJ_LIST}}, @{$part->{OBJ_LIST}}) if ((not defined ($part->{NOPROTO}) or $part->{NOPROTO} eq "NO") and defined(@{$part->{OBJ_LIST}}));
push(@{$depend->{ALL_OBJS}->{OBJ_LIST}}, @{$part->{OBJ_LIST}}) if (defined(@{$part->{OBJ_LIST}}));
if ((not defined ($part->{NOPROTO})) or ($part->{NOPROTO} eq "NO")) {
push(@{$depend->{PROTO}->{OBJ_LIST}}, @{$part->{OBJ_LIST}}) if (defined(@{$part->{OBJ_LIST}}));
}
}
foreach $part (values %{$depend}) {