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
commit00e9520738c8660451cdf21e5a3b530924855822 (patch)
tree62443488c6b84bafd900d5db6b3fa207dd22dce1
parent0b90e128718f269be334b9e60aa5b50604b1dc8c (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.am3
2 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 38ada5e..3d6bcb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,9 +41,6 @@ AC_PROG_LIBTOOL
# Check for dependencies
PKG_CHECK_MODULES(XSCRNSAVER, x11 xext xextproto [scrnsaverproto >= 1.2])
-XSCRNSAVER_CFLAGS="$CWARNFLAGS $XSCRNSAVER_CFLAGS"
-AC_SUBST(XSCRNSAVER_CFLAGS)
-AC_SUBST(XSCRNSAVER_LIBS)
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
diff --git a/src/Makefile.am b/src/Makefile.am
index b0498be..aa923b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,8 @@ AM_CFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_srcdir)/include/X11/extensions \
$(XSCRNSAVER_CFLAGS) \
- $(MALLOC_ZERO_CFLAGS)
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
lib_LTLIBRARIES = libXss.la