From 5ed1fac0d678c0261679382cc1d172f01e4b6339 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Tue, 4 Jun 2013 23:39:00 +0200
Subject: [PATCH] Use unique variables for cc65 toolchain.

Originally I used the usual variables (like $(CC) and $(CFLAGS) ) but after
all this doesn't make sense as any predefined values and/or user defined
settings can only be wrong.
---
 libsrc/Makefile                           | 29 ++++++++++++-----------
 libsrc/apple2/targetutil/Makefile.inc     |  2 +-
 libsrc/atari/Makefile.inc                 |  2 +-
 libsrc/geos-apple/Makefile.inc            |  2 +-
 libsrc/geos-apple/targetutil/Makefile.inc |  2 +-
 libsrc/geos-cbm/Makefile.inc              |  2 +-
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/libsrc/Makefile b/libsrc/Makefile
index 4204f00bb..d855d1580 100644
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -67,7 +67,8 @@ clean:
 
 else # TARGET
 
-CFLAGS += -Osir -W error
+CA65FLAGS =
+CC65FLAGS = -Osir -W error
 
 EXTZP = cbm510 \
         cbm610 \
@@ -178,7 +179,7 @@ $$($1_OBJS): | $$($1_OBJDIR)
 
 $$($1_DRVPAT): $$($1_OBJPAT) $$(ZPOBJ) | $$($1_DRVDIR)
 	@echo $$(TARGET) - $$(@F)
-	@$$(LD) -o $$@ -t module $$^
+	@$$(LD65) -o $$@ -t module $$^
 
 $$($1_OBJDIR) $$($1_DRVDIR):
 	@$$(call MKDIR,$$@)
@@ -187,8 +188,8 @@ $(TARGET): $$($1_DRVS)
 
 $$($1_STCPAT): $$($1_DRVPAT)
 	@echo $$(TARGET) - $$(<F)
-	@$$(CO) -o $$(@:.o=.s) --code-label _$$(subst -,_,$$(subst .,_,$$(<F))) $$<
-	@$$(CA) -t $$(TARGET) -o $$@ $$(@:.o=.s)
+	@$$(CO65) -o $$(@:.o=.s) --code-label _$$(subst -,_,$$(subst .,_,$$(<F))) $$<
+	@$$(CA65) -t $$(TARGET) -o $$@ $$(@:.o=.s)
 
 OBJS += $$($1_STCS)
 
@@ -200,11 +201,11 @@ endef
 
 $(foreach drvtype,$(DRVTYPES),$(eval $(call DRVTYPE_template,$(drvtype))))
 
-AR := $(if $(wildcard ../bin/ar65*),../bin/ar65,ar65)
-CA := $(if $(wildcard ../bin/ca65*),../bin/ca65,ca65)
-CC := $(if $(wildcard ../bin/cc65*),../bin/cc65,cc65)
-CO := $(if $(wildcard ../bin/co65*),../bin/co65,co65)
-LD := $(if $(wildcard ../bin/ld65*),../bin/ld65,ld65)
+AR65 := $(if $(wildcard ../bin/ar65*),../bin/ar65,ar65)
+CA65 := $(if $(wildcard ../bin/ca65*),../bin/ca65,ca65)
+CC65 := $(if $(wildcard ../bin/cc65*),../bin/cc65,cc65)
+CO65 := $(if $(wildcard ../bin/co65*),../bin/co65,co65)
+LD65 := $(if $(wildcard ../bin/ld65*),../bin/ld65,ld65)
 
 export CC65_HOME := $(abspath ..)
 
@@ -213,7 +214,7 @@ export CC65_HOME := $(abspath ..)
 define ASSEMBLE_recipe
 
 $(if $(TRAVIS),,@echo $(TARGET) - $<)
-@$(CA) -t $(TARGET) $(AFLAGS) --create-dep $(@:.o=.d) -o $@ $<
+@$(CA65) -t $(TARGET) $(CA65FLAGS) --create-dep $(@:.o=.d) -o $@ $<
 
 endef
 
@@ -222,8 +223,8 @@ endef
 define COMPILE_recipe
 
 $(if $(TRAVIS),,@echo $(TARGET) - $<)
-@$(CC) -t $(TARGET) $(CFLAGS) --create-dep $(@:.o=.d) --dep-target $@ -o $(@:.o=.s) $<
-@$(CA) -t $(TARGET) -o $@ $(@:.o=.s)
+@$(CC65) -t $(TARGET) $(CC65FLAGS) --create-dep $(@:.o=.d) --dep-target $@ -o $(@:.o=.s) $<
+@$(CA65) -t $(TARGET) -o $@ $(@:.o=.s)
 
 endef
 
@@ -237,10 +238,10 @@ endef
 
 $(EXTRA_OBJPAT): $(EXTRA_SRCPAT) | ../lib
 	@echo $(TARGET) - $(@F)
-	@$(CA) -t $(TARGET) $(AFLAGS) -o $@ $<
+	@$(CA65) -t $(TARGET) $(CA65FLAGS) -o $@ $<
 
 ../lib/$(TARGET).lib: $(OBJS) | ../lib
-	$(AR) a $@ $?
+	$(AR65) a $@ $?
 
 ../wrk/$(TARGET) ../lib ../targetutil:
 	@$(call MKDIR,$@)
diff --git a/libsrc/apple2/targetutil/Makefile.inc b/libsrc/apple2/targetutil/Makefile.inc
index edc4e852b..7904607b3 100644
--- a/libsrc/apple2/targetutil/Makefile.inc
+++ b/libsrc/apple2/targetutil/Makefile.inc
@@ -4,6 +4,6 @@ DEPS += ../wrk/$(TARGET)/loader.d
 	$(ASSEMBLE_recipe)
 
 ../targetutil/loader.system: ../wrk/$(TARGET)/loader.o $(SRCDIR)/targetutil/loader.cfg | ../targetutil
-	$(LD) -o $@ -C $(filter %.cfg,$^) $(filter-out %.cfg,$^)
+	$(LD65) -o $@ -C $(filter %.cfg,$^) $(filter-out %.cfg,$^)
 
 $(TARGET): ../targetutil/loader.system
diff --git a/libsrc/atari/Makefile.inc b/libsrc/atari/Makefile.inc
index 2658bde1d..d12b54058 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
 
-AFLAGS += -D NUMDRVS=4 -D LINEBUF=80 -D UCASE_FILENAME=1 -D DEFAULT_DEVICE=1 -D DYNAMIC_DD=1
+CA65FLAGS += -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 1adc1b5a4..366d35899 100644
--- a/libsrc/geos-apple/Makefile.inc
+++ b/libsrc/geos-apple/Makefile.inc
@@ -1 +1 @@
-AFLAGS += -I geos-apple -I geos-common
+CA65FLAGS += -I geos-apple -I geos-common
diff --git a/libsrc/geos-apple/targetutil/Makefile.inc b/libsrc/geos-apple/targetutil/Makefile.inc
index b5b2d3671..01ae3f55c 100644
--- a/libsrc/geos-apple/targetutil/Makefile.inc
+++ b/libsrc/geos-apple/targetutil/Makefile.inc
@@ -9,6 +9,6 @@ DEPS += ../wrk/$(TARGET)/convert.d
 	@$(MAKE) --no-print-directory apple2enh
 
 ../targetutil/convert.system: ../wrk/$(TARGET)/convert.o ../lib/apple2enh.lib | ../targetutil
-	$(LD) -o $@ -C apple2enh-system.cfg $^
+	$(LD65) -o $@ -C apple2enh-system.cfg $^
 
 $(TARGET): ../targetutil/convert.system
diff --git a/libsrc/geos-cbm/Makefile.inc b/libsrc/geos-cbm/Makefile.inc
index 9bf34d3fd..423ad8b54 100644
--- a/libsrc/geos-cbm/Makefile.inc
+++ b/libsrc/geos-cbm/Makefile.inc
@@ -1 +1 @@
-AFLAGS += -I geos-cbm -I geos-common
+CA65FLAGS += -I geos-cbm -I geos-common
-- 
2.39.5