diff --git a/test/Makefile b/test/Makefile index c13f2212d..1ad86ca98 100644 --- a/test/Makefile +++ b/test/Makefile @@ -11,10 +11,9 @@ endif ifdef CMD_EXE EXE := .exe - DEL = del /f $(subst /,\,$1) + DEL = -del /f $(subst /,\,$1) MKDIR = mkdir $(subst /,\,$1) - DIRLIST = $(strip $(foreach dir,$1,$(wildcard $(dir)))) - RMDIR = $(if $(DIRLIST),rmdir /s /q $(subst /,\,$(DIRLIST))) + RMDIR = -rmdir /s /q $(subst /,\,$1) else EXE := DEL = $(RM) $1 diff --git a/test/err/Makefile b/test/err/Makefile index ff927ada0..454a560ce 100644 --- a/test/err/Makefile +++ b/test/err/Makefile @@ -7,7 +7,7 @@ endif ifdef CMD_EXE NOT := - # Hack - DEL = del /f $(subst /,\,$1) + DEL = -del /f $(subst /,\,$1) else NOT := ! DEL = $(RM) $1 @@ -44,5 +44,5 @@ $(WORKDIR)/%.or.prg: %.c $(NOT) $(CL65) -Or $(CC65FLAGS) $< -o $@ clean: - -@$(call DEL,$(TESTS)) - -@$(call DEL,$(SOURCES:.c=.o)) + @$(call DEL,$(TESTS)) + @$(call DEL,$(SOURCES:.c=.o)) diff --git a/test/misc/Makefile b/test/misc/Makefile index ca4870663..918316c6c 100644 --- a/test/misc/Makefile +++ b/test/misc/Makefile @@ -8,7 +8,7 @@ endif ifdef CMD_EXE S := $(subst /,\,/) NOT := - # Hack - DEL = del /f $(subst /,\,$1) + DEL = -del /f $(subst /,\,$1) else S := / NOT := ! @@ -58,6 +58,6 @@ $(WORKDIR)/cc65141011%prg: cc65141011.c -$(SIM65) $(SIM65FLAGS) $@ clean: - -@$(call DEL,$(TESTS)) - -@$(call DEL,$(SOURCES:.c=.o)) - -@$(call DEL,$(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 14d78c37c..09dd96d44 100644 --- a/test/ref/Makefile +++ b/test/ref/Makefile @@ -8,7 +8,7 @@ endif ifdef CMD_EXE S := $(subst /,\,/) - DEL = del /f $(subst /,\,$1) + DEL = -del /f $(subst /,\,$1) else S := / DEL = $(RM) $1 @@ -89,8 +89,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)) + @$(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 4de47c6b5..4ad8160ef 100644 --- a/test/val/Makefile +++ b/test/val/Makefile @@ -6,7 +6,7 @@ ifneq ($(shell echo),) endif ifdef CMD_EXE - DEL = del /f $(subst /,\,$1) + DEL = -del /f $(subst /,\,$1) else DEL = $(RM) $1 endif @@ -66,5 +66,5 @@ $(WORKDIR)/%.or.prg: %.c $(SIM65) $(SIM65FLAGS) $@ clean: - -@$(call DEL,$(TESTS)) - -@$(call DEL,$(SOURCES:.c=.o)) + @$(call DEL,$(TESTS)) + @$(call DEL,$(SOURCES:.c=.o))