[Mesa-dev] [PATCH] autoconf: don't use CFLAGS for cpp files

[Kenneth Graunke]

On Wednesday, March 16, 2011 10:45:29 AM Tobias Droste wrote:
> 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

Looks good.  Pushed - thanks!