summaryrefslogtreecommitdiff
path: root/memdisk
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-10-10 14:12:58 -0700
committerH. Peter Anvin <hpa@zytor.com>2007-10-10 14:12:58 -0700
commit83d1b33a86685ede62933f761b8e0b61c48b269f (patch)
tree3b8da1457324bfe319afc7a6cac762c21ea5aeb3 /memdisk
parent985c965eca140470d87912cebd923cd27a6d892c (diff)
downloadsyslinux-83d1b33a86685ede62933f761b8e0b61c48b269f.tar.gz
Makefiles: create NASMOPT variable
Create NASMOPT variable, defaulting to -O9999. Mostly there to test beta versions of NASM.
Diffstat (limited to 'memdisk')
-rw-r--r--memdisk/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/memdisk/Makefile b/memdisk/Makefile
index 2aa29f4f..173ef2be 100644
--- a/memdisk/Makefile
+++ b/memdisk/Makefile
@@ -30,7 +30,8 @@ LDFLAGS = $(M32) -g
INCLUDE = -I../com32/include
LD = ld -m elf_i386
NASM = nasm
-NFLAGS = -O99 -dVERSION='"$(VERSION)"' -dDATE='"$(DATE)"' -dWITH_EDD
+NASMOPT = -O9999
+NFLAGS = -dVERSION='"$(VERSION)"' -dDATE='"$(DATE)"' -dWITH_EDD
NINCLUDE =
OBJCOPY = objcopy
PERL = perl
@@ -57,7 +58,7 @@ spotless: clean
rm -f memdisk .depend
%.o: %.asm
- $(NASM) $(NFLAGS) -f elf -l $*.lst -o $@ $<
+ $(NASM) $(NASMOPT) $(NFLAGS) $(NINCLUDE) -f elf -l $*.lst -o $@ $<
%.o: %.s
$(CC) $(SFLAGS) -c -o $@ $<
@@ -90,7 +91,7 @@ spotless: clean
%.o: %.c
%.bin: %.asm
- $(NASM) -f bin $(NFLAGS) $(NINCLUDE) -o $@ -l $*.lst $<
+ $(NASM) -f bin $(NASMOPT) $(NFLAGS) $(NINCLUDE) -o $@ -l $*.lst $<
memdisk16.elf: $(OBJS16)
$(LD) -Ttext 0 -o $@ $^