Compiler warning flags should be explicitly set in the makefile rather than being merged with other packages compiler flags.
Signed-off-by: Gaetan Nadon <[email protected]> --- configure.ac | 4 +--- modules/im/ximcp/Makefile.am | 3 ++- modules/lc/Utf8/Makefile.am | 3 ++- modules/lc/def/Makefile.am | 3 ++- modules/lc/gen/Makefile.am | 3 ++- modules/lc/xlocale/Makefile.am | 3 ++- modules/om/generic/Makefile.am | 3 ++- src/Makefile.am | 3 ++- src/util/Makefile.am | 4 +++- src/xcms/Makefile.am | 3 ++- src/xkb/Makefile.am | 3 ++- src/xlibi18n/Makefile.am | 3 ++- 12 files changed, 24 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 6c4a3c6..f359822 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/modules/im/ximcp/Makefile.am b/modules/im/ximcp/Makefile.am index 0dc8dfb..3c84ed5 100644 --- a/modules/im/ximcp/Makefile.am +++ b/modules/im/ximcp/Makefile.am @@ -12,7 +12,8 @@ AM_CFLAGS= \ $(X11_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ - $(MALLOC_ZERO_CFLAGS) + $(MALLOC_ZERO_CFLAGS) \ + $(CWARNFLAGS) if XLIB_LOADABLE_I18N diff --git a/modules/lc/Utf8/Makefile.am b/modules/lc/Utf8/Makefile.am index 422b5dc..ea5e255 100644 --- a/modules/lc/Utf8/Makefile.am +++ b/modules/lc/Utf8/Makefile.am @@ -12,7 +12,8 @@ AM_CFLAGS= \ $(X11_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ - $(MALLOC_ZERO_CFLAGS) + $(MALLOC_ZERO_CFLAGS) \ + $(CWARNFLAGS) if XLIB_LOADABLE_I18N diff --git a/modules/lc/def/Makefile.am b/modules/lc/def/Makefile.am index fab191e..578e62c 100644 --- a/modules/lc/def/Makefile.am +++ b/modules/lc/def/Makefile.am @@ -11,7 +11,8 @@ AM_CPPFLAGS= \ AM_CFLAGS= \ $(X11_CFLAGS) \ $(BIGFONT_CFLAGS) \ - $(XDMCP_CFLAGS) + $(XDMCP_CFLAGS) \ + $(CWARNFLAGS) if XLIB_LOADABLE_I18N diff --git a/modules/lc/gen/Makefile.am b/modules/lc/gen/Makefile.am index be64972..a365be6 100644 --- a/modules/lc/gen/Makefile.am +++ b/modules/lc/gen/Makefile.am @@ -11,7 +11,8 @@ AM_CPPFLAGS= \ AM_CFLAGS= \ $(X11_CFLAGS) \ $(BIGFONT_CFLAGS) \ - $(XDMCP_CFLAGS) + $(XDMCP_CFLAGS) \ + $(CWARNFLAGS) if XLIB_LOADABLE_I18N diff --git a/modules/lc/xlocale/Makefile.am b/modules/lc/xlocale/Makefile.am index d48d2e9..13020f0 100644 --- a/modules/lc/xlocale/Makefile.am +++ b/modules/lc/xlocale/Makefile.am @@ -11,7 +11,8 @@ AM_CPPFLAGS= \ AM_CFLAGS= \ $(X11_CFLAGS) \ $(BIGFONT_CFLAGS) \ - $(XDMCP_CFLAGS) + $(XDMCP_CFLAGS) \ + $(CWARNFLAGS) if XLIB_LOADABLE_I18N diff --git a/modules/om/generic/Makefile.am b/modules/om/generic/Makefile.am index f153b8b..5a7d927 100644 --- a/modules/om/generic/Makefile.am +++ b/modules/om/generic/Makefile.am @@ -13,7 +13,8 @@ AM_CFLAGS= \ $(X11_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ - $(MALLOC_ZERO_CFLAGS) + $(MALLOC_ZERO_CFLAGS) \ + $(CWARNFLAGS) if XLIB_LOADABLE_I18N diff --git a/src/Makefile.am b/src/Makefile.am index c2aa8bb..256e6f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,8 @@ AM_CFLAGS= \ $(X11_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ - $(XMALLOC_ZERO_CFLAGS) + $(XMALLOC_ZERO_CFLAGS) \ + $(CWARNFLAGS) # # =============================== I18N ============================= diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 7fc8da5..644d6b6 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -1,7 +1,9 @@ noinst_PROGRAMS=makekeys -makekeys_CFLAGS=$(X11_CFLAGS) +makekeys_CFLAGS = \ + $(X11_CFLAGS) \ + $(CWARNFLAGS) CC = @CC_FOR_BUILD@ diff --git a/src/xcms/Makefile.am b/src/xcms/Makefile.am index 1f1b51d..c01612c 100644 --- a/src/xcms/Makefile.am +++ b/src/xcms/Makefile.am @@ -15,7 +15,8 @@ AM_CFLAGS= \ $(X11_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ - $(XMALLOC_ZERO_CFLAGS) + $(XMALLOC_ZERO_CFLAGS) \ + $(CWARNFLAGS) libxcms_la_SOURCES = \ AddDIC.c \ diff --git a/src/xkb/Makefile.am b/src/xkb/Makefile.am index 0141836..f69694e 100644 --- a/src/xkb/Makefile.am +++ b/src/xkb/Makefile.am @@ -12,7 +12,8 @@ AM_CFLAGS= \ $(X11_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ - $(XMALLOC_ZERO_CFLAGS) + $(XMALLOC_ZERO_CFLAGS) \ + $(CWARNFLAGS) noinst_LTLIBRARIES = libxkb.la diff --git a/src/xlibi18n/Makefile.am b/src/xlibi18n/Makefile.am index fa5a1c0..9a27a13 100644 --- a/src/xlibi18n/Makefile.am +++ b/src/xlibi18n/Makefile.am @@ -13,7 +13,8 @@ AM_CFLAGS= \ $(X11_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ - $(XMALLOC_ZERO_CFLAGS) + $(XMALLOC_ZERO_CFLAGS) \ + $(CWARNFLAGS) noinst_LTLIBRARIES = libi18n.la -- 1.6.0.4 _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
