summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-02-11 10:08:06 -0500
committerGaetan Nadon <memsize@videotron.ca>2010-02-11 10:08:06 -0500
commitdc14f85015ed4f8ad1dd9456f3daa59d1b0edddf (patch)
treeb04c74e8b5041ceb141bf8cf9c4d216beb03da8c
parent1decffa0f6fad067770c5b4de5a112993951f099 (diff)
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--Makefile.am2
-rw-r--r--configure.ac1
2 files changed, 1 insertions, 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`