From 1c167b1ff1d13c13811cb3ea4226b1ee8bf9ab0b Mon Sep 17 00:00:00 2001 From: Kugel Fuhr <98353208+kugelfuhr@users.noreply.github.com> Date: Wed, 16 Jul 2025 21:24:25 +0200 Subject: [PATCH] Use cl65 to generate the object file from the grc file to avoid having an intermediate .s file lying around that "make check" complains about. --- samples/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/samples/Makefile b/samples/Makefile index c2236fa9c..31aea24f4 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -572,8 +572,7 @@ endif # GEOS programs need a resource file linked to them ifeq ($(SYS),geos-cbm) asciires.o: asciires.grc - $(GRC) -t $(SYS) $< - $(AS) $(<:.grc=.s) + $(CL) -c -t $(SYS) $< ascii.cvt: ascii.o asciires.o $(if $(QUIET),echo $(SYS):$@) $(LD) $(LDFLAGS_$(@F)_$(SYS)) $(LDFLAGS) -o $@ -t $(SYS) -m $@.map $^ $(SYS).lib @@ -730,7 +729,6 @@ mostlyclean: @$(DEL) *.lbl *.map *.o 2>$(NULLDEV) # we cant use .s since we have asm files in the directory that we want to keep @$(DEL) ${patsubst %.c,%.s,$(wildcard *.c)} 2>$(NULLDEV) - @$(DEL) ${patsubst %.grc,%.s,$(wildcard *.grc)} 2>$(NULLDEV) clean: mostlyclean @$(DEL) $(EXELIST_$(SYS)) $(DISK_$(SYS)) 2>$(NULLDEV)