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
commit43b50ccdd50511aad7bdd1869b294813550f7741 (patch)
tree329395156d1dd1732419095db317312980afc2f6
parente528b336ce5aa66aa720fd94df4618f40a85b818 (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.am4
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 37e89f9..d287890 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,9 +39,6 @@ AC_PROG_LIBTOOL
# Check for dependencies
PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto [xineramaproto >= 1.1.99.1])
-XINERAMA_CFLAGS="$CWARNFLAGS $XINERAMA_CFLAGS"
-AC_SUBST(XINERAMA_CFLAGS)
-AC_SUBST(XINERAMA_LIBS)
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
diff --git a/src/Makefile.am b/src/Makefile.am
index 3efc111..c362ef1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,9 @@ AM_CFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_srcdir)/include/X11/extensions \
$(XINERAMA_CFLAGS) \
- $(MALLOC_ZERO_CFLAGS)
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
+
lib_LTLIBRARIES = libXinerama.la
libXinerama_la_SOURCES = \