From 5b0670ea534a53ce9192f72cfc21018cfaff2aac Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 25 Feb 2008 23:16:24 +0100 Subject: Remove legacy code for public prototype headers. (This used to be commit b5695abdc6fe90c8a348ac8510a1bad6f6bbdede) --- source4/build/smb_build/makefile.pm | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) (limited to 'source4/build') diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index cde7faf866..676a0d9e2d 100644 --- 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($$) -- cgit