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
commit787b998d2eebf7825cf8c03fe1864bf8d410ee18 (patch)
tree77a525c313ec5cac653d78189c66c69e76b5c9c9
parent5686a8163364a7dac59454c5db93a1a746b67c42 (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 5841974..8f0b7c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = fonttosfnt
-AM_CFLAGS = -DXVENDORNAME=\"X.Org\ Foundation\" $(FONTTOSFNT_CFLAGS) -DXVENDORNAMESHORT=\"X.Org\" -D_BSD_SOURCE -D_GNU_SOURCE
+AM_CFLAGS = -DXVENDORNAME=\"X.Org\ Foundation\" $(FONTTOSFNT_CFLAGS) -DXVENDORNAMESHORT=\"X.Org\" -D_BSD_SOURCE -D_GNU_SOURCE $(CWARNFLAGS)
fonttosfnt_LDADD = $(FONTTOSFNT_LIBS) -lm
fonttosfnt_SOURCES = \
diff --git a/configure.ac b/configure.ac
index c1bd70f..5365333 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,6 @@ AM_CONDITIONAL(NEED_SETENV, [test x$have_setenv = xno])
# Checks for pkg-config packages
PKG_CHECK_MODULES(FONTTOSFNT, xproto freetype2 fontenc)
-FONTTOSFNT_CFLAGS="$CWARNFLAGS $FONTTOSFNT_CFLAGS"
AC_SUBST(FONTTOSFNT_CFLAGS)
AC_SUBST(FONTTOSFNT_LIBS)