From dc14f85015ed4f8ad1dd9456f3daa59d1b0edddf Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Thu, 11 Feb 2010 10:08:06 -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 <memsize@videotron.ca>
---
 Makefile.am  | 2 +-
 configure.ac | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 47a2aaf..7125e9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = ico
 
-AM_CFLAGS = $(ICO_CFLAGS)
+AM_CFLAGS = $(ICO_CFLAGS)  $(CWARNFLAGS)
 ico_LDADD = $(ICO_LIBS) $(XTHREADLIB) -lm
 
 ico_SOURCES =	\
diff --git a/configure.ac b/configure.ac
index ef679cf..38e0928 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,6 @@ AC_PROG_INSTALL
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(ICO, x11 >= 0.99.1)
-ICO_CFLAGS="$CWARNFLAGS $ICO_CFLAGS"
 AC_SUBST(ICO_CFLAGS)
 AC_SUBST(ICO_LIBS)
 XTHREADLIB=`$PKG_CONFIG --variable=xthreadlib x11`
-- 
cgit v1.2.3