diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 23:16:24 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 23:16:24 +0100 |
| commit | 5b0670ea534a53ce9192f72cfc21018cfaff2aac (patch) | |
| tree | 2a1573ee96f0b2b9d94cdf4093d3935087a97f07 | |
| parent | f112578843bcc757bf0b2ee56d8bd8d318b53610 (diff) | |
| download | samba-5b0670ea534a53ce9192f72cfc21018cfaff2aac.tar.gz samba-5b0670ea534a53ce9192f72cfc21018cfaff2aac.tar.bz2 samba-5b0670ea534a53ce9192f72cfc21018cfaff2aac.zip | |
Remove legacy code for public prototype headers.
(This used to be commit b5695abdc6fe90c8a348ac8510a1bad6f6bbdede)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 27 | ||||
| -rw-r--r-- | source4/rules.mk | 6 |
2 files changed, 6 insertions, 27 deletions
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($$) diff --git a/source4/rules.mk b/source4/rules.mk index d39910dafc..f128adc9fa 100644 --- 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 ############################################################################### |