Sophie: gogoc-1.2-26.fc18 src

gogoc-1.2-26.fc18.src.rpm

diff --git gogoc-1_2-RELEASE/gogoc-config/Makefile gogoc-1_2-RELEASE/gogoc-config/Makefile
index a43f6e5..35d9b99 100644
--- gogoc-1_2-RELEASE/gogoc-config/Makefile
+++ gogoc-1_2-RELEASE/gogoc-config/Makefile
@@ -30,13 +30,13 @@ RANLIB=ranlib
 AR=ar
 
 ifdef DEBUG
-CXXFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
-CFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
-LDFLAGS=-g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
+CXXFLAGS += -g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
+CFLAGS += -g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
+LDFLAGS += -g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
 else
-CXXFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
-CFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
-LDFLAGS=-O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
+CXXFLAGS += -O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
+CFLAGS += -O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
+LDFLAGS += -O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
 endif
 
 
diff --git gogoc-1_2-RELEASE/gogoc-messaging/Makefile gogoc-1_2-RELEASE/gogoc-messaging/Makefile
index eae0966..9be3be0 100644
--- gogoc-1_2-RELEASE/gogoc-messaging/Makefile
+++ gogoc-1_2-RELEASE/gogoc-messaging/Makefile
@@ -28,13 +28,13 @@ RANLIB=ranlib
 AR=ar
 
 ifdef DEBUG
-CXXFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
-CFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
-LDFLAGS=-g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
+CXXFLAGS += -g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
+CFLAGS += -g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
+LDFLAGS += -g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
 else
-CXXFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
-CFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
-LDFLAGS=-O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
+CXXFLAGS += -O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
+CFLAGS += -O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
+LDFLAGS += -O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
 endif
 
 
diff --git gogoc-1_2-RELEASE/gogoc-pal/platform/common/Makefile gogoc-1_2-RELEASE/gogoc-pal/platform/common/Makefile
index 3f88b4a..365b645 100644
--- gogoc-1_2-RELEASE/gogoc-pal/platform/common/Makefile
+++ gogoc-1_2-RELEASE/gogoc-pal/platform/common/Makefile
@@ -38,7 +38,7 @@ platform-obj: ${OBJS}
 
 
 ${OBJS_DIR}/pal_version.o: ${SRC_DIR}/pal_version.c ${INC_DIR}/pal_version.h
-	$(CC) ${CFLAGS} -o $@ ${SRC_DIR}/pal_version.c
+	$(CC) $(CFLAGS) -o $@ ${SRC_DIR}/pal_version.c
 
 
 #
diff --git gogoc-1_2-RELEASE/gogoc-tsp/platform/darwin/Makefile gogoc-1_2-RELEASE/gogoc-tsp/platform/darwin/Makefile
index c0c87f0..a1d6a01 100644
--- gogoc-1_2-RELEASE/gogoc-tsp/platform/darwin/Makefile
+++ gogoc-1_2-RELEASE/gogoc-tsp/platform/darwin/Makefile
@@ -13,11 +13,11 @@
 -include platform.mak
 
 ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
-LDFLAGS=-g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lstdc++ -fexceptions
+CFLAGS += -g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+LDFLAGS += -g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lstdc++ -fexceptions
 else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
-LDFLAGS=$(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lstdc++ -fexceptions
+CFLAGS += -O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+LDFLAGS += $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lstdc++ -fexceptions
 endif
 CC=gcc
 
diff --git gogoc-1_2-RELEASE/gogoc-tsp/platform/freebsd/Makefile gogoc-1_2-RELEASE/gogoc-tsp/platform/freebsd/Makefile
index 8b05cc8..3569549 100644
--- gogoc-1_2-RELEASE/gogoc-tsp/platform/freebsd/Makefile
+++ gogoc-1_2-RELEASE/gogoc-tsp/platform/freebsd/Makefile
@@ -13,11 +13,11 @@
 -include platform.mak
 
 ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
-LDFLAGS=-g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++
+CFLAGS += -g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+LDFLAGS += -g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++
 else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
-LDFLAGS=$(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++
+CFLAGS += -O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+LDFLAGS += $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++
 endif
 CC=gcc
 
diff --git gogoc-1_2-RELEASE/gogoc-tsp/platform/gogocpe/Makefile gogoc-1_2-RELEASE/gogoc-tsp/platform/gogocpe/Makefile
index 43a8c43..7554b83 100644
--- gogoc-1_2-RELEASE/gogoc-tsp/platform/gogocpe/Makefile
+++ gogoc-1_2-RELEASE/gogoc-tsp/platform/gogocpe/Makefile
@@ -17,11 +17,11 @@
 -include platform.mak
 
 ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
-LDFLAGS=-g $(LD_LIB_PATHS) $(LD_LIBRARIES) $(EXTRA_LDFLAGS)
+CFLAGS += -g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+LDFLAGS += -g $(LD_LIB_PATHS) $(LD_LIBRARIES) $(EXTRA_LDFLAGS)
 else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
-LDFLAGS=$(LD_LIB_PATHS) $(LD_LIBRARIES) $(EXTRA_LDFLAGS)
+CFLAGS += -O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+LDFLAGS += $(LD_LIB_PATHS) $(LD_LIBRARIES) $(EXTRA_LDFLAGS)
 endif
 
 OBJS=$(OBJS_DIR)/tsp_local.o \
diff --git gogoc-1_2-RELEASE/gogoc-tsp/platform/linux/Makefile gogoc-1_2-RELEASE/gogoc-tsp/platform/linux/Makefile
index 04d804a..e5a1d22 100644
--- gogoc-1_2-RELEASE/gogoc-tsp/platform/linux/Makefile
+++ gogoc-1_2-RELEASE/gogoc-tsp/platform/linux/Makefile
@@ -13,11 +13,11 @@
 -include platform.mak
 
 ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
-LDFLAGS=-g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++
+CFLAGS += -g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+LDFLAGS += -g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++
 else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
-LDFLAGS=$(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++
+CFLAGS += -O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+LDFLAGS += $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++
 endif
 CC=gcc
 
@@ -36,7 +36,7 @@ $(OBJS_DIR)/tsp_tun.o:tsp_tun.c
 	$(CC) $(CFLAGS) -c tsp_tun.c -o $(OBJS_DIR)/tsp_tun.o
 
 $(TARGET): $(OBJS)
-	$(CC) -o $(TARGET) $(wildcard $(OBJS_DIR)/*.o) $(LDFLAGS)
+	$(CC) $(CFLAGS) -o $(TARGET) $(wildcard $(OBJS_DIR)/*.o) $(LDFLAGS)
 
 clean:
 	rm -f $(OBJS) $(TARGET)
diff --git gogoc-1_2-RELEASE/gogoc-tsp/platform/netbsd/Makefile gogoc-1_2-RELEASE/gogoc-tsp/platform/netbsd/Makefile
index f1166ca..8dbd515 100644
--- gogoc-1_2-RELEASE/gogoc-tsp/platform/netbsd/Makefile
+++ gogoc-1_2-RELEASE/gogoc-tsp/platform/netbsd/Makefile
@@ -13,11 +13,11 @@
 -include platform.mak
 
 ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
-LDFLAGS=-g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++ -lm
+CFLAGS += -g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+LDFLAGS += -g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++ -lm
 else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
-LDFLAGS=$(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++ -lm
+CFLAGS += -O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+LDFLAGS += $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++ -lm
 endif
 CC=gcc
 
diff --git gogoc-1_2-RELEASE/gogoc-tsp/platform/openbsd/Makefile gogoc-1_2-RELEASE/gogoc-tsp/platform/openbsd/Makefile
index 4c22238..c0a924f 100644
--- gogoc-1_2-RELEASE/gogoc-tsp/platform/openbsd/Makefile
+++ gogoc-1_2-RELEASE/gogoc-tsp/platform/openbsd/Makefile
@@ -13,11 +13,11 @@
 -include platform.mak
 
 ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
-LDFLAGS=-g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++ -lm
+CFLAGS += -g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+LDFLAGSi += -g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++ -lm
 else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
-LDFLAGS=$(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++ -lm
+CFLAGS += -O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+LDFLAGS += $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++ -lm
 endif
 CC=gcc
 
diff --git gogoc-1_2-RELEASE/gogoc-tsp/platform/sunos/Makefile gogoc-1_2-RELEASE/gogoc-tsp/platform/sunos/Makefile
index 4908f94..e4111cb 100644
--- gogoc-1_2-RELEASE/gogoc-tsp/platform/sunos/Makefile
+++ gogoc-1_2-RELEASE/gogoc-tsp/platform/sunos/Makefile
@@ -13,11 +13,11 @@
 -include platform.mak
 
 ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
-LDFLAGS=-g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lsocket -lnsl -lcrypto -lpthread -lstdc++ -L/usr/sfw/lib -L/usr/local/ssl/lib
+CFLAGS += -g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+LDFLAGS += -g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lsocket -lnsl -lcrypto -lpthread -lstdc++ -L/usr/sfw/lib -L/usr/local/ssl/lib
 else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
-LDFLAGS=$(LD_LIB_PATHS) $(LD_LIBRARIES) -lsocket -lnsl -lcrypto -lpthread -lstdc++ -L/usr/sfw/lib -L/usr/local/ssl/lib
+CFLAGS += -O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+LDFLAGS += $(LD_LIB_PATHS) $(LD_LIBRARIES) -lsocket -lnsl -lcrypto -lpthread -lstdc++ -L/usr/sfw/lib -L/usr/local/ssl/lib
 endif
 CC=gcc
 
diff --git gogoc-1_2-RELEASE/gogoc-tsp/platform/unix-common/Makefile gogoc-1_2-RELEASE/gogoc-tsp/platform/unix-common/Makefile
index b88152b..9f999fd 100644
--- gogoc-1_2-RELEASE/gogoc-tsp/platform/unix-common/Makefile
+++ gogoc-1_2-RELEASE/gogoc-tsp/platform/unix-common/Makefile
@@ -13,9 +13,9 @@
 -include $(PLATFORM_DIR)/$(PLATFORM)/platform.mak
 
 ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -DDEBUG
+CFLAGS += -g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -DDEBUG
 else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS)
+CFLAGS += -O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS)
 endif
 CC=gcc
 
diff --git gogoc-1_2-RELEASE/gogoc-tsp/src/lib/Makefile gogoc-1_2-RELEASE/gogoc-tsp/src/lib/Makefile
index 7213cc5..2486866 100644
--- gogoc-1_2-RELEASE/gogoc-tsp/src/lib/Makefile
+++ gogoc-1_2-RELEASE/gogoc-tsp/src/lib/Makefile
@@ -14,9 +14,9 @@
 
 
 ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+CFLAGS += -g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
 else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+CFLAGS += -O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
 endif
 CC=gcc
 
diff --git gogoc-1_2-RELEASE/gogoc-tsp/src/net/Makefile gogoc-1_2-RELEASE/gogoc-tsp/src/net/Makefile
index 9b2dc42..82548c4 100644
--- gogoc-1_2-RELEASE/gogoc-tsp/src/net/Makefile
+++ gogoc-1_2-RELEASE/gogoc-tsp/src/net/Makefile
@@ -14,9 +14,9 @@
 
 
 ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+CFLAGS += -g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
 else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+CFLAGS += -O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
 endif
 CC=gcc
 
diff --git gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/Makefile gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/Makefile
index 4e378b6..9e75e01 100644
--- gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/Makefile
+++ gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/Makefile
@@ -14,9 +14,9 @@
 
 
 ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+CFLAGS += -g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
 else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+CFLAGS += -O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
 endif
 CC=gcc
 
diff --git gogoc-1_2-RELEASE/gogoc-tsp/src/xml/Makefile gogoc-1_2-RELEASE/gogoc-tsp/src/xml/Makefile
index 449fc90..40e6147 100644
--- gogoc-1_2-RELEASE/gogoc-tsp/src/xml/Makefile
+++ gogoc-1_2-RELEASE/gogoc-tsp/src/xml/Makefile
@@ -14,9 +14,9 @@
 
 
 ifdef DEBUG
-CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
+CFLAGS += -g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
 else
-CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
+CFLAGS += -O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
 endif
 CC=gcc