From aaa26c7d57c3f94ef02f6fa0fd2a596b40a111c2 Mon Sep 17 00:00:00 2001 From: Sven Oliver Moll Date: Tue, 13 Sep 2016 11:21:25 +0200 Subject: [PATCH] Revert "test/assembler: removed WORKDIR variable, as remote assembling does only work partly" This reverts commit 7a9a7c3188bf36b278922439f957af7dab4617c2. --- test/assembler/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/test/assembler/Makefile b/test/assembler/Makefile index a085bc390..faefddf7a 100644 --- a/test/assembler/Makefile +++ b/test/assembler/Makefile @@ -2,6 +2,8 @@ # makefile for the assembler regression tests BINDIR = ../../bin +#WORKDIR := ../../testwrk +WORKDIR := . BASE_TARGETS = 6502 6502x 65sc02 65c02 BASE_TARGETS += 4510 huc6280 @@ -17,9 +19,9 @@ all: # generate opcode targets and expand target list define opcode OPCODE_TARGETLIST += $(1)-opcodes.bin -$(1)-opcodes.bin: $(1)-opcodes.s - @$$(BINDIR)/cl65 --cpu $(1) -t none -l $(1)-opcodes.lst -o $$@ $$< - @diff -q $(1)-opcodes.ref $$@ || (cat $(1)-opcodes.lst ; exit 1) +$$(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 endef $(foreach target,$(OPCODE_TARGETS),$(eval $(call opcode,$(target)))) @@ -27,9 +29,9 @@ $(foreach target,$(OPCODE_TARGETS),$(eval $(call opcode,$(target)))) # generate cpudetect targets and expand target list define cpudetect CPUDETECT_TARGETLIST += $(1)-cpudetect.bin -$(1)-cpudetect.bin: cpudetect.s - @$$(BINDIR)/cl65 --cpu $(1) -t none -l $(1)-cpudetect.lst -o $$@ $$< - @diff -q $(1)-cpudetect.ref $$@ || (cat $(1)-cpudetect.lst ; exit 1) +$$(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 endef $(foreach target,$(CPUDETECT_TARGETS),$(eval $(call cpudetect,$(target))))