From 40da3b03204b877c2c98eae65ada44ebd9518a46 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 16 Apr 2012 14:33:34 -0700
Subject: [PATCH] glx: Use AM_CPPFLAGS to pass -I and -D to both C and C++
 compiles.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
---
 tests/glx/Makefile.am | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/glx/Makefile.am b/tests/glx/Makefile.am
index f5581d638cc..7f93fd74de8 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
-- 
2.30.2