From 3017c49fb3feedf8bb147247d5410ceb70a04f4e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 29 Feb 2008 14:43:54 +0100
Subject: Remove cruft that dealt with public prototype headers. (This used to
 be commit 438997c17951fa7f0a9fb14be14c3b364ed3ad90)

---
 source4/build/smb_build/main.pl     |  3 +--
 source4/build/smb_build/makefile.pm | 38 ++++++-------------------------------
 2 files changed, 7 insertions(+), 34 deletions(-)

(limited to 'source4/build')

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 6c205a69f0..14f334a6ea 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -67,8 +67,7 @@ foreach my $key (values %$OUTPUT) {
 								   $key->{TYPE} eq "PYTHON") and
 					grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
 	$mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES});
-	$mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}) or 
-					 defined($key->{PUBLIC_PROTO_HEADER});
+	$mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER});
 }
 
 foreach my $key (values %$OUTPUT) {
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 5fe0e68e95..9e728fa162 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -350,39 +350,13 @@ sub ProtoHeader($$)
 {
 	my ($self,$ctx) = @_;
 
-	my $target = "";
-	my $comment = "Creating ";
-
-	my $priv = undef;
-	my $pub = undef;
-
-	if (defined($ctx->{PRIVATE_PROTO_HEADER})) {
-		$priv = output::add_dir_str($ctx->{BASEDIR}, $ctx->{PRIVATE_PROTO_HEADER});
-		$target .= $priv;
-		$comment .= $priv;
-		if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
-			$comment .= " and ";
-			$target.= " ";
-		}
-		$self->output("PROTO_HEADERS += $priv\n");
-	} else {
-		$ctx->{PRIVATE_PROTO_HEADER} = $ctx->{PUBLIC_PROTO_HEADER};
-		$priv = output::add_dir_str($ctx->{BASEDIR}, $ctx->{PRIVATE_PROTO_HEADER});
-	}
-
-	if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
-		$pub = output::add_dir_str($ctx->{BASEDIR}, $ctx->{PUBLIC_PROTO_HEADER});
-		$comment .= $pub;
-		$target .= $pub;
-		$self->output("PROTO_HEADERS += $pub\n");
-	} else {
-		$ctx->{PUBLIC_PROTO_HEADER} = $ctx->{PRIVATE_PROTO_HEADER};
-		$pub = output::add_dir_str($ctx->{BASEDIR}, $ctx->{PUBLIC_PROTO_HEADER});
-	}
+	my $priv = output::add_dir_str($ctx->{BASEDIR}, $ctx->{PRIVATE_PROTO_HEADER});
+	$self->output("PROTO_HEADERS += $priv\n");
 
-	$self->output("$pub: $ctx->{MK_FILE} \$($ctx->{NAME}_OBJ_LIST:.o=.c) \$(srcdir)/script/mkproto.pl\n");
-	$self->output("\t\@echo \"$comment\"\n");
-	$self->output("\t\@\$(PERL) \$(srcdir)/script/mkproto.pl --srcdir=\$(srcdir) --builddir=\$(builddir) --private=$priv --public=$pub \$($ctx->{NAME}_OBJ_LIST)\n\n");
+	$self->output("$priv: $ctx->{MK_FILE} \$($ctx->{NAME}_OBJ_LIST:.o=.c) \$(srcdir)/script/mkproto.pl\n");
+	$self->output("\t\@echo \"Creating \$@\"\n");
+	$self->output("\t\@mkdir -p \$(\@D)\n");
+	$self->output("\t\@\$(PERL) \$(srcdir)/script/mkproto.pl --srcdir=\$(srcdir) --builddir=\$(builddir) --all=\$@ \$($ctx->{NAME}_OBJ_LIST)\n\n");
 }
 
 sub write($$)
-- 
cgit