1
0
mirror of https://github.com/cc65/cc65.git synced 2025-08-07 15:25:31 +00:00

Use simply-defined make variables.

This commit is contained in:
Greg King
2014-12-17 17:44:39 -05:00
parent 15a22bd1c8
commit e414e89b64
5 changed files with 26 additions and 25 deletions

View File

@@ -1,24 +1,24 @@
# toplevel makefile for the regression tests # top-level makefile for the regression tests
# You can comment this special target when you debug the regression tests. # You can comment this special target when you debug the regression tests.
# Then, make will give you more progress reports. # Then, make will give you more progress reports.
.SILENT: .SILENT:
ifneq ($(shell echo),) ifneq ($(shell echo),)
CMD_EXE = 1 CMD_EXE := 1
endif endif
ifdef CMD_EXE ifdef CMD_EXE
RM := del /f RM := del /f
EXE := .exe EXE := .exe
MKDIR = mkdir MKDIR := mkdir
RMDIR = rmdir RMDIR := rmdir
else else
RM := rm -f RM := rm -f
EXE := EXE :=
MKDIR = mkdir -p MKDIR := mkdir -p
RMDIR = rmdir RMDIR := rmdir
endif endif
WORKDIR := ../testwrk WORKDIR := ../testwrk

View File

@@ -2,10 +2,10 @@
# makefile for the tests that MUST NOT compile # makefile for the tests that MUST NOT compile
ifneq ($(shell echo),) ifneq ($(shell echo),)
CMD_EXE = 1 CMD_EXE := 1
endif endif
CC65FLAGS = -t sim6502 CC65FLAGS := -t sim6502
CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
@@ -15,7 +15,7 @@ else
RM := rm -f RM := rm -f
endif endif
WORKDIR := ./../../testwrk WORKDIR := ../../testwrk
.PHONY: all clean .PHONY: all clean
@@ -48,6 +48,7 @@ $(WORKDIR)/%.oir.prg: %.c
! $(CL65) -Oir $(CC65FLAGS) $< -o $@ ! $(CL65) -Oir $(CC65FLAGS) $< -o $@
$(WORKDIR)/%.or.prg: %.c $(WORKDIR)/%.or.prg: %.c
! $(CL65) -Or $(CC65FLAGS) $< -o $@ ! $(CL65) -Or $(CC65FLAGS) $< -o $@
clean: clean:
@$(RM) $(TESTS) @$(RM) $(TESTS)
@$(RM) $(SOURCES:.c=.o) @$(RM) $(SOURCES:.c=.o)

View File

@@ -2,11 +2,11 @@
# makefile for the remaining tests that need special care in one way or another # makefile for the remaining tests that need special care in one way or another
ifneq ($(shell echo),) ifneq ($(shell echo),)
CMD_EXE = 1 CMD_EXE := 1
endif endif
CC65FLAGS = -t sim6502 CC65FLAGS := -t sim6502
SIM65FLAGS = -x 200000000 SIM65FLAGS := -x 200000000
CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65) SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
@@ -17,7 +17,7 @@ else
RM := rm -f RM := rm -f
endif endif
WORKDIR := ./../../testwrk WORKDIR := ../../testwrk
DIFF := $(WORKDIR)/bdiff DIFF := $(WORKDIR)/bdiff
@@ -41,7 +41,7 @@ $(WORKDIR)/endless%prg: endless.c
$(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@ $(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@
! $(SIM65) $(SIM65FLAGS) $@ ! $(SIM65) $(SIM65FLAGS) $@
# these need reference data that cant be generated by a host compiled program # these need reference data that can't be generated by a host-compiled program,
# in a useful way # in a useful way
$(WORKDIR)/limits%prg: limits.c $(WORKDIR)/limits%prg: limits.c
$(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@ $(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@
@@ -50,13 +50,13 @@ $(WORKDIR)/limits%prg: limits.c
# the rest are tests that fail currently for one reason or another # the rest are tests that fail currently for one reason or another
$(WORKDIR)/fields%prg: fields.c $(WORKDIR)/fields%prg: fields.c
@echo "FIXME: " $@ "will currently fail" @echo "FIXME: " $@ "currently will fail."
$(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@ $(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@
-$(SIM65) $(SIM65FLAGS) $@ -$(SIM65) $(SIM65FLAGS) $@
$(WORKDIR)/sitest%prg: sitest.c $(WORKDIR)/sitest%prg: sitest.c
@echo "FIXME: " $@ "will currently fail" @echo "FIXME: " $@ "currently will fail."
-$(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@ -$(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@
-$(SIM65) $(SIM65FLAGS) $@ # -$(SIM65) $(SIM65FLAGS) $@
clean: clean:
@$(RM) $(TESTS) @$(RM) $(TESTS)

View File

@@ -3,11 +3,11 @@
# compared with reference output # compared with reference output
ifneq ($(shell echo),) ifneq ($(shell echo),)
CMD_EXE = 1 CMD_EXE := 1
endif endif
CC65FLAGS = -t sim6502 CC65FLAGS := -t sim6502
SIM65FLAGS = -x 200000000 SIM65FLAGS := -x 200000000
CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65) SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
@@ -18,7 +18,7 @@ else
RM := rm -f RM := rm -f
endif endif
WORKDIR := ./../../testwrk WORKDIR := ../../testwrk
DIFF := $(WORKDIR)/bdiff DIFF := $(WORKDIR)/bdiff

View File

@@ -2,11 +2,11 @@
# makefile for the regression tests that return an error code on failure # makefile for the regression tests that return an error code on failure
ifneq ($(shell echo),) ifneq ($(shell echo),)
CMD_EXE = 1 CMD_EXE := 1
endif endif
CC65FLAGS = -t sim6502 CC65FLAGS := -t sim6502
SIM65FLAGS = -x 200000000 SIM65FLAGS := -x 200000000
CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65) SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
@@ -17,7 +17,7 @@ else
RM := rm -f RM := rm -f
endif endif
WORKDIR := ./../../testwrk WORKDIR := ../../testwrk
.PHONY: all clean .PHONY: all clean