From a8b1449bca44bfddd2e7228bb7d514512e4ef30c 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 7a69ecf..43dcd6a 100644 --- a/configure.ac +++ b/configure.ac @@ -40,9 +40,6 @@ AC_PROG_LIBTOOL # Check for dependencies PKG_CHECK_MODULES(DMX, x11 xext xextproto [dmxproto >= 2.2.99.1]) -DMX_CFLAGS="$CWARNFLAGS $DMX_CFLAGS" -AC_SUBST(DMX_CFLAGS) -AC_SUBST(DMX_LIBS) XORG_CHECK_MALLOC_ZERO diff --git a/src/Makefile.am b/src/Makefile.am index 434c56f..95f7908 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,8 @@ AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/include/X11 \ -I$(top_srcdir)/include/X11/extensions \ $(DMX_CFLAGS) \ - $(MALLOC_ZERO_CFLAGS) + $(MALLOC_ZERO_CFLAGS) \ + $(CWARNFLAGS) libdmxincludedir = $(includedir)/X11/extensions libdmxinclude_HEADERS = $(top_srcdir)/include/X11/extensions/dmxext.h -- cgit v1.2.1