summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-09-20 23:22:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:19:07 -0500
commit9523e42a265892c8bb339dd097d950eacef24513 (patch)
treeda31c2ba252a6b567fe86936f34a4072021e21a3
parent8524a6f5c925c7573d28e2fecd0f5bae58fbc1ff (diff)
downloadsamba-9523e42a265892c8bb339dd097d950eacef24513.tar.gz
samba-9523e42a265892c8bb339dd097d950eacef24513.tar.bz2
samba-9523e42a265892c8bb339dd097d950eacef24513.zip
r18750: Disable not updating the last-modifification-time of proto headers because this was confusing make.
(This used to be commit 4f5987e77f653984c60e3b34cd5aac5aa0a01124)
-rwxr-xr-xsource4/script/mkproto.pl18
1 files changed, 5 insertions, 13 deletions
diff --git a/source4/script/mkproto.pl b/source4/script/mkproto.pl
index bfa1f63667..88e3e2a121 100755
--- a/source4/script/mkproto.pl
+++ b/source4/script/mkproto.pl
@@ -25,7 +25,6 @@ my $public_data = \$_public;
my $private_data = \$_private;
my $builddir = undef;
my $srcdir = undef;
-my $always_create = $ENV{MK_PROTO_ALWAYS_CREATE};
sub public($)
{
@@ -50,7 +49,6 @@ sub usage()
print " --private-define=DEF Same as --define, but just for private header\n";
print " --srcdir=path Read files relative to this directory\n";
print " --builddir=path Write file relative to this directory\n";
- print " --always-create Always create new proto headers, even if the content hasn't changed\n";
print " --help Print this help message\n\n";
exit 0;
}
@@ -67,7 +65,6 @@ GetOptions(
'private-define=s' => \$private_define,
'srcdir=s' => sub { my ($f,$v) = @_; $srcdir = $v; },
'builddir=s' => sub { my ($f,$v) = @_; $builddir = $v; },
- 'always-create' => \$always_create,
'help' => \&usage
) or exit(1);
@@ -245,17 +242,12 @@ if (not defined($private_file) and defined($public_file)) {
my $old_public_data = file_load($public_file);
my $old_private_data = file_load($private_file);
-if (defined($always_create) or not defined($old_public_data) or ($old_public_data ne $$public_data))
-{
- mkpath(dirname($public_file), 0, 0755);
- open(PUBLIC, ">$public_file") or die("Can't open `$public_file': $!");
- print PUBLIC "$$public_data";
- close(PUBLIC);
-}
-
-if (($public_file ne $private_file) and (defined($always_create) or
- not defined($old_private_data) or ($old_private_data ne $$private_data))) {
+mkpath(dirname($public_file), 0, 0755);
+open(PUBLIC, ">$public_file") or die("Can't open `$public_file': $!");
+print PUBLIC "$$public_data";
+close(PUBLIC);
+if ($public_file ne $private_file) {
mkpath(dirname($private_file), 0, 0755);
open(PRIVATE, ">$private_file") or die("Can't open `$private_file': $!");
print PRIVATE "$$private_data";