Commit b5797597 authored by Gaetan Nadon's avatar Gaetan Nadon

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.
Reviewed-by: Dan Nicholson's avatarDan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon's avatarGaetan Nadon <memsize@videotron.ca>
parent 052c4d79
......@@ -389,9 +389,7 @@ AC_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
AC_SUBST(X11_LIBDIR)
PKG_CHECK_MODULES(X11, [$X11_REQUIRES])
X11_CFLAGS="$CWARNFLAGS $X11_CFLAGS $XTHREAD_CFLAGS"
AC_SUBST(X11_CFLAGS)
AC_SUBST(X11_LIBS)
X11_CFLAGS="$X11_CFLAGS $XTHREAD_CFLAGS"
#
# Yes, it would be nice to put the locale data in
......
......@@ -12,7 +12,8 @@ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
$(MALLOC_ZERO_CFLAGS)
$(MALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
if XLIB_LOADABLE_I18N
......
......@@ -12,7 +12,8 @@ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
$(MALLOC_ZERO_CFLAGS)
$(MALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
if XLIB_LOADABLE_I18N
......
......@@ -11,7 +11,8 @@ AM_CPPFLAGS= \
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS)
$(XDMCP_CFLAGS) \
$(CWARNFLAGS)
if XLIB_LOADABLE_I18N
......
......@@ -11,7 +11,8 @@ AM_CPPFLAGS= \
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS)
$(XDMCP_CFLAGS) \
$(CWARNFLAGS)
if XLIB_LOADABLE_I18N
......
......@@ -11,7 +11,8 @@ AM_CPPFLAGS= \
AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS)
$(XDMCP_CFLAGS) \
$(CWARNFLAGS)
if XLIB_LOADABLE_I18N
......
......@@ -13,7 +13,8 @@ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
$(MALLOC_ZERO_CFLAGS)
$(MALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
if XLIB_LOADABLE_I18N
......
......@@ -22,7 +22,8 @@ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
$(XMALLOC_ZERO_CFLAGS)
$(XMALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
#
# =============================== I18N =============================
......
noinst_PROGRAMS=makekeys
makekeys_CFLAGS=$(X11_CFLAGS)
makekeys_CFLAGS = \
$(X11_CFLAGS) \
$(CWARNFLAGS)
CC = @CC_FOR_BUILD@
......
......@@ -15,7 +15,8 @@ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
$(XMALLOC_ZERO_CFLAGS)
$(XMALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
libxcms_la_SOURCES = \
AddDIC.c \
......
......@@ -12,7 +12,8 @@ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
$(XMALLOC_ZERO_CFLAGS)
$(XMALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
noinst_LTLIBRARIES = libxkb.la
......
......@@ -13,7 +13,8 @@ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
$(XMALLOC_ZERO_CFLAGS)
$(XMALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
noinst_LTLIBRARIES = libi18n.la
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment