Remove legacy code for public prototype headers.

(This used to be commit b5695abdc6fe90c8a348ac8510a1bad6f6bbdede)

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index cde7faf8665040a1fbf00f2296b8fedd72cea80f..676a0d9e2dcb9b880e72717b448938c44f8f0185 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -314,31 +314,10 @@ sub ProtoHeader($$)
 
        my $target = "";
 
-       my $priv = undef;
-       my $pub = undef;
-
-       if (defined($ctx->{PRIVATE_PROTO_HEADER})) {
-               $priv = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER})";
-               $target .= $priv;
-               if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
-                       $target.= " ";
-               }
-               $self->output("PROTO_HEADERS += $priv\n");
-       } else {
-               $ctx->{PRIVATE_PROTO_HEADER} = $ctx->{PUBLIC_PROTO_HEADER};
-               $priv = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER})";
-       }
-
-       if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
-               $pub = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PUBLIC_PROTO_HEADER})";
-               $target .= $pub;
-               $self->output("PROTO_HEADERS += $pub\n");
-       } else {
-               $ctx->{PUBLIC_PROTO_HEADER} = $ctx->{PRIVATE_PROTO_HEADER};
-               $pub = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PUBLIC_PROTO_HEADER})";
-       }
+       $target = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER})";
+       $self->output("PROTO_HEADERS += $target\n");
 
-       $self->output("\$(call proto_header_template, $pub, $priv, \$($ctx->{NAME}_OBJ_LIST:.o=.c))\n");
+       $self->output("\$(call proto_header_template, $target, \$($ctx->{NAME}_OBJ_LIST:.o=.c))\n");
 }
 
 sub write($$)

diff --git a/source4/rules.mk b/source4/rules.mk
index d39910dafc609d42980a70f403a86b7459e8406c..f128adc9fa1e637aba1faa7f94cf6f0d279edee4 100644 (file)
--- a/source4/rules.mk
+++ b/source4/rules.mk
@@ -116,11 +116,11 @@ $(1): $(2)
 endef
 
 # Create a prototype header
-# Arguments: proto header, private header, c files
+# Arguments: header file, c files
 define proto_header_template
-$(1) $(2): $(3)
+$(1): $(2)
        @echo "Creating $@"
-       @$(PERL) $(srcdir)/script/mkproto.pl --srcdir=$(srcdir) --builddir=$(builddir) --private=$(2) --public=$(1) $(3)
+       @$(PERL) $(srcdir)/script/mkproto.pl --srcdir=$(srcdir) --builddir=$(builddir) --private=$(1)) $(2)
 endef
 
 ###############################################################################