Reorga of test/asm/listing/

add ref/ and control/ subdirectories, so the control files and result
files do not clutter the directory, and it is clear which file has which
purpose.
This commit is contained in:
Spiro Trikaliotis
2022-06-20 16:30:51 +02:00
parent e17cb6d602
commit 2040da0520
32 changed files with 17 additions and 17 deletions

View File

@@ -49,64 +49,64 @@ $(WORKDIR)/$1.bin: $1.s $(ISEQUAL)
$(if $(QUIET),echo asm/$1.bin) $(if $(QUIET),echo asm/$1.bin)
# compile without generating listing # compile without generating listing
ifeq ($(wildcard $1.err),) ifeq ($(wildcard control/$1.err),)
$(CA65) -t none -o $$(@:.bin=.o) $$< > $$(@:.bin=.err) 2>&1 $(CA65) -t none -o $$(@:.bin=.o) $$< > $$(@:.bin=.err) 2>&1
ifeq ($(wildcard $1.no-ld65),) ifeq ($(wildcard control/$1.no-ld65),)
$(LD65) -t none -o $$@ $$(@:.bin=.o) none.lib $(LD65) -t none -o $$@ $$(@:.bin=.o) none.lib
endif endif
else else
$(CA65) -t none -o $$(@:.bin=.o) $$< > $$(@:.bin=.err) 2>&1 || true $(CA65) -t none -o $$(@:.bin=.o) $$< > $$(@:.bin=.err) 2>&1 || true
ifeq ($(wildcard $1.no-ld65),) ifeq ($(wildcard control/$1.no-ld65),)
$(LD65) -t none -o $$@ $$(@:.bin=.o) none.lib || true $(LD65) -t none -o $$@ $$(@:.bin=.o) none.lib || true
endif endif
endif endif
ifneq ($(wildcard $1.err-ref),) ifneq ($(wildcard ref/$1.err-ref),)
$(ISEQUAL) $1.err-ref $$(@:.bin=.err) $(ISEQUAL) ref/$1.err-ref $$(@:.bin=.err)
else else
$(ISEQUAL) --empty $$(@:.bin=.err) $(ISEQUAL) --empty $$(@:.bin=.err)
endif endif
ifneq ($(wildcard $1.bin-ref),) ifneq ($(wildcard ref/$1.bin-ref),)
$(ISEQUAL) --binary $1.bin-ref $$@ $(ISEQUAL) --binary ref/$1.bin-ref $$@
endif endif
ifeq ($(wildcard $1.err),) ifeq ($(wildcard control/$1.err),)
$(CA65) -t none -l $$(@:.bin=.lst) -o $$(@:.bin=.list-o) $$< > $$(@:.bin=.list-err) 2>&1 $(CA65) -t none -l $$(@:.bin=.lst) -o $$(@:.bin=.list-o) $$< > $$(@:.bin=.list-err) 2>&1
ifeq ($(wildcard $1.no-ld65),) ifeq ($(wildcard control/$1.no-ld65),)
$(LD65) -t none -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) none.lib > $$(@:.bin=.ld65-err) 2>&1 $(LD65) -t none -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) none.lib > $$(@:.bin=.ld65-err) 2>&1
endif endif
else else
$(CA65) -t none -l $$(@:.bin=.lst) -o $$(@:.bin=.list-o) $$< > $$(@:.bin=.list-err) 2>&1 || true $(CA65) -t none -l $$(@:.bin=.lst) -o $$(@:.bin=.list-o) $$< > $$(@:.bin=.list-err) 2>&1 || true
ifeq ($(wildcard $1.no-ld65),) ifeq ($(wildcard control/$1.no-ld65),)
$(LD65) -t none -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) none.lib > $$(@:.bin=.ld65-err) 2>&1 || true $(LD65) -t none -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) none.lib > $$(@:.bin=.ld65-err) 2>&1 || true
endif endif
endif endif
ifneq ($(wildcard $1.err-ref),) ifneq ($(wildcard ref/$1.err-ref),)
$(ISEQUAL) $1.err-ref $$(@:.bin=.list-err) $(ISEQUAL) ref/$1.err-ref $$(@:.bin=.list-err)
else else
$(ISEQUAL) --empty $$(@:.bin=.list-err) $(ISEQUAL) --empty $$(@:.bin=.list-err)
endif endif
ifneq ($(wildcard $(WORKDIR)/$1.ld65-err),) ifneq ($(wildcard $(WORKDIR)/$1.ld65-err),)
ifneq ($(wildcard $1.ld65err-ref),) ifneq ($(wildcard ref/$1.ld65err-ref),)
$(ISEQUAL) $1.ld65err-ref $$(@:.bin=.ld65-err) $(ISEQUAL) ref/$1.ld65err-ref $$(@:.bin=.ld65-err)
else else
$(ISEQUAL) --empty $$(@:.bin=.ld65-err) $(ISEQUAL) --empty $$(@:.bin=.ld65-err)
endif endif
endif endif
# check if the result bin is the same as without listing file # check if the result bin is the same as without listing file
ifeq ($(wildcard $1.err),) ifeq ($(wildcard control/$1.err),)
$(ISEQUAL) $$@ $$(@:.bin=.list-bin) $(ISEQUAL) $$@ $$(@:.bin=.list-bin)
endif endif
ifneq ($(wildcard $1.list-ref),) ifneq ($(wildcard ref/$1.list-ref),)
# we have a reference file, compare that, too # we have a reference file, compare that, too
# remove first line which contains a version number # remove first line which contains a version number
$(ISEQUAL) --skip=1 $1.list-ref $$(@:.bin=.lst) $(ISEQUAL) --skip=1 ref/$1.list-ref $$(@:.bin=.lst)
endif endif
endef # LISTING_template endef # LISTING_template

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB