test/Makefile: separate NASM and NASMDEP

Separate out the NASM and NASMDEP variables, in case one wants to
override the former.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2017-06-25 19:31:35 -07:00
parent df1eec0315
commit 92a8326f0d

View File

@ -1,5 +1,6 @@
.SUFFIXES: .bin .o .o64 .obj .obj64 .exe .asm .lst .pl .SUFFIXES: .bin .o .o64 .obj .obj64 .exe .asm .lst .pl
NASMDEP = ../nasm
NASM = ../nasm NASM = ../nasm
NASMOPT = -Ox -I../misc $(OPT) NASMOPT = -Ox -I../misc $(OPT)
PERL = perl PERL = perl
@ -10,49 +11,49 @@ RM_RF = rm -rf
$(NASM): $(NASM):
$(MAKE) -C .. $(MAKE) -C ..
%.bin: %.asm $(NASM) %.bin: %.asm $(NASMDEP)
$(NASM) $(NASMOPT) -f bin -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f bin -o $@ -l $*.lst $<
%.ith: %.asm $(NASM) %.ith: %.asm $(NASMDEP)
$(NASM) $(NASMOPT) -f ith -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f ith -o $@ -l $*.lst $<
%.srec: %.asm $(NASM) %.srec: %.asm $(NASMDEP)
$(NASM) $(NASMOPT) -f srec -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f srec -o $@ -l $*.lst $<
%.o: %.asm $(NASM) %.o: %.asm $(NASMDEP)
$(NASM) $(NASMOPT) -f elf32 -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f elf32 -o $@ -l $*.lst $<
%.o64: %.asm $(NASM) %.o64: %.asm $(NASMDEP)
$(NASM) $(NASMOPT) -f elf64 -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f elf64 -o $@ -l $*.lst $<
%.obj: %.asm $(NASM) %.obj: %.asm $(NASMDEP)
$(NASM) $(NASMOPT) -f obj -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f obj -o $@ -l $*.lst $<
%.od: %.obj ../misc/omfdump %.od: %.obj ../misc/omfdump
../misc/omfdump $< > $@ ../misc/omfdump $< > $@
%.coff: %.asm $(NASM) %.coff: %.asm $(NASMDEP)
$(NASM) $(NASMOPT) -f coff -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f coff -o $@ -l $*.lst $<
%.win32: %.asm $(NASM) %.win32: %.asm $(NASMDEP)
$(NASM) $(NASMOPT) -f win32 -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f win32 -o $@ -l $*.lst $<
%.win64: %.asm $(NASM) %.win64: %.asm $(NASMDEP)
$(NASM) $(NASMOPT) -f win64 -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f win64 -o $@ -l $*.lst $<
%.mo32: %.asm $(NASM) %.mo32: %.asm $(NASMDEP)
$(NASM) $(NASMOPT) -f macho32 -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f macho32 -o $@ -l $*.lst $<
%.mo64: %.asm $(NASM) %.mo64: %.asm $(NASMDEP)
$(NASM) $(NASMOPT) -f macho64 -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f macho64 -o $@ -l $*.lst $<
%.dbg: %.asm $(NASM) %.dbg: %.asm $(NASMDEP)
$(NASM) $(NASMOPT) -f dbg -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f dbg -o $@ -l $*.lst $<
%.asm: %.pl %.asm: %.pl
$(PERL) $< > $@ $(PERL) $< > $@
%.i: %.asm $(NASM) %.i: %.asm $(NASMDEP)
$(NASM) $(NASMOPT) -E -o $@ $< $(NASM) $(NASMOPT) -E -o $@ $<
all: all:
@ -60,10 +61,10 @@ all:
golden: performtest.pl $(TESTS) golden: performtest.pl $(TESTS)
$(PERL) performtest.pl --golden --nasm='$(NASM)' $(TESTS) $(PERL) performtest.pl --golden --nasm='$(NASM)' $(TESTS)
test: performtest.pl $(NASM) $(TESTS) test: performtest.pl $(NASMDEP) $(TESTS)
$(PERL) performtest.pl --nasm='$(NASM)' $(TESTS) $(PERL) performtest.pl --nasm='$(NASM)' $(TESTS)
diff: performtest.pl $(NASM) $(TESTS) diff: performtest.pl $(NASMDEP) $(TESTS)
$(PERL) performtest.pl --diff --nasm='$(NASM)' $(TESTS) $(PERL) performtest.pl --diff --nasm='$(NASM)' $(TESTS)
clean: clean:
@ -78,7 +79,7 @@ spotless: clean
# #
# Test for ELF32 shared libraries; assumes an x86 Linux system # Test for ELF32 shared libraries; assumes an x86 Linux system
# #
elfso.o: elfso.asm $(NASM) elfso.o: elfso.asm $(NASMDEP)
$(NASM) $(NASMOPT) -f elf32 -F stabs -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f elf32 -F stabs -o $@ -l $*.lst $<
elfso.so: elfso.o elfso.so: elfso.o
@ -91,7 +92,7 @@ elftest: elftest.c elfso.so
# #
# Test for ELF64 shared libraries; assumes an x86-64 Linux system # Test for ELF64 shared libraries; assumes an x86-64 Linux system
# #
elf64so.o: elf64so.asm $(NASM) elf64so.o: elf64so.asm $(NASMDEP)
$(NASM) $(NASMOPT) -f elf64 -F dwarf -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f elf64 -F dwarf -o $@ -l $*.lst $<
elf64so.so: elf64so.o elf64so.so: elf64so.o