From 4debc545611edd35f8fd35a52f4adf4263e49200 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Tue, 16 Feb 2010 10:37:21 -0500 Subject: 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 --- configure.ac | 3 --- src/Makefile.am | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index f8ef5e9..8aaa9d2 100644 --- a/configure.ac +++ b/configure.ac @@ -22,9 +22,6 @@ AC_PROG_SED # Checks for pkg-config packages PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.2.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 1.9.99.902]) -XI_CFLAGS="$CWARNFLAGS $XI_CFLAGS" -AC_SUBST(XI_CFLAGS) -AC_SUBST(XI_LIBS) # Check for xmlto and asciidoc for man page conversion # (only needed by people building tarballs) diff --git a/src/Makefile.am b/src/Makefile.am index 4cc772f..76b10e2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -68,7 +68,8 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/include/X11 \ -I$(top_srcdir)/include/X11/extensions \ $(XI_CFLAGS) \ - $(MALLOC_ZERO_CFLAGS) + $(MALLOC_ZERO_CFLAGS) \ + $(CWARNFLAGS) libXi_la_LDFLAGS = -version-number 6:1:0 -no-undefined -- cgit v1.2.3