From: Oliver Schmidt <ol.sc@web.de>
Date: Fri, 26 Jun 2015 22:33:24 +0000 (+0200)
Subject: Avoid  "*** Recursive variable `RM' references itself (eventually)."
X-Git-Tag: V2.16~261
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5a7ba692f53f8bb633eff78f0965f53b19dfd1aa;p=cc65

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

diff --git a/test/Makefile b/test/Makefile
index ddeccc5ee..8c005a957 100644
--- 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 d72978427..ff927ada0 100644
--- 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 a1b1d72ca..e5fd6d2b8 100644
--- 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 4d6735099..de9248ac7 100644
--- 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 4392fa323..4de47c6b5 100644
--- 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))