Ignore return values only with CMD.EXE.

CMD.EXE considers file deletion commands not able to delete anything as there's nothing to delete as failed. Of course we don't want to bail out of the Makefile because of missing files to delete. Therefore we ignore the return values with '-'. This change limits this workaround to CMD.EXE.

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

diff --git a/test/err/Makefile b/test/err/Makefile
index ff927ada0b5613b6664659ef151daa2997892b40..6ac45711442b44de933a0ea346a1e7a1d044e1c2 100644 (file)
--- a/test/err/Makefile
+++ b/test/err/Makefile
@@ -6,9 +6,11 @@ ifneq ($(shell echo),)
 endif
 
 ifdef CMD_EXE
+  M := -
   NOT := - # Hack
   DEL = del /f $(subst /,\,$1)
 else
+  M :=
   NOT := !
   DEL = $(RM) $1
 endif
@@ -44,5 +46,5 @@ $(WORKDIR)/%.or.prg: %.c
        $(NOT) $(CL65) -Or $(CC65FLAGS) $< -o $@
 
 clean:
-       -@$(call DEL,$(TESTS))
-       -@$(call DEL,$(SOURCES:.c=.o))
+       $M@$(call DEL,$(TESTS))
+       $M@$(call DEL,$(SOURCES:.c=.o))

diff --git a/test/misc/Makefile b/test/misc/Makefile
index ca487066347c47b9a918827e59c22509155b9cc8..dfd937ad37389d4ac937e20c56b41e21e4740fb1 100644 (file)
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -6,10 +6,12 @@ ifneq ($(shell echo),)
 endif
 
 ifdef CMD_EXE
+  M := -
   S := $(subst /,\,/)
   NOT := - # Hack
   DEL = del /f $(subst /,\,$1)
 else
+  M :=
   S := /
   NOT := !
   DEL = $(RM) $1
@@ -58,6 +60,6 @@ $(WORKDIR)/cc65141011%prg: cc65141011.c
        -$(SIM65) $(SIM65FLAGS) $@
 
 clean:
-       -@$(call DEL,$(TESTS))
-       -@$(call DEL,$(SOURCES:.c=.o))
-       -@$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.out))
+       $M@$(call DEL,$(TESTS))
+       $M@$(call DEL,$(SOURCES:.c=.o))
+       $M@$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.out))

diff --git a/test/ref/Makefile b/test/ref/Makefile
index 14d78c37cb87dffe1b35e5ef0172f32ad6201caf..83b81f9cca1d52ba8e3dabff33e0d8971d9f8afe 100644 (file)
--- a/test/ref/Makefile
+++ b/test/ref/Makefile
@@ -7,9 +7,11 @@ ifneq ($(shell echo),)
 endif
 
 ifdef CMD_EXE
+  M := -
   S := $(subst /,\,/)
   DEL = del /f $(subst /,\,$1)
 else
+  M :=
   S := /
   DEL = $(RM) $1
 endif
@@ -89,8 +91,8 @@ $(WORKDIR)/%.or.prg: %.c $(WORKDIR)/%.ref
        $(DIFF) $(WORKDIR)/$*.out $(WORKDIR)/$*.ref
 
 clean:
-       -@$(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))
+       $M@$(call DEL,$(TESTS))
+       $M@$(call DEL,$(SOURCES:.c=.o))
+       $M@$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.out))
+       $M@$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.ref))
+       $M@$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.host))

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