From 69b51f702af1ded825d5c17bdb97014cac12e752 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 24 Apr 2006 15:47:59 +0000
Subject: r15207: Introduce PRIVATE_DEPENDENCIES and PUBLIC_DEPENDENCIES as
 replacement for REQUIRED_SUBSYSTEMS. (This used to be commit
 adc8a019b6da256f104abed1b82bfde6998a2ac9)

---
 source4/build/m4/public.m4           |  2 +-
 source4/build/smb_build/config_mk.pm | 11 +++++++----
 source4/build/smb_build/input.pm     | 10 ++++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'source4/build')

diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 5ce976f1ab..00699acc6e 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -30,7 +30,7 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 # Start Subsystem $1
 @<:@SUBSYSTEM::$1@:>@
 OBJ_FILES = $2
-REQUIRED_SUBSYSTEMS = $3
+PRIVATE_DEPENDENCIES = $3
 ENABLE = YES
 # End Subsystem $1
 ###################################
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index fa948f4bd9..79107c1c9b 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -22,7 +22,8 @@ my $section_types = {
 	"SUBSYSTEM" => {
 		"OBJ_FILES"		=> "list",
 
-		"REQUIRED_SUBSYSTEMS"	=> "list",
+		"PRIVATE_DEPENDENCIES"	=> "list",
+		"PUBLIC_DEPENDENCIES"	=> "list",
 
 		"ENABLE"		=> "bool",
 
@@ -42,7 +43,8 @@ my $section_types = {
 		"INIT_FUNCTION"		=> "string",
 		"OBJ_FILES"		=> "list",
 
-		"REQUIRED_SUBSYSTEMS"	=> "list",
+		"PUBLIC_DEPENDENCIES"	=> "list",
+		"PRIVATE_DEPENDENCIES"	=> "list",
 
 		"ALIASES" => "list",
 
@@ -58,7 +60,7 @@ my $section_types = {
 	"BINARY" => {
 		"OBJ_FILES"		=> "list",
 
-		"REQUIRED_SUBSYSTEMS"	=> "list",
+		"PRIVATE_DEPENDENCIES"	=> "list",
 
 		"ENABLE"		=> "bool",
 
@@ -82,7 +84,8 @@ my $section_types = {
 
 		"DESCRIPTION"		=> "string",
 
-		"REQUIRED_SUBSYSTEMS"	=> "list",
+		"PRIVATE_DEPENDENCIES"	=> "list",
+		"PUBLIC_DEPENDENCIES"	=> "list",
 
 		"ENABLE"		=> "bool",
 
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 704dafa371..6d9b3f5aac 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -74,10 +74,10 @@ sub check_module($$$)
 
 	if ($mod->{OUTPUT_TYPE} eq "SHARED_LIBRARY") {
 		$mod->{INSTALLDIR} = "MODULESDIR/$mod->{SUBSYSTEM}";
-		push (@{$mod->{REQUIRED_SUBSYSTEMS}}, $mod->{SUBSYSTEM}) unless 
+		push (@{$mod->{PRIVATE_DEPENDENCIES}}, $mod->{SUBSYSTEM}) unless 
 			$INPUT->{$mod->{SUBSYSTEM}}->{TYPE} eq "BINARY";
 	} else {
-		push (@{$INPUT->{$mod->{SUBSYSTEM}}{REQUIRED_SUBSYSTEMS}}, $mod->{NAME});
+		push (@{$INPUT->{$mod->{SUBSYSTEM}}{PRIVATE_DEPENDENCIES}}, $mod->{NAME});
 		push (@{$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS}}, $mod->{INIT_FUNCTION}) if defined($mod->{INIT_FUNCTION});
 	}
 }
@@ -197,12 +197,14 @@ sub check($$$$$)
 		# Generate list of dependencies
 		$part->{DEPENDENCIES} = [];
 
-		foreach my $key (@{$part->{REQUIRED_SUBSYSTEMS}}) {
+		foreach my $key (@{$part->{PUBLIC_DEPENDENCIES}},
+				 @{$part->{PRIVATE_DEPENDENCIES}}) {
 			die("$part->{NAME} has undefined dependency $key\n") if not defined($depend{$key});
 			push (@{$part->{DEPENDENCIES}}, \$depend{$key});
 		}
 
-		delete ($part->{REQUIRED_SUBSYSTEMS});
+		delete ($part->{PRIVATE_DEPENDENCIES});
+		delete ($part->{PUBLIC_DEPENDENCIES});
 	}
 
 	foreach my $part (values %depend) {
-- 
cgit