Move CWARNFLAGS addition to CFLAGS from configure.ac to Makefile.am

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

diff --git a/Makefile.am b/Makefile.am
index 5f3bb9b..eceac0e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,7 @@ bin_PROGRAMS = xdpyinfo
 
 AM_CFLAGS = \
        $(XDPYINFO_CFLAGS) \
+       $(CWARNFLAGS) \
        $(DPY_XEXT_CFLAGS) \
        $(DPY_XKB_CFLAGS) \
        $(DPY_XF86VIDMODE_CFLAGS) \

diff --git a/configure.ac b/configure.ac
index 2b8bb5c..69a7118 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,6 @@ XORG_CWARNFLAGS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XDPYINFO, xext x11 xtst)
-XDPYINFO_CFLAGS="$CWARNFLAGS $XDPYINFO_CFLAGS"
 AC_SUBST(XDPYINFO_CFLAGS)
 AC_SUBST(XDPYINFO_LIBS)