svn commit: samba r14905 - in branches/SAMBA_4_0/source/librpc: .

jelmer at samba.org jelmer at samba.org
Tue Apr 4 14:38:06 GMT 2006


Author: jelmer
Date: 2006-04-04 14:38:05 +0000 (Tue, 04 Apr 2006)
New Revision: 14905

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14905

Log:
Prevent partly generated files when building using heavy parallel make.

Modified:
   branches/SAMBA_4_0/source/librpc/config.mk
   branches/SAMBA_4_0/source/librpc/tables.pl


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.mk	2006-04-04 04:16:02 UTC (rev 14904)
+++ branches/SAMBA_4_0/source/librpc/config.mk	2006-04-04 14:38:05 UTC (rev 14905)
@@ -346,7 +346,8 @@
 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

Modified: branches/SAMBA_4_0/source/librpc/tables.pl
===================================================================
--- branches/SAMBA_4_0/source/librpc/tables.pl	2006-04-04 04:16:02 UTC (rev 14904)
+++ branches/SAMBA_4_0/source/librpc/tables.pl	2006-04-04 14:38:05 UTC (rev 14905)
@@ -25,8 +25,6 @@
 
            Usage: tables.pl [options] <idlfile>
 
-           Options:
-             --output OUTNAME      put output in OUTNAME.*
            \n";
     exit(0);
 }
@@ -61,17 +59,14 @@
 	}
 
 	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 <<EOF;
 
-print TABLEC <<EOF;
-
 /* Automatically generated by tables.pl. DO NOT EDIT */
 
 #include "includes.h"
@@ -81,7 +76,7 @@
 
 process_file($_) foreach (@ARGV);
 
-print TABLEC <<EOF;
+print <<EOF;
 
 NTSTATUS dcerpc_register_builtin_interfaces(void)
 {
@@ -92,5 +87,3 @@
 	return NT_STATUS_OK;
 }
 EOF
-
-close(TABLEC);



More information about the samba-cvs mailing list