sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

Remove legacy code for public prototype headers.

Browse Source 
(This used to be commit b5695abdc6)
This commit is contained in:
Jelmer Vernooij 2008-02-25 23:16:24 +01:00
parent f112578843
commit 5b0670ea53
2 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source4/build/smb_build/makefile.pm
View File

@ -314,31 +314,10 @@ sub ProtoHeader($$)
my $target = "";
my $priv = undef;
my $pub = undef;
$target = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER})";
$self->output("PROTO_HEADERS += $target\n");
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})";
}
$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($$)

6
source4/rules.mk
View File

@ -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
###############################################################################