Change the makefiles so that CFLAGS that are special for the application are

appended after assigning the base value to CFLAGS. This allows to change
CFLAGS on the command line without too much hassle.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4219 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ar65/make/gcc.mak b/src/ar65/make/gcc.mak
index 665aa8f2c252ff51508093d5f2802fb78b247f7f..a09d49761a3dd043a58c9fa101fab163e23c140d 100644 (file)
--- a/src/ar65/make/gcc.mak
+++ b/src/ar65/make/gcc.mak
@@ -10,12 +10,17 @@ EXE         = ar65
 # Library dir
 COMMON = ../common
 
-CFLAGS         = -g -O2 -Wall -W -std=c89 -I$(COMMON)
+#
 CC     = gcc
+CFLAGS         = -g -O2 -Wall -W -std=c89 
+CFLAGS += -I$(COMMON)
 EBIND  = emxbind
 LDFLAGS        =
 
 
+# -----------------------------------------------------------------------------
+# List of all object files
+
 OBJS =         add.o           \
        del.o           \
        error.o         \

diff --git a/src/ca65/make/gcc.mak b/src/ca65/make/gcc.mak
index 9a8ea79ba8bec1999866bbcb22751364e59de930..f579fc7edb9f982df3fd0f5ac19b018aa979b657 100644 (file)
--- a/src/ca65/make/gcc.mak
+++ b/src/ca65/make/gcc.mak
@@ -13,10 +13,11 @@ COMMON      = ../common
 # Several search paths. You may redefine these on the command line
 CA65_INC = \"/usr/lib/cc65/asminc/\"
 
+#
+CC     = gcc
 CFLAGS         = -g -O2 -Wall -W -std=c89
 CFLAGS += -I$(COMMON)
 CFLAGS += -DCA65_INC=$(CA65_INC)
-CC     = gcc
 EBIND  = emxbind
 LDFLAGS        =
 

diff --git a/src/cc65/make/gcc.mak b/src/cc65/make/gcc.mak
index 27399eec8a5638de4447e3ca2feb2fccd4858b2e..b87fdec5b143f9f06e83fc57eb34ba4f779798d5 100644 (file)
--- a/src/cc65/make/gcc.mak
+++ b/src/cc65/make/gcc.mak
@@ -18,10 +18,12 @@ COMMON      = ../common
 CC65_INC = \"/usr/lib/cc65/include/\"
 
 #
-CFLAGS = -O2 -g -Wall -W -std=c89 -I$(COMMON) -DCC65_INC=$(CC65_INC)
-CC=gcc
-EBIND=emxbind
-LDFLAGS=-lm
+CC      = gcc
+CFLAGS  = -O2 -g -Wall -W -std=c89
+CFLAGS += -I$(COMMON)
+CFLAGS += -DCC65_INC=$(CC65_INC)
+EBIND   = emxbind
+LDFLAGS = -lm
 
 # Determine the svn version number if possible
 ifneq "$(shell which svnversion 2>/dev/null)" ""

diff --git a/src/cl65/make/gcc.mak b/src/cl65/make/gcc.mak
index 82bb4c2594fa1152278fb83524aa4f1111a89ba1..7fa7bf4b588662f4571ec184745ffd836559a4c5 100644 (file)
--- a/src/cl65/make/gcc.mak
+++ b/src/cl65/make/gcc.mak
@@ -16,11 +16,13 @@ ifneq ($(Kickstart),)
 SPAWN   = SPAWN_AMIGA
 endif
 
-
-CC=gcc
-CFLAGS = -O2 -g -Wall -W -std=c89 -I$(COMMON) -D$(SPAWN)
-EBIND  = emxbind
-LDFLAGS=
+#
+CC      = gcc
+CFLAGS  = -O2 -g -Wall -W -std=c89
+CFLAGS += -I$(COMMON)
+CFLAGS += -D$(SPAWN)
+EBIND   = emxbind
+LDFLAGS =
 
 OBJS = error.o         \
        global.o        \

diff --git a/src/co65/make/gcc.mak b/src/co65/make/gcc.mak
index 7dbbe950629634f707f046da71da20f16fd0ddff..2279d30bf52fb676d8f11d5988df8790faf07493 100644 (file)
--- a/src/co65/make/gcc.mak
+++ b/src/co65/make/gcc.mak
@@ -10,11 +10,16 @@ EXE         = co65
 # Library dir
 COMMON = ../common
 
-CFLAGS         = -g -O2 -Wall -W -std=c89 -I$(COMMON)
+#
 CC     = gcc
+CFLAGS         = -g -O2 -Wall -W -std=c89
+CFLAGS += -I$(COMMON)
 EBIND  = emxbind
 LDFLAGS        =
 
+# -----------------------------------------------------------------------------
+# List of all object files
+
 OBJS = convert.o       \
         error.o         \
         fileio.o        \

diff --git a/src/da65/make/gcc.mak b/src/da65/make/gcc.mak
index 35e2805c7723a6048662513a9dab1960c7c978e0..614d644bf24c7c3acd90f29d1c82b88e1d01b213 100644 (file)
--- a/src/da65/make/gcc.mak
+++ b/src/da65/make/gcc.mak
@@ -10,10 +10,16 @@ EXE         = da65
 # Library dir
 COMMON = ../common
 
-CFLAGS = -g -O2 -Wall -W -std=c89 -I$(COMMON)
-CC=gcc
-EBIND=emxbind
-LDFLAGS=
+#
+CC      = gcc
+CFLAGS  = -g -O2 -Wall -W -std=c89 
+CFLAGS += -I$(COMMON)
+EBIND   = emxbind
+LDFLAGS =
+        
+
+# -----------------------------------------------------------------------------
+# List of all object files
 
 OBJS =         asminc.o        \
         attrtab.o      \

diff --git a/src/grc/make/gcc.mak b/src/grc/make/gcc.mak
index e5d7c9effe15e85ed09ab86610371ea6c6cdbe2d..e6876077ca9be58dac3c3f9559d8d7c7597e1a40 100644 (file)
--- a/src/grc/make/gcc.mak
+++ b/src/grc/make/gcc.mak
@@ -9,11 +9,17 @@ EXE   = grc
 
 COMMON = ../common
 
-CFLAGS         = -g -O2 -Wall -W -std=c89 -I$(COMMON)
+#
 CC     = gcc
+CFLAGS         = -g -O2 -Wall -W -std=c89
+CFLAGS += -I$(COMMON)
 LDFLAGS        =
 EBIND  = emxbind
 
+
+# -----------------------------------------------------------------------------
+# List of all object files
+
 OBJS =  grc.o
 
 LIBS = $(COMMON)/common.a

diff --git a/src/ld65/make/gcc.mak b/src/ld65/make/gcc.mak
index f1aa9c1e49aa3adfe0cface7c7c64a6a71b1d030..a4b78fc8297999dd3169b41b5490d2858b9106f9 100644 (file)
--- a/src/ld65/make/gcc.mak
+++ b/src/ld65/make/gcc.mak
@@ -16,11 +16,12 @@ LD65_OBJ = \"/usr/lib/cc65/lib/\"
 LD65_CFG = \"/usr/lib/cc65/cfg/\"
 
 #
-CFLAGS = -g -O2 -Wall -W -std=c89 -I$(COMMON) 
+CC      = gcc
+CFLAGS  = -g -O2 -Wall -W -std=c89
+CFLAGS += -I$(COMMON)
 CFLAGS += -DLD65_LIB=$(LD65_LIB) -DLD65_OBJ=$(LD65_OBJ) -DLD65_CFG=$(LD65_CFG)
-CC=gcc
-EBIND=emxbind
-LDFLAGS=
+EBIND   = emxbind
+LDFLAGS =
 
 # Perl script for config file conversion
 CVT=cfg/cvt-cfg.pl

diff --git a/src/od65/make/gcc.mak b/src/od65/make/gcc.mak
index da18ade9723cf94dab1999b2f6317e99848c08b3..98958bb5dbb159740ca0e063cd5ddee16698878a 100644 (file)
--- a/src/od65/make/gcc.mak
+++ b/src/od65/make/gcc.mak
@@ -11,10 +11,16 @@ EXE         = od65
 # Library dir
 COMMON = ../common
 
-CFLAGS = -O2 -g -Wall -W -std=c89 -I$(COMMON)
-CC=gcc
-EBIND=emxbind
-LDFLAGS=
+#
+CC      = gcc
+CFLAGS  = -O2 -g -Wall -W -std=c89 
+CFLAGS += -I$(COMMON)
+EBIND   = emxbind
+LDFLAGS =
+
+
+# -----------------------------------------------------------------------------
+# List of all object files
 
 OBJS =         dump.o          \
        error.o         \

diff --git a/src/sim65/make/gcc.mak b/src/sim65/make/gcc.mak
index 16bdd0f29adb9d64dffa0e08ad61af0bd8c605a7..0638769d0bbd86924413894220851260809083f2 100644 (file)
--- a/src/sim65/make/gcc.mak
+++ b/src/sim65/make/gcc.mak
@@ -10,11 +10,17 @@ EXE         = sim65
 # Library dir
 COMMON = ../common
 
-CFLAGS         = -g -O2 -Wall -W -std=c89 -I$(COMMON)
+#
 CC     = gcc
+CFLAGS         = -g -O2 -Wall -W -std=c89 
+CFLAGS += -I$(COMMON)
 EBIND  = emxbind
 LDFLAGS        =
 
+
+# -----------------------------------------------------------------------------
+# List of all object files
+
 OBJS =         addrspace.o     \
         callback.o      \
         cfgdata.o       \