Commit 518debb3bc0db2cb8036144ddfc22b81cfbb6f83
2012-04-08T15:38:04
Set xorg-macros CFLAGS correctly A previous commit messed up all warning flags. Oops. Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
diff --git a/Makefile.am b/Makefile.am
index 6f37998..6aa5b8e 100644
--- 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
--- 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