diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-04 14:38:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:00:14 -0500 |
| commit | 7d53fb50f79e7335f3655fb0016d008a0eeddef7 (patch) | |
| tree | 1a61bf58da047db4875713223c1c488b80b44bfb /source4 | |
| parent | c1a9486fafd4a47f1fb4adaeb564ab759137d05f (diff) | |
| download | samba-7d53fb50f79e7335f3655fb0016d008a0eeddef7.tar.gz samba-7d53fb50f79e7335f3655fb0016d008a0eeddef7.tar.bz2 samba-7d53fb50f79e7335f3655fb0016d008a0eeddef7.zip | |
r14905: Prevent partly generated files when building using heavy parallel make.
(This used to be commit 5446ccc20d7468911bd0b4cd0aedf0a67bba20d1)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/librpc/config.mk | 3 | ||||
| -rw-r--r-- | source4/librpc/tables.pl | 13 |
2 files changed, 5 insertions, 11 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index e02937bead..da158a3f54 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -346,7 +346,8 @@ OBJ_FILES = gen_ndr/ndr_winsrepl.o REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT librpc/gen_ndr/tables.c: $(IDL_NDR_HEADER_FILES) - @$(PERL) $(srcdir)/librpc/tables.pl --output=librpc/gen_ndr/tables.c $(IDL_NDR_HEADER_FILES) + @echo Generating librpc/gen_ndr/tables.c + @$(PERL) $(srcdir)/librpc/tables.pl --output=librpc/gen_ndr/tables.c $(IDL_NDR_HEADER_FILES) > librpc/gen_ndr/tables.c [SUBSYSTEM::NDR_IFACE_TABLE] OBJ_FILES = gen_ndr/tables.o diff --git a/source4/librpc/tables.pl b/source4/librpc/tables.pl index 3dbb58853d..9ad0675cb2 100644 --- a/source4/librpc/tables.pl +++ b/source4/librpc/tables.pl @@ -25,8 +25,6 @@ sub ShowHelp() Usage: tables.pl [options] <idlfile> - Options: - --output OUTNAME put output in OUTNAME.* \n"; exit(0); } @@ -61,16 +59,13 @@ sub process_file($) } if ($found) { - print TABLEC "#include \"$filename\"\n"; + print "#include \"$filename\"\n"; } close(FILE); } -print "Creating $opt_output\n"; -open(TABLEC, ">$opt_output") || die "failed to open $opt_output\n"; - -print TABLEC <<EOF; +print <<EOF; /* Automatically generated by tables.pl. DO NOT EDIT */ @@ -81,7 +76,7 @@ EOF process_file($_) foreach (@ARGV); -print TABLEC <<EOF; +print <<EOF; NTSTATUS dcerpc_register_builtin_interfaces(void) { @@ -92,5 +87,3 @@ $init_fns return NT_STATUS_OK; } EOF - -close(TABLEC); |