Move public header accumulation out of the perl code.

(This used to be commit 89f7c74924965071981bbe7e05ff69847b0a3a03)

4 files changed, 0 insertions, 23 deletions

diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 74a56a375a..7e0d2f8f56 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -38,8 +38,6 @@ my $section_types = {
 
 		"PRIVATE_PROTO_HEADER"	=> "string",
 
-		"PUBLIC_HEADERS"	=> "list",
-
 		"CFLAGS"		=> "list",
 		"LDFLAGS"		=> "list",
 		"STANDARD_VISIBILITY"	=> "string",
@@ -97,8 +95,6 @@ my $section_types = {
 
 		"ENABLE"		=> "bool",
 
-		"PUBLIC_HEADERS"	=> "list",
-
 		"PRIVATE_PROTO_HEADER"	=> "string",
 
 		"CFLAGS"		=> "list",
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 8c9a6efacc..948f2657b4 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -233,14 +233,6 @@ sub check($$$$$)
 	my ($INPUT, $enabled, $subsys_ot, $lib_ot, $module_ot) = @_;
 
 	foreach my $part (values %$INPUT) {
-		unless (defined($part->{PUBLIC_HEADERS})) {
-			$part->{PUBLIC_HEADERS} = [];
-		}
-		
-		if (defined($part->{PUBLIC_PROTO_HEADER})) {
-			push (@{$part->{PUBLIC_HEADERS}}, $part->{PUBLIC_PROTO_HEADER});
-		}
-
 		if (defined($enabled->{$part->{NAME}})) { 
 			$part->{ENABLE} = $enabled->{$part->{NAME}};
 			next;
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 7a6988515c..cb7bf7439e 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -62,7 +62,6 @@ foreach my $key (values %$OUTPUT) {
 		$shared_libs_used = 1;
 	}
 	$mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES});
-	$mkenv->Header($key) if defined($key->{PUBLIC_HEADERS});
 	if ($key->{TYPE} eq "MODULE" and @{$key->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ" and defined($key->{INIT_FUNCTION})) {
 		$mkenv->output("$key->{SUBSYSTEM}_INIT_FUNCTIONS += $key->{INIT_FUNCTION},\n");
 	}
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 9a66cccbfe..3d7c73560d 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -259,15 +259,6 @@ sub StaticLibrary($$)
 	$self->output("$ctx->{RESULT_STATIC_LIBRARY}: \$($ctx->{NAME}_FULL_OBJ_LIST)\n");
 }
 
-sub Header($$)
-{
-	my ($self,$ctx) = @_;
-
-	return if ($#{$ctx->{PUBLIC_HEADERS}} == -1);
-
-	$self->output("PUBLIC_HEADERS += \$(addprefix $ctx->{BASEDIR}/, " . join(" ", @{$ctx->{PUBLIC_HEADERS}}) . ")\n");
-}
-
 sub Binary($$)
 {
 	my ($self,$ctx) = @_;
@@ -306,7 +297,6 @@ sub ProtoHeader($$)
 
 	my $target = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER})";
 	$self->output("PROTO_HEADERS += $target\n");
-
 	$self->output("\$(call proto_header_template, $target, \$($ctx->{NAME}_OBJ_LIST:.o=.c))\n");
 }