aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-04-06 14:10:10 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-04-06 14:10:10 -0700
commitc2636af9b7f4b170ffe791d5008fe6bdd822a59b (patch)
tree85bfce71caf2b7c9ac9160eb66a511dfa91e441e
parent1c911ceb2ca30ac0881c03711fe3da45168ce36a (diff)
downloadsyslinux.git-c2636af9b7f4b170ffe791d5008fe6bdd822a59b.tar.gz
syslinux.git-c2636af9b7f4b170ffe791d5008fe6bdd822a59b.tar.xz
syslinux.git-c2636af9b7f4b170ffe791d5008fe6bdd822a59b.zip
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>
-rw-r--r--core/Makefile2
-rw-r--r--core/cmdline.inc7
2 files changed, 5 insertions, 4 deletions
diff --git a/core/Makefile b/core/Makefile
index 14bb6d0b..16e21dc0 100644
--- 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 9b3533e6..9d908dcc 100644
--- 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