Mesa (master): autoconf: don't use CFLAGS for cpp files

[Kenneth Graunke]

Module: Mesa
Branch: master
Commit: f3a828c21fcb95c67868f0224ab4ec92f54eee7f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f3a828c21fcb95c67868f0224ab4ec92f54eee7f

Author: Tobias Droste <tdroste at gmx.de>
Date:   Wed Mar 16 18:45:29 2011 +0100

autoconf: don't use CFLAGS for cpp files

Signed-off-by: Tobias Droste <tdroste at gmx.de>

---

 src/glsl/Makefile |    2 +-
 src/mesa/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index cd7c41a..e4b992d 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -204,7 +204,7 @@ glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
 	bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<
 
 builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o
-	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@
+	$(APP_CXX) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@
 
 builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler
 	@echo Regenerating builtin_function.cpp...
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 10d73f0..03962e9 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -43,7 +43,7 @@ endef
 
 define mesa-cxx-c
 	@mkdir -p $(dir $@)
-	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) $($(1)_CXXFLAGS)
+	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CXXFLAGS)
 endef
 
 $(MESA_OBJ_DIR)/%.o: %.c