From 41103ab4310c71836761c205a7424975edb4f2ad Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Mon, 18 Jun 2018 11:30:48 -0700
Subject: [PATCH] test/Makefile: qualify the names of list files with output
 format

It is quite likely we may want to build the same input with multiple
output formats; make it so we don't lose the list file.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 test/Makefile | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index ebd8c3f3..7cba37ec 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -12,46 +12,46 @@ $(NASM):
 	$(MAKE) -C ..
 
 %.bin: %.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f bin -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f bin -o $@ -MD $@.dep -l $@.lst $<
 
 %.ith: %.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f ith -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f ith -o $@ -MD $@.dep -l $@.lst $<
 
 %.srec: %.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f srec -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f srec -o $@ -MD $@.dep -l $@.lst $<
 
 %.o: %.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f elf32 -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f elf32 -o $@ -MD $@.dep -l $@.lst $<
 
 %.o64: %.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f elf64 -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f elf64 -o $@ -MD $@.dep -l $@.lst $<
 
 %.obj: %.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f obj -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f obj -o $@ -MD $@.dep -l $@.lst $<
 
 %.rdf: %.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f rdf -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f rdf -o $@ -MD $@.dep -l $@.lst $<
 
 %.od: %.obj ../misc/omfdump
 	../misc/omfdump $< > $@
 
 %.coff: %.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f coff -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f coff -o $@ -MD $@.dep -l $@.lst $<
 
 %.win32: %.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f win32 -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f win32 -o $@ -MD $@.dep -l $@.lst $<
 
 %.win64: %.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f win64 -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f win64 -o $@ -MD $@.dep -l $@.lst $<
 
 %.mo32: %.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f macho32 -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f macho32 -o $@ -MD $@.dep -l $@.lst $<
 
 %.mo64: %.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f macho64 -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f macho64 -o $@ -MD $@.dep -l $@.lst $<
 
 %.dbg: %.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f dbg -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f dbg -o $@ -MD $@.dep -l $@.lst $<
 
 %.asm: %.pl
 	$(PERL) $< > $@
@@ -83,7 +83,7 @@ spotless: clean
 # Test for ELF32 shared libraries; assumes an x86 Linux system
 #
 elfso.o: elfso.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f elf32 -F stabs -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f elf32 -F stabs -o $@ -MD $@.dep -l $@.lst $<
 
 elfso.so: elfso.o
 	$(LD) -m elf_i386 -shared -o $@ -MD $@.dep $<
@@ -96,7 +96,7 @@ elftest: elftest.c elfso.so
 # Test for ELF64 shared libraries; assumes an x86-64 Linux system
 #
 elf64so.o: elf64so.asm $(NASMDEP)
-	$(NASM) $(NASMOPT) -f elf64 -F dwarf -o $@ -MD $@.dep -l $*.lst $<
+	$(NASM) $(NASMOPT) -f elf64 -F dwarf -o $@ -MD $@.dep -l $@.lst $<
 
 elf64so.so: elf64so.o
 	$(LD) -shared -o $@ -MD $@.dep $<