diff options
| author | hpa <hpa> | 2004-12-29 01:58:02 +0000 |
|---|---|---|
| committer | hpa <hpa> | 2004-12-29 01:58:02 +0000 |
| commit | c65fc8ea4fbdf9ccb964a33362d19853fca5ca0c (patch) | |
| tree | 6c398e4f9e91e86435748067de6d02e0fa999260 | |
| parent | 01b268cbf57515c37cad7dde05b6503e8d64bd5f (diff) | |
| download | syslinux-c65fc8ea4fbdf9ccb964a33362d19853fca5ca0c.tar.gz | |
Clean up using an alternate NASM
| -rw-r--r-- | memdisk/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/memdisk/Makefile b/memdisk/Makefile index 9f71238b..ed573525 100644 --- a/memdisk/Makefile +++ b/memdisk/Makefile @@ -26,7 +26,8 @@ CFLAGS = -g -W -Wall -Wno-sign-compare \ LDFLAGS = -g INCLUDE = -I../com32/include LD = ld -m elf_i386 -NASM = nasm -O99 -dVERSION='"$(VERSION)"' -dDATE='"$(DATE)"' +NASM = nasm -O99 +NFLAGS = -dVERSION='"$(VERSION)"' -dDATE='"$(DATE)"' NINCLUDE = OBJCOPY = objcopy PERL = perl @@ -53,7 +54,7 @@ spotless: clean rm -f memdisk .depend %.o: %.asm - $(NASM) -f elf -l $*.lst -o $@ $< + $(NASM) $(NFLAGS) -f elf -l $*.lst -o $@ $< %.o: %.s $(CC) -x assembler -c -o $@ $< @@ -83,7 +84,7 @@ spotless: clean %.o: %.c %.bin: %.asm - $(NASM) -f bin $(NINCLUDE) -o $@ -l $*.lst $< + $(NASM) -f bin $(NFLAGS) $(NINCLUDE) -o $@ -l $*.lst $< memdisk16.elf: $(OBJS16) $(LD) -Ttext 0 -o $@ $^ |