config: move CWARNFLAGS from configure.ac to Makefile.am

Compiler warning flags should be explicitly set in the makefile
rather than being merged with other packages compiler flags.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

diff --git a/configure.ac b/configure.ac
index 375745e..d1c8c37 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -41,9 +41,6 @@ AC_PROG_LIBTOOL
 
 # Check for dependencies
 PKG_CHECK_MODULES(XTST, x11 [xext >= 1.0.99.4] xi [recordproto >= 1.13.99.1] [xextproto >= 7.0.99.3] inputproto)
-XTST_CFLAGS="$CWARNFLAGS $XTST_CFLAGS"
-AC_SUBST(XTST_CFLAGS)
-AC_SUBST(XTST_LIBS)
 
 # Determine if the source for man pages is available
 # It may already be present (tarball) or can be generated using xmlto

diff --git a/src/Makefile.am b/src/Makefile.am
index a2f3db0..1091ece 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,10 +6,11 @@ libXtst_la_SOURCES = \
 
 libXtst_la_LIBADD = @XTST_LIBS@
 
-AM_CFLAGS=\
-          -I$(top_srcdir)/include \
-          -I$(top_srcdir)/include/X11/extensions\
-          @XTST_CFLAGS@
+AM_CFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/include/X11/extensions \
+       $(XTST_CFLAGS) \
+       $(CWARNFLAGS)
 
 libXtst_la_LDFLAGS = -version-number 6:1:0 -no-undefined