Made test Makefiles work with CMD.EXE

[cc65] / test / err / Makefile

diff --git a/test/err/Makefile b/test/err/Makefile
index 4e12323fdb188389af17a52835a5e94e1e1a1661..d729784278e1b649782a1175aa5337657088a0e8 100644 (file)
--- a/test/err/Makefile
+++ b/test/err/Makefile
@@ -5,16 +5,18 @@ ifneq ($(shell echo),)
   CMD_EXE := 1
 endif
 
-CC65FLAGS := -t sim6502
-
-CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
-
 ifdef CMD_EXE
-RM := del /f
+  NOT := - # Hack
+  RM = del /f $(subst /,\,$1)
 else
-RM := rm -f
+  NOT := !
+  RM = $(RM) $1
 endif
 
+CC65FLAGS := -t sim6502
+
+CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
+
 WORKDIR := ../../testwrk
 
 .PHONY: all clean
@@ -25,22 +27,22 @@ TESTS := $(foreach option,. .o. .os. .osi. .osir. .oi. .oir. .or.,$(SOURCES:%.c=
 all: $(TESTS)
 
 $(WORKDIR)/%.prg: %.c
-       ! $(CL65) $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.o.prg: %.c
-       ! $(CL65) -O $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) -O $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.os.prg: %.c
-       ! $(CL65) -Os $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) -Os $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.osi.prg: %.c
-       ! $(CL65) -Osi $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) -Osi $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.osir.prg: %.c
-       ! $(CL65) -Osir $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) -Osir $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.oi.prg: %.c
-       ! $(CL65) -Oi $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) -Oi $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.oir.prg: %.c
-       ! $(CL65) -Oir $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) -Oir $(CC65FLAGS) $< -o $@
 $(WORKDIR)/%.or.prg: %.c
-       ! $(CL65) -Or $(CC65FLAGS) $< -o $@
+       $(NOT) $(CL65) -Or $(CC65FLAGS) $< -o $@
 
 clean:
-       @$(RM) $(TESTS)
-       @$(RM) $(SOURCES:.c=.o)
+       -@$(call RM,$(TESTS))
+       -@$(call RM,$(SOURCES:.c=.o))