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

jelmer at samba.org jelmer at samba.org
Sun Jun 19 23:05:44 GMT 2005


Author: jelmer
Date: 2005-06-19 23:05:43 +0000 (Sun, 19 Jun 2005)
New Revision: 7766

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

Log:
Treat NOPROTO as boolean.
Don't consider ALL_OBJS as a standard subsystem.

Modified:
   branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
   branches/SAMBA_4_0/source/build/smb_build/output.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm	2005-06-19 22:46:12 UTC (rev 7765)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm	2005-06-19 23:05:43 UTC (rev 7766)
@@ -12,7 +12,7 @@
 use strict;
 
 my %attribute_types = (
-	"NOPROTO" => "string",
+	"NOPROTO" => "bool",
    	"REQUIRED_SUBSYSTEMS" => "list",
 	"OUTPUT_TYPE" => "string",
 	"INIT_OBJ_FILES" => "list",

Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm	2005-06-19 22:46:12 UTC (rev 7765)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm	2005-06-19 23:05:43 UTC (rev 7766)
@@ -66,15 +66,23 @@
 	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 @@
 		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}) {



More information about the samba-cvs mailing list