From 518debb3bc0db2cb8036144ddfc22b81cfbb6f83 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Sun, 8 Apr 2012 15:38:04 +0300 Subject: [PATCH] Set xorg-macros CFLAGS correctly A previous commit messed up all warning flags. Oops. Signed-off-by: Ran Benita --- Makefile.am | 9 +++++---- configure.ac | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) 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 -- 2.7.4