From c0d6066d99bc844873bf2772848cf84e6c2d6c84 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Sun, 15 Jun 2008 23:50:50 -0700 Subject: [PATCH] syncfiles: use #-- ... --# for consistency with mkdep.pl mkdep.pl already used #-- ... --# (two dashes) whereas syncfiles.pl was using #--- ... ---# (three dashes). Change syncfiles.pl to match mkdep.pl. --- Makefile.in | 4 ++-- Mkfiles/msvc.mak | 4 ++-- Mkfiles/netware.mak | 4 ++-- Mkfiles/openwcom.mak | 4 ++-- Mkfiles/owlinux.mak | 4 ++-- syncfiles.pl | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile.in b/Makefile.in index 10a83680..e6447a8c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -58,7 +58,7 @@ X = @EXEEXT@ .1.man: $(NROFF) -man $< > $@ -#--- Begin File Lists ---# +#-- Begin File Lists --# NASM = nasm.$(O) nasmlib.$(O) raa.$(O) saa.$(O) \ float.$(O) insnsa.$(O) insnsb.$(O) \ assemble.$(O) labels.$(O) hashtbl.$(O) crc64.$(O) parser.$(O) \ @@ -73,7 +73,7 @@ NASM = nasm.$(O) nasmlib.$(O) raa.$(O) saa.$(O) \ NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) nasmlib.$(O) \ insnsd.$(O) insnsb.$(O) insnsn.$(O) regs.$(O) regdis.$(O) -#--- End File Lists ---# +#-- End File Lists --# all: nasm$(X) ndisasm$(X) nasm.man ndisasm.man cd rdoff && $(MAKE) all diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index 7264ff44..62ef1ce4 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -32,7 +32,7 @@ X = .exe .c.obj: $(CC) /c $(ALL_CFLAGS) /Fo$@ $< -#--- Begin File Lists ---# +#-- Begin File Lists --# # Edit in Makefile.in, not here! NASM = nasm.$(O) nasmlib.$(O) raa.$(O) saa.$(O) \ float.$(O) insnsa.$(O) insnsb.$(O) \ @@ -48,7 +48,7 @@ NASM = nasm.$(O) nasmlib.$(O) raa.$(O) saa.$(O) \ NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) nasmlib.$(O) \ insnsd.$(O) insnsb.$(O) insnsn.$(O) regs.$(O) regdis.$(O) -#--- End File Lists ---# +#-- End File Lists --# all: nasm$(X) ndisasm$(X) rem cd rdoff && $(MAKE) all diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak index 6f72dd5d..6384714e 100644 --- a/Mkfiles/netware.mak +++ b/Mkfiles/netware.mak @@ -28,7 +28,7 @@ LDFLAGS+=-s O = o -#--- Begin File Lists ---# +#-- Begin File Lists --# # Edit in Makefile.in, not here! NASM = nasm.o nasmlib.o raa.o saa.o \ float.o insnsa.o insnsb.o \ @@ -44,7 +44,7 @@ NASM = nasm.o nasmlib.o raa.o saa.o \ NDISASM = ndisasm.o disasm.o sync.o nasmlib.o \ insnsd.o insnsb.o insnsn.o regs.o regdis.o -#--- End File Lists ---# +#-- End File Lists --# NASM_OBJ = $(addprefix $(OBJDIR)/,$(notdir $(NASM))) $(EOLIST) NDIS_OBJ = $(addprefix $(OBJDIR)/,$(notdir $(NDISASM))) $(EOLIST) diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak index bee458ec..de586960 100644 --- a/Mkfiles/openwcom.mak +++ b/Mkfiles/openwcom.mak @@ -44,7 +44,7 @@ X = .exe $(CC) -c $(ALL_CFLAGS) -fo=$^@ $[@ # Note: wcl386 is broken if forward slashes are used as path separators. -#--- Begin File Lists ---# +#-- Begin File Lists --# # Edit in Makefile.in, not here! NASM = nasm.$(O) nasmlib.$(O) raa.$(O) saa.$(O) & float.$(O) insnsa.$(O) insnsb.$(O) & @@ -60,7 +60,7 @@ NASM = nasm.$(O) nasmlib.$(O) raa.$(O) saa.$(O) & NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) nasmlib.$(O) & insnsd.$(O) insnsb.$(O) insnsn.$(O) regs.$(O) regdis.$(O) -#--- End File Lists ---# +#-- End File Lists --# what: .SYMBOLIC @echo Please build "dos", "win32" or "os2" diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak index fbd36e3b..4dd5eefd 100644 --- a/Mkfiles/owlinux.mak +++ b/Mkfiles/owlinux.mak @@ -55,7 +55,7 @@ X = .exe .c.$(O): $(CC) -c $(ALL_CFLAGS) -fo=$@ $< -#--- Begin File Lists ---# +#-- Begin File Lists --# # Edit in Makefile.in, not here! NASM = nasm.$(O) nasmlib.$(O) raa.$(O) saa.$(O) \ float.$(O) insnsa.$(O) insnsb.$(O) \ @@ -71,7 +71,7 @@ NASM = nasm.$(O) nasmlib.$(O) raa.$(O) saa.$(O) \ NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) nasmlib.$(O) \ insnsd.$(O) insnsb.$(O) insnsn.$(O) regs.$(O) regdis.$(O) -#--- End File Lists ---# +#-- End File Lists --# what: @echo 'Please build "dos", "win32" or "os2"' diff --git a/syncfiles.pl b/syncfiles.pl index f7e1163b..95969231 100755 --- a/syncfiles.pl +++ b/syncfiles.pl @@ -51,7 +51,7 @@ foreach $file (@ARGV) { while (defined($line = )) { chomp $line; if ($processing) { - if ($line eq '#--- End File Lists ---#') { + if ($line eq '#-- End File Lists --#') { push(@lines, $line."\n"); $processing = 0; } elsif ($first) { @@ -68,7 +68,7 @@ foreach $file (@ARGV) { } } else { push(@lines, $line."\n"); - if ($line eq '#--- Begin File Lists ---#') { + if ($line eq '#-- Begin File Lists --#') { $processing = 1; if (!$first) { push(@lines, "# Edit in $first_file, not here!\n"); -- 2.11.4.GIT