Mesa (master): glx: Use AM_CPPFLAGS to pass -I and -D to both C and C++ compiles.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Apr 16 14:33:34 2012 -0700

glx: Use AM_CPPFLAGS to pass -I and -D to both C and C++ compiles.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Adam Jackson <ajax at redhat.com>

---

 tests/glx/Makefile.am |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/glx/Makefile.am b/tests/glx/Makefile.am
index f5581d6..7f93fd7 100644
--- a/tests/glx/Makefile.am
+++ b/tests/glx/Makefile.am
@@ -1,10 +1,8 @@
-INC = \
+AM_CPPFLAGS = \
 	-I$(top_builddir)/src/gtest/include \
 	-I$(top_builddir)/src/mapi \
-	-I$(top_builddir)/src/glx
-
-AM_CFLAGS = $(INC) $(X11_CFLAGS)
-AM_CXXFLAGS = $(INC) $(X11_CFLAGS)
+	-I$(top_builddir)/src/glx \
+	$(X11_CFLAGS)
 
 if HAVE_XCB_GLX_CREATE_CONTEXT
 TESTS = glx_unittest