Avoid "*** Recursive variable `RM' references itself (eventually)."

diff --git a/test/Makefile b/test/Makefile
index ddeccc5eeae3a9d0ff7a8be20a6199438ca9c8b3..8c005a957c9444e29d03f74e9df8b0490eecf81c 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -11,12 +11,12 @@ endif
 
 ifdef CMD_EXE
   EXE := .exe
-  RM = del /f $(subst /,\,$1)
+  DEL = del /f $(subst /,\,$1)
   MKDIR = mkdir $(subst /,\,$1)
   RMDIR = rmdir /s /q $(subst /,\,$1)
 else
   EXE :=
-  RM = $(RM) $1
+  DEL = $(RM) $1
   MKDIR = mkdir $1
   RMDIR = rmdir $1
 endif
@@ -52,5 +52,5 @@ mostly-clean:
        @$(MAKE) -C misc clean
 
 clean: mostly-clean
-       -@$(call RM,$(WORKDIR)/bdiff$(EXE))
-       -$(call RMDIR,$(WORKDIR))
+       -@$(call DEL,$(WORKDIR)/bdiff$(EXE))
+       -@$(call RMDIR,$(WORKDIR))

diff --git a/test/err/Makefile b/test/err/Makefile
index d729784278e1b649782a1175aa5337657088a0e8..ff927ada0b5613b6664659ef151daa2997892b40 100644 (file)
--- a/test/err/Makefile
+++ b/test/err/Makefile
@@ -7,10 +7,10 @@ endif
 
 ifdef CMD_EXE
   NOT := - # Hack
-  RM = del /f $(subst /,\,$1)
+  DEL = del /f $(subst /,\,$1)
 else
   NOT := !
-  RM = $(RM) $1
+  DEL = $(RM) $1
 endif
 
 CC65FLAGS := -t sim6502
@@ -44,5 +44,5 @@ $(WORKDIR)/%.or.prg: %.c
        $(NOT) $(CL65) -Or $(CC65FLAGS) $< -o $@
 
 clean:
-       -@$(call RM,$(TESTS))
-       -@$(call RM,$(SOURCES:.c=.o))
+       -@$(call DEL,$(TESTS))
+       -@$(call DEL,$(SOURCES:.c=.o))

diff --git a/test/misc/Makefile b/test/misc/Makefile
index a1b1d72ca6e2fe9051c819c2b4246bf7d58896e3..e5fd6d2b84e482fcc1d83452fb2f6813b27c4c8b 100644 (file)
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -8,11 +8,11 @@ endif
 ifdef CMD_EXE
   S := $(subst /,\,/)
   NOT := - # Hack
-  RM = del /f $(subst /,\,$1)
+  DEL = del /f $(subst /,\,$1)
 else
   S := /
   NOT := !
-  RM = $(RM) $1
+  DEL = $(RM) $1
 endif
 
 CC65FLAGS := -t sim6502
@@ -54,6 +54,6 @@ $(WORKDIR)/sitest%prg: sitest.c
 #      -$(SIM65) $(SIM65FLAGS) $@
 
 clean:
-       -@$(call RM,$(TESTS))
-       -@$(call RM,$(SOURCES:.c=.o))
-       -@$(call RM,$(SOURCES:%.c=$(WORKDIR)/%.out))
+       -@$(call DEL,$(TESTS))
+       -@$(call DEL,$(SOURCES:.c=.o))
+       -@$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.out))

diff --git a/test/ref/Makefile b/test/ref/Makefile
index 4d67350997d154379cc6d03bf6a95f520eed3cd9..de9248ac76c7f75365ac96c32a3c9fa927096bac 100644 (file)
--- a/test/ref/Makefile
+++ b/test/ref/Makefile
@@ -8,10 +8,10 @@ endif
 
 ifdef CMD_EXE
   S := $(subst /,\,/)
-  RM = del /f $(subst /,\,$1)
+  DEL = del /f $(subst /,\,$1)
 else
   S := /
-  RM = $(RM) $1
+  DEL = $(RM) $1
 endif
 
 CC65FLAGS := -t sim6502
@@ -93,8 +93,8 @@ $(WORKDIR)/%.or.prg: %.c $(WORKDIR)/%.ref
        $(DIFF) $(WORKDIR)/$*.out $(WORKDIR)/$*.ref
 
 clean:
-       -@$(call RM,$(TESTS))
-       -@$(call RM,$(SOURCES:.c=.o))
-       -@$(call RM,$(SOURCES:%.c=$(WORKDIR)/%.out))
-       -@$(call RM,$(SOURCES:%.c=$(WORKDIR)/%.ref))
-       -@$(call RM,$(SOURCES:%.c=$(WORKDIR)/%.host))
+       -@$(call DEL,$(TESTS))
+       -@$(call DEL,$(SOURCES:.c=.o))
+       -@$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.out))
+       -@$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.ref))
+       -@$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.host))

diff --git a/test/val/Makefile b/test/val/Makefile
index 4392fa3231296780a7bb0b779da54f431d44a6f4..4de47c6b59c8202b191b74742fcc65a73f88724b 100644 (file)
--- a/test/val/Makefile
+++ b/test/val/Makefile
@@ -6,9 +6,9 @@ ifneq ($(shell echo),)
 endif
 
 ifdef CMD_EXE
-  RM = del /f $(subst /,\,$1)
+  DEL = del /f $(subst /,\,$1)
 else
-  RM = $(RM) $1
+  DEL = $(RM) $1
 endif
 
 CC65FLAGS := -t sim6502
@@ -66,5 +66,5 @@ $(WORKDIR)/%.or.prg: %.c
        $(SIM65) $(SIM65FLAGS) $@
 
 clean:
-       -@$(call RM,$(TESTS))
-       -@$(call RM,$(SOURCES:.c=.o))
+       -@$(call DEL,$(TESTS))
+       -@$(call DEL,$(SOURCES:.c=.o))