Made test Makefiles work with CMD.EXE

[cc65] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 27f7ff45636be467e35ef75a27f2f6803d806773..ddeccc5eeae3a9d0ff7a8be20a6199438ca9c8b3 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -10,25 +10,27 @@ ifneq ($(shell echo),)
 endif
 
 ifdef CMD_EXE
-  RM := del /f
   EXE := .exe
-  MKDIR := mkdir
-  RMDIR := rmdir
+  RM = del /f $(subst /,\,$1)
+  MKDIR = mkdir $(subst /,\,$1)
+  RMDIR = rmdir /s /q $(subst /,\,$1)
 else
-  RM := rm -f
   EXE :=
-  MKDIR := mkdir -p
-  RMDIR := rmdir
+  RM = $(RM) $1
+  MKDIR = mkdir $1
+  RMDIR = rmdir $1
 endif
 
 WORKDIR := ../testwrk
 
+CC := gcc
+
 .PHONY: all dotests continue mostly-clean clean
 
 all: dotests
 
 $(WORKDIR):
-       $(MKDIR) $(WORKDIR)
+       $(call MKDIR,$(WORKDIR))
 
 $(WORKDIR)/bdiff$(EXE): bdiff.c | $(WORKDIR)
        $(CC) -O2 -o $@ $<
@@ -50,5 +52,5 @@ mostly-clean:
        @$(MAKE) -C misc clean
 
 clean: mostly-clean
-       $(RM) $(WORKDIR)/bdiff$(EXE)
-       $(RMDIR) $(WORKDIR)
+       -@$(call RM,$(WORKDIR)/bdiff$(EXE))
+       -$(call RMDIR,$(WORKDIR))