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 10:37:21 -0500
commit09d61dc024d9846525e4c97d33cdf03c9f06c151 (patch)
treeb154755a5fcd5486770cd25412c27f71fdc5f546
parent72b8a2d39a57eb0640929b9bb9f276c6032f8213 (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--configure.ac3
-rw-r--r--src/Makefile.am6
2 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index d88f605..002597b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,9 +25,6 @@ AC_PROG_CC
# Checks for pkg-config packages
PKG_CHECK_MODULES(ICE, xproto)
-ICE_CFLAGS="$CWARNFLAGS $ICE_CFLAGS"
-AC_SUBST(ICE_CFLAGS)
-AC_SUBST(ICE_LIBS)
PKG_CHECK_MODULES(XTRANS, xtrans)
AC_SUBST(XTRANS_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 449aeaf..621a82d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,10 @@
lib_LTLIBRARIES=libICE.la
-AM_CFLAGS= -I${top_srcdir}/include $(ICE_CFLAGS) $(XTRANS_CFLAGS) \
+AM_CFLAGS = \
+ -I${top_srcdir}/include \
+ $(ICE_CFLAGS) \
+ $(XTRANS_CFLAGS) \
+ $(CWARNFLAGS) \
-DICE_t -DTRANS_CLIENT -DTRANS_SERVER
libICE_la_LDFLAGS = -version-number 6:3:0 -no-undefined