summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-02-16 10:37:21 -0500
committerGaetan Nadon <memsize@videotron.ca>2010-02-16 12:24:49 -0500
commitd6b098f463d185e5ed1b45013bd2600c124b7a3a (patch)
treebb889a9fbca5b235bcb9463cb73aa0337b224a21
parenta125ac058be77d81c1806420a7fd1df3b19a6bf4 (diff)
downloadxorg-lib-libXtst-d6b098f463d185e5ed1b45013bd2600c124b7a3a.tar.gz
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>
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile.am9
2 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 375745e..d1c8c37 100644
--- 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
--- 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