core: unbreak "make depend", fix make spotless

cmdline.inc: Unbreak "make depend"
Makefile: fix "make spotless"

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

diff --git a/core/Makefile b/core/Makefile
index 14bb6d0..16e21dc 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -118,7 +118,7 @@ tidy dist:
 clean: tidy
 
 spotless: clean
-       rm -f $(BTARGET) *_bin.c .depend
+       rm -f $(BTARGET) *.bin *_bin.c .depend
 
 # Note: the extra echo '' is to deal with old versions of NASM which
 # did not properly terminate the dependency list.

diff --git a/core/cmdline.inc b/core/cmdline.inc
index 9b3533e..9d908dc 100644 (file)
--- a/core/cmdline.inc
+++ b/core/cmdline.inc
@@ -50,10 +50,9 @@ make_plain_cmdline:
 IPAppends      dw IPOption
                dw BOOTIFStr
 numIPAppends   equ ($-IPAppends)/2
-
 %else
-numIPAppends   equ 0
 IPAppends      equ 0
+numIPAppends   equ 0
 %endif
 
 ;
@@ -64,7 +63,8 @@ IPAppends     equ 0
                section .text
 
 do_ip_append:
-%if numIPAppends > 0
+%ifndef DEPEND
+ %if numIPAppends > 0
                push cx
                push bx
                push si
@@ -89,5 +89,6 @@ do_ip_append:
                pop si
                pop bx
                pop cx
+ %endif
 %endif
                ret