From 332a924759efe50e783ad3116ecf17d518dfebe2 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Mon, 16 Mar 2009 21:32:32 -0700 Subject: [PATCH] */Makefile: fixes for older versions of NASM Deal with issues that made older versions of nasm: a) prevent "make spotless" from running b) generate bad dependencies (no final newline) --- core/Makefile | 4 ++-- memdisk/Makefile | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/Makefile b/core/Makefile index 346f9db..ce9fd45 100644 --- a/core/Makefile +++ b/core/Makefile @@ -123,11 +123,11 @@ spotless: clean # did not properly terminate the dependency list. .depend: rm -f .depend - for csrc in $(CSRC) ; do $(CC) $(INCLUDE) -MM $$csrc >> .depend ; done + for csrc in $(CSRC) ; do $(CC) $(INCLUDE) -MM $$csrc >> .depend ; done ; true for nsrc in $(NASMSRC) ; do \ ( $(NASM) -DDEPEND $(NINCLUDE) -o \ `echo $$nsrc | sed -e 's/\.asm/\.o/'` -M $$nsrc ; \ - echo '' ) >> .depend ; done + echo '' ) >> .depend ; done ; true depend: rm -f .depend diff --git a/memdisk/Makefile b/memdisk/Makefile index 19cf9cd..93575c3 100644 --- a/memdisk/Makefile +++ b/memdisk/Makefile @@ -112,9 +112,12 @@ memdisk.o: memdisk.bin .depend: rm -f .depend - for csrc in *.c ; do $(CC) $(INCLUDE) $(CFLAGS) -MM $$csrc >> .depend ; done - for ssrc in *.S ; do $(CC) $(INCLUDE) $(SFLAGS) -MM $$ssrc >> .depend ; done - for nsrc in $(NASMSRC) ; do $(NASM) -DDEPEND $(NINCLUDE) -o `echo $$nsrc | sed -e 's/\.asm/\.bin/'` -M $$nsrc >> .depend ; done + for csrc in *.c ; do $(CC) $(INCLUDE) $(CFLAGS) -MM $$csrc >> .depend ; done ; true + for ssrc in *.S ; do $(CC) $(INCLUDE) $(SFLAGS) -MM $$ssrc >> .depend ; done ; true + for nsrc in $(NASMSRC) ; do \ + ( $(NASM) -DDEPEND $(NINCLUDE) -o \ + `echo $$nsrc | sed -e 's/\.asm/\.bin/'` -M $$nsrc ; \ + echo '' ) >> .depend ; done ; true depend: rm -f .depend -- 2.7.4