From: uz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Tue, 29 Sep 2009 13:06:35 +0000 (+0000)
Subject: Use "override" when appending to CFLAGS, so this works even when CFLAGS is
X-Git-Tag: V2.13.0rc2~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4056e97587cd9216e340b7fbc38bd61f17afecc5;hp=16f05a78c25c8206a666442f16d3edc4783941f7;p=cc65

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 a09d49761..a99505fbe 100644
--- 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 66ba08a32..f3d94985f 100644
--- 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 b87fdec5b..68657797d 100644
--- 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 7fa7bf4b5..2b0dda733 100644
--- 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 2279d30bf..1dcef8a87 100644
--- 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 614d644bf..44b4c954a 100644
--- 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 e6876077c..f5903fe98 100644
--- 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 22631db65..4028061cd 100644
--- 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 98958bb5d..dd7714b83 100644
--- 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 0638769d0..1cd3a0152 100644
--- 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	=