From: H. Peter Anvin <hpa@zytor.com>
Date: Tue, 17 Mar 2009 04:32:32 +0000 (-0700)
Subject: */Makefile: fixes for older versions of NASM
X-Git-Tag: syslinux-3.74-pre7~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=332a924759efe50e783ad3116ecf17d518dfebe2;p=profile%2Fivi%2Fsyslinux.git

*/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)
---

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