Use "override" when appending to CFLAGS, so this works even when CFLAGS is

specified on the command line.

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

diff --git a/src/ar65/make/gcc.mak b/src/ar65/make/gcc.mak
index a09d49761a3dd043a58c9fa101fab163e23c140d..a99505fbe306811d55ac0a7cc3959f98f6d59c94 100644 (file)
--- a/src/ar65/make/gcc.mak
+++ b/src/ar65/make/gcc.mak
@@ -12,8 +12,8 @@ COMMON        = ../common
 
 #
 CC     = gcc
-CFLAGS         = -g -O2 -Wall -W -std=c89 
-CFLAGS += -I$(COMMON)
+CFLAGS         = -g -O2 -Wall -W -std=c89
+override CFLAGS += -I$(COMMON)
 EBIND  = emxbind
 LDFLAGS        =
 

diff --git a/src/ca65/make/gcc.mak b/src/ca65/make/gcc.mak
index 66ba08a32943412c4e90a76d1adca075ecb4f973..f3d94985fe06dbe463da409b0d9ea9f43bdb2c52 100644 (file)
--- a/src/ca65/make/gcc.mak
+++ b/src/ca65/make/gcc.mak
@@ -16,8 +16,8 @@ CA65_INC = \"/usr/lib/cc65/asminc/\"
 #
 CC     = gcc
 CFLAGS         = -g -O2 -Wall -W -std=c89
-CFLAGS += -I$(COMMON)
-CFLAGS += -DCA65_INC=$(CA65_INC)
+override CFLAGS += -I$(COMMON)
+override CFLAGS += -DCA65_INC=$(CA65_INC)
 EBIND  = emxbind
 LDFLAGS        =
 

diff --git a/src/cc65/make/gcc.mak b/src/cc65/make/gcc.mak
index b87fdec5b143f9f06e83fc57eb34ba4f779798d5..68657797d9fe3e9a8162e920c639c800f4a080e3 100644 (file)
--- a/src/cc65/make/gcc.mak
+++ b/src/cc65/make/gcc.mak
@@ -20,8 +20,8 @@ CC65_INC = \"/usr/lib/cc65/include/\"
 #
 CC      = gcc
 CFLAGS  = -O2 -g -Wall -W -std=c89
-CFLAGS += -I$(COMMON)
-CFLAGS += -DCC65_INC=$(CC65_INC)
+override CFLAGS += -I$(COMMON)
+override CFLAGS += -DCC65_INC=$(CC65_INC)
 EBIND   = emxbind
 LDFLAGS = -lm
 

diff --git a/src/cl65/make/gcc.mak b/src/cl65/make/gcc.mak
index 7fa7bf4b588662f4571ec184745ffd836559a4c5..2b0dda733cdfe13f6e6109e75b43cc5a1bcd7358 100644 (file)
--- a/src/cl65/make/gcc.mak
+++ b/src/cl65/make/gcc.mak
@@ -19,8 +19,8 @@ endif
 #
 CC      = gcc
 CFLAGS  = -O2 -g -Wall -W -std=c89
-CFLAGS += -I$(COMMON)
-CFLAGS += -D$(SPAWN)
+override CFLAGS += -I$(COMMON)
+override CFLAGS += -D$(SPAWN)
 EBIND   = emxbind
 LDFLAGS =
 

diff --git a/src/co65/make/gcc.mak b/src/co65/make/gcc.mak
index 2279d30bf52fb676d8f11d5988df8790faf07493..1dcef8a873a608a8fc8af8860d0d10ef8037da00 100644 (file)
--- a/src/co65/make/gcc.mak
+++ b/src/co65/make/gcc.mak
@@ -13,7 +13,7 @@ COMMON        = ../common
 #
 CC     = gcc
 CFLAGS         = -g -O2 -Wall -W -std=c89
-CFLAGS += -I$(COMMON)
+override CFLAGS += -I$(COMMON)
 EBIND  = emxbind
 LDFLAGS        =
 

diff --git a/src/da65/make/gcc.mak b/src/da65/make/gcc.mak
index 614d644bf24c7c3acd90f29d1c82b88e1d01b213..44b4c954a699db57c977b6805669142a4fab2c5e 100644 (file)
--- a/src/da65/make/gcc.mak
+++ b/src/da65/make/gcc.mak
@@ -12,11 +12,11 @@ COMMON      = ../common
 
 #
 CC      = gcc
-CFLAGS  = -g -O2 -Wall -W -std=c89 
-CFLAGS += -I$(COMMON)
+CFLAGS  = -g -O2 -Wall -W -std=c89
+override CFLAGS += -I$(COMMON)
 EBIND   = emxbind
 LDFLAGS =
-        
+
 
 # -----------------------------------------------------------------------------
 # List of all object files

diff --git a/src/grc/make/gcc.mak b/src/grc/make/gcc.mak
index e6876077ca9be58dac3c3f9559d8d7c7597e1a40..f5903fe988be90818fe1afd2146fcaa1d87d19f3 100644 (file)
--- a/src/grc/make/gcc.mak
+++ b/src/grc/make/gcc.mak
@@ -12,7 +12,7 @@ COMMON = ../common
 #
 CC     = gcc
 CFLAGS         = -g -O2 -Wall -W -std=c89
-CFLAGS += -I$(COMMON)
+override CFLAGS += -I$(COMMON)
 LDFLAGS        =
 EBIND  = emxbind
 

diff --git a/src/ld65/make/gcc.mak b/src/ld65/make/gcc.mak
index 22631db65e0f86b39bbe7db94b343c745c2b82ca..4028061cd98641ecb67316af8bb5750a992bf4c7 100644 (file)
--- a/src/ld65/make/gcc.mak
+++ b/src/ld65/make/gcc.mak
@@ -18,8 +18,8 @@ LD65_CFG = \"/usr/lib/cc65/cfg/\"
 #
 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)
+override CFLAGS += -I$(COMMON)
+override CFLAGS += -DLD65_LIB=$(LD65_LIB) -DLD65_OBJ=$(LD65_OBJ) -DLD65_CFG=$(LD65_CFG)
 EBIND   = emxbind
 LDFLAGS =
 

diff --git a/src/od65/make/gcc.mak b/src/od65/make/gcc.mak
index 98958bb5dbb159740ca0e063cd5ddee16698878a..dd7714b83a5db66d41fc59854d21c3985f64c6fd 100644 (file)
--- a/src/od65/make/gcc.mak
+++ b/src/od65/make/gcc.mak
@@ -13,8 +13,8 @@ COMMON        = ../common
 
 #
 CC      = gcc
-CFLAGS  = -O2 -g -Wall -W -std=c89 
-CFLAGS += -I$(COMMON)
+CFLAGS  = -O2 -g -Wall -W -std=c89
+override CFLAGS += -I$(COMMON)
 EBIND   = emxbind
 LDFLAGS =
 

diff --git a/src/sim65/make/gcc.mak b/src/sim65/make/gcc.mak
index 0638769d0bbd86924413894220851260809083f2..1cd3a01527700f6639a416280f9a506a16366ef5 100644 (file)
--- a/src/sim65/make/gcc.mak
+++ b/src/sim65/make/gcc.mak
@@ -12,8 +12,8 @@ COMMON        = ../common
 
 #
 CC     = gcc
-CFLAGS         = -g -O2 -Wall -W -std=c89 
-CFLAGS += -I$(COMMON)
+CFLAGS         = -g -O2 -Wall -W -std=c89
+override CFLAGS += -I$(COMMON)
 EBIND  = emxbind
 LDFLAGS        =