summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-19 16:18:07 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:58:47 -0500
commit08d7ec8d0ac13134170a6803b493629e13d6121a (patch)
treebc5fe41b488ec3763f896fa49102091b25ec58d7 /source4
parentc2c79711191dc078c0979c79e7b9a570b290434f (diff)
downloadsamba-08d7ec8d0ac13134170a6803b493629e13d6121a.tar.gz
samba-08d7ec8d0ac13134170a6803b493629e13d6121a.tar.bz2
samba-08d7ec8d0ac13134170a6803b493629e13d6121a.zip
r14563: Include both private and proto names in makefile rule
(This used to be commit 2236ad9096b0ebf19baffb9410bc6347b31c98e9)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/makefile.pm5
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 443a66dfb3..73f315cf4f 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -453,11 +453,15 @@ sub ProtoHeader($$)
$dir =~ s/^\.\///g;
+ my $target = "";
+
my $comment = "Creating ";
if (defined($ctx->{PRIVATE_PROTO_HEADER})) {
+ $target.= "$dir/$ctx->{PRIVATE_PROTO_HEADER}";
$comment.= "$dir/$ctx->{PRIVATE_PROTO_HEADER}";
if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
$comment .= " and ";
+ $target.= " ";
}
push (@{$self->{proto_headers}}, "$dir/$ctx->{PRIVATE_PROTO_HEADER}");
} else {
@@ -466,6 +470,7 @@ sub ProtoHeader($$)
if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
$comment.= "$dir/$ctx->{PUBLIC_PROTO_HEADER}";
+ $target .= "$dir/$ctx->{PUBLIC_PROTO_HEADER}";
push (@{$self->{proto_headers}}, "$dir/$ctx->{PUBLIC_PROTO_HEADER}");
} else {
$ctx->{PUBLIC_PROTO_HEADER} = $ctx->{PRIVATE_PROTO_HEADER};