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.
This commit is contained in:
Kugel Fuhr
2025-07-16 21:24:25 +02:00
parent e82656d8ca
commit 1c167b1ff1

View File

@@ -572,8 +572,7 @@ endif
# GEOS programs need a resource file linked to them # GEOS programs need a resource file linked to them
ifeq ($(SYS),geos-cbm) ifeq ($(SYS),geos-cbm)
asciires.o: asciires.grc asciires.o: asciires.grc
$(GRC) -t $(SYS) $< $(CL) -c -t $(SYS) $<
$(AS) $(<:.grc=.s)
ascii.cvt: ascii.o asciires.o ascii.cvt: ascii.o asciires.o
$(if $(QUIET),echo $(SYS):$@) $(if $(QUIET),echo $(SYS):$@)
$(LD) $(LDFLAGS_$(@F)_$(SYS)) $(LDFLAGS) -o $@ -t $(SYS) -m $@.map $^ $(SYS).lib $(LD) $(LDFLAGS_$(@F)_$(SYS)) $(LDFLAGS) -o $@ -t $(SYS) -m $@.map $^ $(SYS).lib
@@ -730,7 +729,6 @@ mostlyclean:
@$(DEL) *.lbl *.map *.o 2>$(NULLDEV) @$(DEL) *.lbl *.map *.o 2>$(NULLDEV)
# we cant use .s since we have asm files in the directory that we want to keep # 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 %.c,%.s,$(wildcard *.c)} 2>$(NULLDEV)
@$(DEL) ${patsubst %.grc,%.s,$(wildcard *.grc)} 2>$(NULLDEV)
clean: mostlyclean clean: mostlyclean
@$(DEL) $(EXELIST_$(SYS)) $(DISK_$(SYS)) 2>$(NULLDEV) @$(DEL) $(EXELIST_$(SYS)) $(DISK_$(SYS)) 2>$(NULLDEV)