svn commit: samba r3465 - in branches/SAMBA_4_0/source/build/smb_build: .

[metze at samba.org]

Author: metze
Date: 2004-11-02 07:15:37 +0000 (Tue, 02 Nov 2004)
New Revision: 3465

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3465

Log:
fix SMB_SUBSYSTEM_NOPROTO()

metze

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pl
   branches/SAMBA_4_0/source/build/smb_build/output.pl
   branches/SAMBA_4_0/source/build/smb_build/public.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pl
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pl	2004-11-02 06:52:59 UTC (rev 3464)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pl	2004-11-02 07:15:37 UTC (rev 3465)
@@ -540,27 +540,14 @@
 # $proto_ctx->{OBJ_LIST} -	the list of objectfiles which sould be scanned by make proto
 #
 # $output -		the resulting output buffer
-sub _prepare_proto_obj_list($$)
+sub _prepare_proto_obj_list($)
 {
 	my $ctx = shift;
-	my $noproto = shift;
 	my $tmplist;
 	my $output;
-	my %proto_obj;
-	use Data::Dumper;
 
-	foreach my $str (@{$ctx->{OBJ_LIST}}) {
-		$proto_obj{$str} = 1;
-	}
-	foreach my $str (keys %{$noproto}) {
-		if ($noproto->{$str}) {
-			delete $proto_obj{"\$(SUBSYSTEM_$str\_OBJS)"};
-		}
-	}
+	$tmplist = array2oneperline($ctx->{OBJ_LIST});
 
-	my @proto_list = (keys %proto_obj);
-	$tmplist = array2oneperline(\@proto_list);
-
 	$output = "
 ###################################
 # Start PROTO OBJ LIST
@@ -669,7 +656,7 @@
 		$output .= _prepare_binary_obj_list(\%{$CTX->{OUTPUT}{BINARIES}{$key}});
 	}
 
-	$output .= _prepare_proto_obj_list(\%{$CTX->{OUTPUT}{PROTO}}, \%{$CTX->{INPUT}{SUBSYSTEMS}{NOPROTO}});
+	$output .= _prepare_proto_obj_list(\%{$CTX->{OUTPUT}{PROTO}});
 
 	return $output;
 }

Modified: branches/SAMBA_4_0/source/build/smb_build/output.pl
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pl	2004-11-02 06:52:59 UTC (rev 3464)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pl	2004-11-02 07:15:37 UTC (rev 3465)
@@ -40,7 +40,9 @@
 		my $NAME = $CTX->{INPUT}{SUBSYSTEMS}{$key}{NAME};
 		my @OBJ_LIST = @{$CTX->{DEPEND}{SUBSYSTEMS}{$key}{OBJ_LIST}};
 
-		push(@{$CTX->{OUTPUT}{PROTO}{OBJ_LIST}},"\$(SUBSYSTEM_$key\_OBJS)");
+		if ($CTX->{INPUT}{SUBSYSTEMS}{$key}{NOPROTO} ne "YES") {
+			push(@{$CTX->{OUTPUT}{PROTO}{OBJ_LIST}},"\$(SUBSYSTEM_$key\_OBJS)");
+		}
 
 		#
 		# set the lists

Modified: branches/SAMBA_4_0/source/build/smb_build/public.m4
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/public.m4	2004-11-02 06:52:59 UTC (rev 3464)
+++ branches/SAMBA_4_0/source/build/smb_build/public.m4	2004-11-02 07:15:37 UTC (rev 3465)
@@ -276,7 +276,7 @@
 dnl		)
 AC_DEFUN([SMB_SUBSYSTEM_NOPROTO],
 [
-	[SMB_SUBSYSTEM_NOPROTO_][$1]="1"
+	[SMB_SUBSYSTEM_NOPROTO_][$1]="YES"
 ])
 
 dnl SMB_SUBSYSTEM(
@@ -293,6 +293,10 @@
 		[SMB_SUBSYSTEM_ENABLE_][$1]="YES";
 	fi
 
+	if test -z "$[SMB_SUBSYSTEM_NOPROTO_][$1]"; then
+		[SMB_SUBSYSTEM_NOPROTO_][$1]="NO";
+	fi
+
 SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 ###################################
 # Start Subsystem $1
@@ -303,7 +307,7 @@
 @{\$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{$1}{REQUIRED_SUBSYSTEMS}} = str2array(\"$5\");
 #
 \$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{$1}{ENABLE} = \"$[SMB_SUBSYSTEM_ENABLE_][$1]\";
-\$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{NOPROTO}{$1} = \"$[SMB_SUBSYSTEM_NOPROTO_][$1]\";
+\$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{$1}{NOPROTO} = \"$[SMB_SUBSYSTEM_NOPROTO_][$1]\";
 # End Subsystem $1
 ###################################
 "
@@ -320,6 +324,10 @@
 		[SMB_SUBSYSTEM_ENABLE_][$1]="YES";
 	fi
 
+	if test -z "$[SMB_SUBSYSTEM_NOPROTO_][$1]"; then
+		[SMB_SUBSYSTEM_NOPROTO_][$1]="NO";
+	fi
+
 SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 ###################################
 # Start Subsystem $1
@@ -330,7 +338,7 @@
 @{\$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{$1}{REQUIRED_SUBSYSTEMS}} = subsystem_get_array(\"$2\", \"$1\", \"REQUIRED_SUBSYSTEMS\");
 #
 \$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{$1}{ENABLE} = \"$[SMB_SUBSYSTEM_ENABLE_][$1]\";
-\$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{NOPROTO}{$1} = \"$[SMB_SUBSYSTEM_NOPROTO_][$1]\";
+\$SMB_BUILD_CTX->{INPUT}{SUBSYSTEMS}{$1}{NOPROTO} = \"$[SMB_SUBSYSTEM_NOPROTO_][$1]\";
 # End Subsystem $1
 ###################################
 "