Set xorg-macros CFLAGS correctly

A previous commit messed up all warning flags. Oops.

Signed-off-by: Ran Benita <ran234@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 6f37998..6aa5b8e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,15 +18,16 @@ ChangeLog:
 dist-hook: ChangeLog INSTALL
 
 AM_CPPFLAGS = \
+       -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/xkbcomp \
        -Isrc/xkbcomp
+
 AM_CFLAGS = \
-       $(X11_CFLAGS) \
-       $(XORG_COMPILER_FLAGS) \
-       $(XMALLOC_ZERO_CFLAGS) \
-       -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"'
+       $(BASE_CFLAGS) \
+       $(XMALLOC_ZERO_CFLAGS)
+
 AM_YFLAGS = -d
 
 xkbcommonincludedir = $(includedir)/xkbcommon

diff --git a/configure.ac b/configure.ac
index f4eefdc..0cf7e50 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,6 @@ if test "x$CC_FOR_BUILD" = x; then
     fi
 fi
 
-CFLAGS="$CFLAGS $BASE_CFLAGS"
 if test "x$GCC" = xyes ; then
     CFLAGS="$CFLAGS -fvisibility=hidden"
 fi