make makefiles in samples behave the same as the others

This commit is contained in:
mrdudz
2025-06-26 22:16:08 +02:00
parent cc6813428c
commit fed7276a63
15 changed files with 191 additions and 6 deletions

View File

@@ -17,11 +17,15 @@ C1541 ?= c1541
ifeq ($(origin SYS),command line)
ifeq ($(SYS),c64)
override SYS = geos-cbm
$(info GEOS: c64 -> geos-cbm)
ifneq ($(SILENT),s)
$(info GEOS: c64 -> geos-cbm)
endif
endif
ifeq ($(SYS),apple2enh)
override SYS = geos-apple
$(info GEOS: apple2enh -> geos-apple)
ifneq ($(SILENT),s)
$(info GEOS: apple2enh -> geos-apple)
endif
endif
endif
@@ -55,6 +59,14 @@ else
SP := $(if $(wildcard ../../bin/sp65*),../../bin/sp65,sp65)
endif
ifeq ($(SILENT),s)
QUIET = 1
endif
ifdef QUIET
.SILENT:
endif
DIRLIST = grc
define SUBDIR_recipe
@@ -111,36 +123,47 @@ bitmap.c: logo.pcx
$(SP) -r logo.pcx -c geos-bitmap -w bitmap.c,ident=bitmap
bitmap-demo.cvt: bitmap.c bitmap-demores.grc bitmap-demo.c
$(if $(QUIET),echo $(SYS):$@)
$(CL) -t $(SYS) -O -o $@ -m bitmap-demo.map bitmap-demores.grc bitmap-demo.c
filesel.cvt: fileselres.grc filesel.c
$(if $(QUIET),echo $(SYS):$@)
$(CL) -t $(SYS) -O -o $@ -m filesel.map fileselres.grc filesel.c
geosconio.cvt: geosconiores.grc geosconio.c
$(if $(QUIET),echo $(SYS):$@)
$(CL) -t $(SYS) -O -o $@ -m geosconio.map geosconiores.grc geosconio.c
geosver.cvt: geosverres.grc geosver.c
$(if $(QUIET),echo $(SYS):$@)
$(CL) -t $(SYS) -O -o $@ -m geosver.map geosverres.grc geosver.c
getid.cvt: getidres.grc getid.c
$(if $(QUIET),echo $(SYS):$@)
$(CL) -t $(SYS) -O -o $@ -m getid.map getidres.grc getid.c
hello1.cvt: hello1res.grc hello1.c
$(if $(QUIET),echo $(SYS):$@)
$(CL) -t $(SYS) -O -o $@ -m hello1.map hello1res.grc hello1.c
hello2.cvt: hello2res.grc hello2.c
$(if $(QUIET),echo $(SYS):$@)
$(CL) -t $(SYS) -O -o $@ -m hello2.map hello2res.grc hello2.c
overlay-demo.cvt: overlay-demores.grc overlay-demo.c
$(if $(QUIET),echo $(SYS):$@)
$(CL) -t $(SYS) -O -o $@ -m overlay-demo.map overlay-demores.grc overlay-demo.c
rmvprot.cvt: rmvprotres.grc rmvprot.c
$(if $(QUIET),echo $(SYS):$@)
$(CL) -t $(SYS) -O -o $@ -m rmvprot.map rmvprotres.grc rmvprot.c
vector-demo.cvt: vector-demores.grc vector-demo.c
$(if $(QUIET),echo $(SYS):$@)
$(CL) -t $(SYS) -O -o $@ -m vector-demo.map vector-demores.grc vector-demo.c
yesno.cvt: yesnores.grc yesno.c
$(if $(QUIET),echo $(SYS):$@)
$(CL) -t $(SYS) -O -o $@ -m yesno.map yesnores.grc yesno.c

View File

@@ -39,6 +39,14 @@ else
GRC := $(if $(wildcard ../../../bin/grc65*),../../../bin/grc65,grc65)
endif
ifeq ($(SILENT),s)
QUIET = 1
endif
ifdef QUIET
.SILENT:
endif
EXELIST_geos-cbm = \
test.s \
vlir.cvt
@@ -56,9 +64,11 @@ samples:
endif
test.s: test.grc
$(if $(QUIET),echo $(SYS):$@)
$(GRC) -s test.s test.grc
vlir.cvt: vlir.grc vlir0.s vlir1.s vlir2.s
$(if $(QUIET),echo $(SYS):$@)
# using separate calls here for demonstration purposes:
$(GRC) -t $(SYS) -s vlir.s vlir.grc
$(AS) -t $(SYS) vlir.s