summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-04-02 12:24:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:59:44 -0500
commitbb131115099138d72d093abdb453f8a32677103f (patch)
tree2c716a88aa8e8df0d72a374e36c95845e5d64781 /source4
parent1af925f394b1084779f5b1b5a10c2ec512d7e5be (diff)
downloadsamba-bb131115099138d72d093abdb453f8a32677103f.tar.gz
samba-bb131115099138d72d093abdb453f8a32677103f.tar.bz2
samba-bb131115099138d72d093abdb453f8a32677103f.zip
r14861: regenerate the proto headers when the .mk file changes
metze (This used to be commit e167ce935a5e0c8f859dc2b1fef859418ab9edfb)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/config_mk.pm1
-rw-r--r--source4/build/smb_build/makefile.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index a3cc42b1e7..532580359d 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -191,6 +191,7 @@ sub run_config_mk($$$)
$input->{$name}{NAME} = $name;
$input->{$name}{TYPE} = $type;
+ $input->{$name}{MK_FILE} = $srcdir."/".$filename;
$input->{$name}{BASEDIR} = dirname($filename);
foreach my $key (values %{$result->{$section}}) {
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 0277eb658a..47dea6076a 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -493,7 +493,7 @@ sub ProtoHeader($$)
$ctx->{PUBLIC_PROTO_HEADER} = $ctx->{PRIVATE_PROTO_HEADER};
}
- $self->output("$dir/$ctx->{PUBLIC_PROTO_HEADER}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST:.o=.c)\n");
+ $self->output("$dir/$ctx->{PUBLIC_PROTO_HEADER}: $ctx->{MK_FILE} \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST:.o=.c)\n");
$self->output("\t\@echo \"$comment\"\n");
$self->output("\t\@\$(PERL) \$(srcdir)/script/mkproto.pl --private=$dir/$ctx->{PRIVATE_PROTO_HEADER} --public=$dir/$ctx->{PUBLIC_PROTO_HEADER} \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)\n\n");