re-adding WORKDIR to Makefile

- added workaround to remove *.o files after assembling
- also removed now obsolete clean target

diff --git a/test/assembler/Makefile b/test/assembler/Makefile
index faefddf7aa4fb746d9bad56ad593f9704ab0c686..5d38847f51454de5e3061498412024ffec99c2f5 100644 (file)
--- a/test/assembler/Makefile
+++ b/test/assembler/Makefile
@@ -2,8 +2,7 @@
 # makefile for the assembler regression tests
 
 BINDIR = ../../bin
-#WORKDIR := ../../testwrk
-WORKDIR := .
+WORKDIR := ../../testwrk
 
 BASE_TARGETS  = 6502 6502x 65sc02 65c02
 BASE_TARGETS += 4510 huc6280
@@ -18,21 +17,23 @@ all:
 
 # generate opcode targets and expand target list
 define opcode
-OPCODE_TARGETLIST += $(1)-opcodes.bin
+OPCODE_TARGETLIST += $$(WORKDIR)/$(1)-opcodes.bin
 $$(WORKDIR)/$(1)-opcodes.bin: $(1)-opcodes.s
        @$$(BINDIR)/cl65 --cpu $(1) -t none -l $$(WORKDIR)/$(1)-opcodes.lst --obj-path $$(WORKDIR) -o $$@ $$<
        @diff -q $(1)-opcodes.ref $$@ || (cat $$(WORKDIR)/$(1)-opcodes.lst ; exit 1)
        @echo ca65 --cpu $(1) opcodes ok
+       @rm -f $(1)-opcodes.o #workaround for #168
 endef
 $(foreach target,$(OPCODE_TARGETS),$(eval $(call opcode,$(target))))
 
 # generate cpudetect targets and expand target list
 define cpudetect
-CPUDETECT_TARGETLIST += $(1)-cpudetect.bin
+CPUDETECT_TARGETLIST += $$(WORKDIR)/$(1)-cpudetect.bin
 $$(WORKDIR)/$(1)-cpudetect.bin: cpudetect.s
        @$$(BINDIR)/cl65 --cpu $(1) -t none -l $$(WORKDIR)/$(1)-cpudetect.lst --obj-path $$(WORKDIR) -o $$@ $$<
        @diff -q $(1)-cpudetect.ref $$@ || (cat $$(WORKDIR)/$(1)-cpudetect.lst ; exit 1)
        @echo ca65 --cpu $(1) cpudetect ok
+       @rm -f cpudetect.o #workaround for #168
 endef
 $(foreach target,$(CPUDETECT_TARGETS),$(eval $(call cpudetect,$(target))))
 
@@ -40,8 +41,5 @@ $(foreach target,$(CPUDETECT_TARGETS),$(eval $(call cpudetect,$(target))))
 all: $(OPCODE_TARGETLIST) $(CPUDETECT_TARGETLIST)
        @#
 
-clean:
-       rm -f *.o *.bin *.lst
-
-.PHONY: all clean $(OPCODE_TARGETLIST) $(CPUDETECT_TARGETLIST)
+.PHONY: all $(OPCODE_TARGETLIST) $(CPUDETECT_TARGETLIST)