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
commitd2d6e4d88b62aa84e2cc9d229adf32ede81cbf5c (patch)
treed24d760226d345ea93859fd9860e892a608544d2
parentb3807dccab5aee5455137654647c9c083addb31e (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 b16a7e6..c8be520 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,9 +51,6 @@ AC_CHECK_LIB(z, gzclose)
# Check for dependencies
PKG_CHECK_MODULES(FONTENC, xproto)
-FONTENC_CFLAGS="$CWARNFLAGS $FONTENC_CFLAGS"
-AC_SUBST(FONTENC_CFLAGS)
-AC_SUBST(FONTENC_LIBS)
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
diff --git a/src/Makefile.am b/src/Makefile.am
index 8cd0911..97111ee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,9 @@ libfontenc_la_SOURCES = \
fontenc.c \
fontencI.h
-AM_CFLAGS = @FONTENC_CFLAGS@
+AM_CFLAGS = \
+ $(FONTENC_CFLAGS) \
+ $(CWARNFLAGS)
FONTENCDIR=@ENCODINGSDIR@
FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\"