[PATCH xorg-gtest 3/5] Define automake CPP warning flags in Makefile.am, not configure.ac

[Chase Douglas]

Otherwise, AM_CPPFLAGS could not be overridden in Makefile.am.

Also, move AM_CXXFLAGS to the top of src/Makefile.am to match.

Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
---
 configure.ac    |    2 +-
 src/Makefile.am |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index e6f94df..3178a3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ AC_SUBST(DUMMY_CONF_PATH, "$datadir/xorg/gtest/dummy.conf")
 AC_CONFIG_FILES([Makefile
                  xorg-gtest.pc])
                 
-AC_SUBST(AM_CPPFLAGS, "-Wall -Werror")
+AC_SUBST(WARNING_CPPFLAGS, "-Wall -Werror")
 
 AC_CONFIG_FILES([data/Makefile
                  doc/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 0790745..acea1ff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,6 +25,10 @@
 
 lib_LTLIBRARIES = libxorg-gtest.la libxorg-gtest_main.la
 
+AM_CPPFLAGS = $(WARNING_FLAGS)
+
+AM_CXXFLAGS = -I$(top_srcdir)/include $(XSERVER_CFLAGS) $(BASE_CXXFLAGS)
+
 libxorg_gtest_la_SOURCES = \
 	environment.cpp \
 	process.cpp \
@@ -50,6 +54,4 @@ libxorg_gtest_main_la_LDFLAGS = \
 	$(XSERVER_LIBS) \
 	-Wl,--version-script=$(top_srcdir)/src/libxorg-gtest_main.ver
 
-AM_CXXFLAGS = -I$(top_srcdir)/include $(XSERVER_CFLAGS) $(BASE_CXXFLAGS)
-
 EXTRA_DIST = libxorg-gtest.ver libxorg-gtest_main.ver
-- 
1.7.9