Fix NASM dependency generation

Fix missing -M from NASM dependency generation calls; adopt the
uniform stanza "-M -DDEPEND" even for sites that were already correct.

Also, use ">" not ">>" for obvious reasons...

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/core/Makefile b/core/Makefile
index eeca0c5..65418c4 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -72,7 +72,7 @@ iso%.bin: iso%.elf checksumiso.pl
        $(OBJCOPY) -O binary $< $@
 
 %.o: %.asm kwdhash.gen ../version.gen
-       ( $(NASM) -DDEPEND $(NINCLUDE) -o $@ -M $< ; echo '' ) > .$@.d; true
+       ( $(NASM) -M -DDEPEND $(NINCLUDE) -o $@ $< ; echo '' ) > .$@.d; true
        $(NASM) $(NASMOPT) -f elf -g -F stabs -DDATE_STR="'$(DATE)'" \
                -DHEXDATE="$(HEXDATE)" \
                -l $(@:.o=.lsr) -o $@ $<

diff --git a/dos/Makefile b/dos/Makefile
index f580e01..fa2ed0a 100644 (file)
--- a/dos/Makefile
+++ b/dos/Makefile
@@ -60,7 +60,7 @@ syslinux.com: syslinux.elf
        $(OBJCOPY) -O binary $< $@
 
 %.com: %.asm
-       ( $(NASM) -DDEPEND $(NASMOPT) -o $@ -M $< && echo '' ) > .$@.d; true
+       ( $(NASM) -M -DDEPEND $(NASMOPT) -o $@ -M $< && echo '' ) > .$@.d; true
        $(NASM) $(NASMOPT) -f bin -o $@ -l $*.lst $<
 
 -include .*.d *.tmp

diff --git a/memdisk/Makefile b/memdisk/Makefile
index 201dffa..3bb97ff 100644 (file)
--- a/memdisk/Makefile
+++ b/memdisk/Makefile
@@ -62,12 +62,12 @@ memdisk16.o: memdisk16.asm
 %.o: %.asm
 
 memdisk16.o: memdisk16.asm
-       ( $(NASM) -DDEPEND $(NFLAGS) $(NINCLUDE) -o $@ $< ; echo '' ) >> .$@.d ; true
+       ( $(NASM) -M -DDEPEND $(NFLAGS) $(NINCLUDE) -o $@ $< ; echo '' ) > .$@.d ; true
        $(NASM) -f elf $(NASMOPT) $(NFLAGS) $(NINCLUDE) -o $@ -l $*.lst $<
 
 .PRECIOUS: %.bin
 %.bin: %.asm
-       ( $(NASM) -DDEPEND $(NFLAGS) $(NINCLUDE) -o $@ $< ; echo '' ) >> .$@.d ; true
+       ( $(NASM) -M -DDEPEND $(NFLAGS) $(NINCLUDE) -o $@ $< ; echo '' ) > .$@.d ; true
        $(NASM) -f bin $(NASMOPT) $(NFLAGS) $(NINCLUDE) -o $@ -l $*.lst $<
 
 memdisk_%.o: memdisk_%.bin

diff --git a/modules/Makefile b/modules/Makefile
index 3f82eee..3ae463f 100644 (file)
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -33,7 +33,7 @@ all: $(BINS)
        $(OBJCOPY) -O binary $< $@
 
 %.com: %.asm
-       ( $(NASM) -DDEPEND -o $@ $< ; echo '' ) >> .$@.d ; true
+       ( $(NASM) -M -DDEPEND -o $@ $< ; echo '' ) > .$@.d ; true
        $(NASM) $(NASMOPT) -f bin -o $@ -l $*.lst $<
 
 $(LIB): $(LIBOBJS)

diff --git a/sample/Makefile b/sample/Makefile
index e6bf5de..9fa21c2 100644 (file)
--- a/sample/Makefile
+++ b/sample/Makefile
@@ -42,7 +42,7 @@ all: syslogo.lss comecho.com hello.c32 hello2.c32 filetest.c32 c32echo.c32 \
        $(OBJCOPY) -O binary $< $@
 
 %.com: %.asm
-       ( $(NASM) -DDEPEND -o $@ $< ; echo '' ) >> .$@.d ; true
+       ( $(NASM) -M -DDEPEND -o $@ $< ; echo '' ) > .$@.d ; true
        $(NASM) $(NASMOPT) -f bin -o $@ -l $*.lst $<
 
 $(LIB): $(LIBOBJS)