2003-10-19  Adam Fedor  <fedor@gnu.org>

	* Treat CFLAGS like LDFLAGS passed into configure.
	* common.make (INTERNAL_CFLAGS): Don't add CFLAGS
	* library-combo (SYSTEM_CFLAGS): New, add CFLAGS.
	* rules.make (ALL_OBJCFLAGS, ALL_CFLAGS): Add SYSTEM_CFLAGS

Index: common.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/common.make,v
retrieving revision 1.136
diff -u -r1.136 common.make
--- common.make	15 Oct 2003 02:52:56 -0000	1.136
+++ common.make	20 Oct 2003 03:54:33 -0000
@@ -444,7 +444,7 @@
 
 INTERNAL_OBJCFLAGS += $(ADDITIONAL_FLAGS) $(OPTFLAG) $(OBJCFLAGS) \
 			$(RUNTIME_FLAG)
-INTERNAL_CFLAGS += $(ADDITIONAL_FLAGS) $(CFLAGS) $(OPTFLAG)
+INTERNAL_CFLAGS += $(ADDITIONAL_FLAGS) $(OPTFLAG)
 
 # trick needed to replace a space with nothing
 empty:=
Index: library-combo.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/library-combo.make,v
retrieving revision 1.10
diff -u -r1.10 library-combo.make
--- library-combo.make	10 Oct 2003 02:52:45 -0000	1.10
+++ library-combo.make	20 Oct 2003 03:54:36 -0000
@@ -216,6 +216,7 @@
 endif
 
 SYSTEM_INCLUDES = $(CONFIG_SYSTEM_INCL)
+SYSTEM_CFLAGS = $(CFLAGS)
 SYSTEM_LDFLAGS = $(LDFLAGS)
 SYSTEM_LIB_DIR = $(CONFIG_SYSTEM_LIB_DIR)
 SYSTEM_LIBS =
Index: rules.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/rules.make,v
retrieving revision 1.158
diff -u -r1.158 rules.make
--- rules.make	19 Oct 2003 14:23:14 -0000	1.158
+++ rules.make	20 Oct 2003 03:54:36 -0000
@@ -231,7 +231,7 @@
 ALL_CPPFLAGS = $(AUTO_DEPENDENCIES_FLAGS) $(CPPFLAGS) $(ADDITIONAL_CPPFLAGS) \
                $(AUXILIARY_CPPFLAGS)
 
-ALL_OBJCFLAGS = $(INTERNAL_OBJCFLAGS) $(ADDITIONAL_OBJCFLAGS) \
+ALL_OBJCFLAGS = $(INTERNAL_OBJCFLAGS) $(SYSTEM_CFLAGS) $(ADDITIONAL_OBJCFLAGS) \
    $(AUXILIARY_OBJCFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \
    $(AUXILIARY_INCLUDE_DIRS) \
    $(DERIVED_SOURCES_HEADERS_FLAG) \
@@ -239,7 +239,7 @@
    $(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
    $(GNUSTEP_HEADERS_FLAGS)
 
-ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \
+ALL_CFLAGS = $(INTERNAL_CFLAGS) $(SYSTEM_CFLAGS) $(ADDITIONAL_CFLAGS) \
    $(AUXILIARY_CFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \
    $(AUXILIARY_INCLUDE_DIRS) \
    $(DERIVED_SOURCES_HEADERS_FLAG) \
