1
0
mirror of https://github.com/cc65/cc65.git synced 2024-12-27 15:29:46 +00:00

Merge remote-tracking branch 'upstream/master' into testsuite

This commit is contained in:
mrdudz 2015-07-11 12:44:06 +02:00
commit 5ceffa1f70
5 changed files with 18 additions and 19 deletions

View File

@ -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

View File

@ -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))

View File

@ -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))

View File

@ -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))

View File

@ -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))