From 26686c98bac306ee4e6502850e2dc8afbe4a496a Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 16 Jun 2011 08:06:24 +0200
Subject: xserver xkeyboard-config xkbcomp git update 16 June 2011

---
 xkbcomp/Makefile.am | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'xkbcomp/Makefile.am')

diff --git a/xkbcomp/Makefile.am b/xkbcomp/Makefile.am
index 9a41b8873..d0e991df3 100644
--- a/xkbcomp/Makefile.am
+++ b/xkbcomp/Makefile.am
@@ -22,7 +22,8 @@
 SUBDIRS = man
 bin_PROGRAMS = xkbcomp
 
-AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' $(CWARNFLAGS)
+AM_CPPFLAGS = -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"'
+AM_CFLAGS = $(XKBCOMP_CFLAGS) $(CWARNFLAGS)
 xkbcomp_LDADD = $(XKBCOMP_LIBS)
 
 xkbcomp_SOURCES = \
@@ -59,10 +60,7 @@ xkbcomp_SOURCES = \
         xkbpath.h \
         xkbscan.c
 
-
-BUILT_SOURCES = xkbparse.c
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-MAINTAINERCLEANFILES += $(BUILT_SOURCES)
 
 .PHONY: ChangeLog INSTALL
 
-- 
cgit v1.2.3