Use simply-defined make variables.

diff --git a/test/Makefile b/test/Makefile
index 579fc8b9232ab321e90cb0c01fab5ee5c8b88dea..0f96a38f8c5ef4be420fb7e7cf9e359f91897984 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,24 +1,24 @@
 
-# toplevel makefile for the regression tests
+# top-level makefile for the regression tests
 
 # You can comment this special target when you debug the regression tests.
 # Then, make will give you more progress reports.
 .SILENT:
 
 ifneq ($(shell echo),)
-  CMD_EXE = 1
+  CMD_EXE := 1
 endif
 
 ifdef CMD_EXE
   RM := del /f
   EXE := .exe
-  MKDIR = mkdir
-  RMDIR = rmdir
+  MKDIR := mkdir
+  RMDIR := rmdir
 else
   RM := rm -f
   EXE :=
-  MKDIR = mkdir -p
-  RMDIR = rmdir
+  MKDIR := mkdir -p
+  RMDIR := rmdir
 endif
 
 WORKDIR := ../testwrk

diff --git a/test/err/Makefile b/test/err/Makefile
index 46ce4c9ccd8db452422b9675ce74a8d207e434b0..29c47ef3ebe6fd6735d39a563687e300a9ed1bf6 100644 (file)
--- a/test/err/Makefile
+++ b/test/err/Makefile
@@ -2,10 +2,10 @@
 # makefile for the tests that MUST NOT compile
 
 ifneq ($(shell echo),)
-  CMD_EXE = 1
+  CMD_EXE := 1
 endif
 
-CC65FLAGS = -t sim6502
+CC65FLAGS := -t sim6502
 
 CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
 
@@ -15,7 +15,7 @@ else
 RM := rm -f
 endif
 
-WORKDIR := ./../../testwrk
+WORKDIR := ../../testwrk
 
 .PHONY: all clean
 
@@ -48,6 +48,7 @@ $(WORKDIR)/%.oir.prg: %.c
        ! $(CL65) -Oir $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.or.prg: %.c
        ! $(CL65) -Or $(CC65FLAGS) $< -o $@
+
 clean:
        @$(RM) $(TESTS)
        @$(RM) $(SOURCES:.c=.o)

diff --git a/test/misc/Makefile b/test/misc/Makefile
index 64fcc875963d4cafb467a265a2776c933a8cf9e5..c473f5f851d2bdcdfed44fc89e7aad7748c4625f 100644 (file)
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -2,11 +2,11 @@
 # makefile for the remaining tests that need special care in one way or another
 
 ifneq ($(shell echo),)
-  CMD_EXE = 1
+  CMD_EXE := 1
 endif
 
-CC65FLAGS = -t sim6502
-SIM65FLAGS = -x 200000000
+CC65FLAGS := -t sim6502
+SIM65FLAGS := -x 200000000
 
 CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
 SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
@@ -17,7 +17,7 @@ else
 RM := rm -f
 endif
 
-WORKDIR := ./../../testwrk
+WORKDIR := ../../testwrk
 
 DIFF := $(WORKDIR)/bdiff
 
@@ -41,7 +41,7 @@ $(WORKDIR)/endless%prg: endless.c
        $(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@
        ! $(SIM65) $(SIM65FLAGS) $@
 
-# these need reference data that cant be generated by a host compiled program
+# these need reference data that can't be generated by a host-compiled program,
 # in a useful way
 $(WORKDIR)/limits%prg: limits.c
        $(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@
@@ -50,13 +50,13 @@ $(WORKDIR)/limits%prg: limits.c
 
 # the rest are tests that fail currently for one reason or another
 $(WORKDIR)/fields%prg: fields.c
-       @echo "FIXME: " $@ "will currently fail"
+       @echo "FIXME: " $@ "currently will fail."
        $(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@
        -$(SIM65) $(SIM65FLAGS) $@
 $(WORKDIR)/sitest%prg: sitest.c
-       @echo "FIXME: " $@ "will currently fail"
+       @echo "FIXME: " $@ "currently will fail."
        -$(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@
-       -$(SIM65) $(SIM65FLAGS) $@
+#      -$(SIM65) $(SIM65FLAGS) $@
 
 clean:
        @$(RM) $(TESTS)

diff --git a/test/ref/Makefile b/test/ref/Makefile
index df13a28cce40167533cff26a8e96dee9454f84c8..66ff94e2885769ca14885415f554b366b5b7f188 100644 (file)
--- a/test/ref/Makefile
+++ b/test/ref/Makefile
@@ -3,11 +3,11 @@
 # compared with reference output
 
 ifneq ($(shell echo),)
-  CMD_EXE = 1
+  CMD_EXE := 1
 endif
 
-CC65FLAGS = -t sim6502
-SIM65FLAGS = -x 200000000
+CC65FLAGS := -t sim6502
+SIM65FLAGS := -x 200000000
 
 CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
 SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
@@ -18,7 +18,7 @@ else
 RM := rm -f
 endif
 
-WORKDIR := ./../../testwrk
+WORKDIR := ../../testwrk
 
 DIFF := $(WORKDIR)/bdiff
 

diff --git a/test/val/Makefile b/test/val/Makefile
index f4e0d28b2bf17182484152c5de38a881a5d22a04..bd88797e5ae0c7cd0773281d4297f7fa3fce73b0 100644 (file)
--- a/test/val/Makefile
+++ b/test/val/Makefile
@@ -2,11 +2,11 @@
 # makefile for the regression tests that return an error code on failure
 
 ifneq ($(shell echo),)
-  CMD_EXE = 1
+  CMD_EXE := 1
 endif
 
-CC65FLAGS = -t sim6502
-SIM65FLAGS = -x 200000000
+CC65FLAGS := -t sim6502
+SIM65FLAGS := -x 200000000
 
 CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
 SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
@@ -17,7 +17,7 @@ else
 RM := rm -f
 endif
 
-WORKDIR := ./../../testwrk
+WORKDIR := ../../testwrk
 
 .PHONY: all clean