summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-08-23 13:20:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:16:37 -0500
commitf592640d920ca11b5d4d34a24930f7ab021dd151 (patch)
tree11516c924b8c0fa2989564583720adaaaafdd717
parentec626a732cd5e3900c4db38b0b1ba9b19f9ccf5a (diff)
downloadsamba-f592640d920ca11b5d4d34a24930f7ab021dd151.tar.gz
samba-f592640d920ca11b5d4d34a24930f7ab021dd151.tar.bz2
samba-f592640d920ca11b5d4d34a24930f7ab021dd151.zip
r17754: remove the --always-create option from mkproto.pl
and make this behavior the default. as with make 3.81 and autodependencies this way is much faster as make can use faster codepathes internally. (without this make needed more and more startup time after using autodependencies for a few weeks) metze (This used to be commit e85d7eeb0a233ffb88bec1bc88b697c18bba1ed4)
-rwxr-xr-xsource4/script/mkproto.pl21
1 files changed, 5 insertions, 16 deletions
diff --git a/source4/script/mkproto.pl b/source4/script/mkproto.pl
index 682712b679..13e5715272 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);
@@ -241,20 +238,12 @@ if (not defined($private_file) and defined($public_file)) {
print STDOUT $$private_data;
}
-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";