From 88648ce7175214d2cc8d69abd0128cb913de20ca Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Sat, 4 May 2013 23:38:05 +0200
Subject: [PATCH] Avoid usage of cl65 for library build as it requires
 'install'.

---
 libsrc/Makefile                | 15 +++++++++------
 libsrc/atari/Makefile.inc      |  2 +-
 libsrc/geos-apple/Makefile.inc |  2 +-
 libsrc/geos-cbm/Makefile.inc   |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/libsrc/Makefile b/libsrc/Makefile
index 36b88ff8f..f10bebec2 100644
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -54,7 +54,7 @@ clean: mostlyclean
 
 else # TARGET
 
-CFLAGS += -t $(TARGET) -Osir --create-dep $(@:.o=.d)
+CFLAGS += -Osir
 
 EXTZP = cbm510 \
         cbm610 \
@@ -157,7 +157,7 @@ $(TARGET): $$($1_DRVS)
 
 $$($1_STCPAT): $$($1_DRVPAT)
 	$$(CO) -o $$(@:.o=.s) --code-label _$$(subst -,_,$$(subst .,_,$$(<F))) $$<
-	$$(CC) -c -t $$(TARGET) -o $$@ $$(@:.o=.s)
+	@$$(CA) -t $$(TARGET) -o $$@ $$(@:.o=.s)
 
 OBJS += $$($1_STCS)
 
@@ -171,21 +171,24 @@ $(foreach drvtype,$(DRVTYPES),$(eval $(call DRVTYPE_template,$(drvtype))))
 
 ifdef CC65_HOME
   AR = $(CC65_HOME)/bin/ar65
-  CC = $(CC65_HOME)/bin/cl65
+  CA = $(CC65_HOME)/bin/ca65
+  CC = $(CC65_HOME)/bin/cc65
   CO = $(CC65_HOME)/bin/co65
   LD = $(CC65_HOME)/bin/ld65
 else
   AR = ../bin/ar65
-  CC = ../bin/cl65
+  CA = ../bin/ca65
+  CC = ../bin/cc65
   CO = ../bin/co65
   LD = ../bin/ld65
 endif
 
 ../wrk/$(TARGET)/%.o: %.s | ../wrk/$(TARGET)
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CA) -t $(TARGET) $(AFLAGS) --create-dep $(@:.o=.d) -o $@ $<
 
 ../wrk/$(TARGET)/%.o: %.c | ../wrk/$(TARGET)
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CC) -t $(TARGET) $(CFLAGS) --create-dep $(@:.o=.d) -o $(@:.o=.s) $<
+	@$(CA) -t $(TARGET) -o $@ $(@:.o=.s)
 
 ../wrk/$(TARGET):
 	mkdir -p $@
diff --git a/libsrc/atari/Makefile.inc b/libsrc/atari/Makefile.inc
index a20e1909e..2658bde1d 100644
--- a/libsrc/atari/Makefile.inc
+++ b/libsrc/atari/Makefile.inc
@@ -13,4 +13,4 @@
 # DYNAMIC_DD     - determine default disk device at runtime (SpartaDOS only)
 #                  needs DEFAULT_DEVICE to be defined, otherwise no effect
 
-CFLAGS += -Wa -DNUMDRVS=4,-DLINEBUF=80,-DUCASE_FILENAME=1,-DDEFAULT_DEVICE=1,-DDYNAMIC_DD=1
+AFLAGS += -D NUMDRVS=4 -D LINEBUF=80 -D UCASE_FILENAME=1 -D DEFAULT_DEVICE=1 -D DYNAMIC_DD=1
diff --git a/libsrc/geos-apple/Makefile.inc b/libsrc/geos-apple/Makefile.inc
index 28238aa29..1adc1b5a4 100644
--- a/libsrc/geos-apple/Makefile.inc
+++ b/libsrc/geos-apple/Makefile.inc
@@ -1 +1 @@
-CFLAGS += -Wa -Igeos-apple,-Igeos-common
+AFLAGS += -I geos-apple -I geos-common
diff --git a/libsrc/geos-cbm/Makefile.inc b/libsrc/geos-cbm/Makefile.inc
index 53ce4804c..9bf34d3fd 100644
--- a/libsrc/geos-cbm/Makefile.inc
+++ b/libsrc/geos-cbm/Makefile.inc
@@ -1 +1 @@
-CFLAGS += -Wa -Igeos-cbm,-Igeos-common
+AFLAGS += -I geos-cbm -I geos-common
-- 
2.39.5