From 845a0ac68b02148db6f2cca81debf20b2331607b Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon, 4 Jul 2005 23:11:20 +0000
Subject: [PATCH] Revert last changes. They have to be addressed in a different
 way

---
 ChangeLog       | 7 +++++++
 fb/Makefile.am  | 3 ++-
 mi/Makefile.am  | 2 +-
 xkb/Makefile.am | 2 --
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d436fc7bc..fbc1581a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-05  Alexander Gottwald  <ago@freedesktop.org>
+
+	* fb/Makefile.am:
+	* mi/Makefile.am:
+	* xkb/Makefile.am:
+	Revert last changes. They have to be addressed in a different way
+
 2005-07-05  Alexander Gottwald  <ago@freedesktop.org>
 
 	* configure.ac:
diff --git a/fb/Makefile.am b/fb/Makefile.am
index 43d5674c3..4f82f6db4 100644
--- a/fb/Makefile.am
+++ b/fb/Makefile.am
@@ -16,7 +16,6 @@ libfb_la_SOURCES = 	\
 	fbbstore.c	\
 	fbcompose.c	\
 	fbcopy.c	\
-	fbcmap.c	\
 	fbfill.c	\
 	fbfillrect.c	\
 	fbfillsp.c	\
@@ -48,3 +47,5 @@ libfb_la_SOURCES = 	\
 	fbedgeimp.h	\
 	fbmmx.c		\
 	fbmmx.h
+
+EXTRA_DIST = fbcmap.c
diff --git a/mi/Makefile.am b/mi/Makefile.am
index 4ee67f301..ff1fec605 100644
--- a/mi/Makefile.am
+++ b/mi/Makefile.am
@@ -68,6 +68,6 @@ libminimi_la_SOURCES = 	\
 	mizerclip.c	\
 	mizerline.c
 
-libmi_la_SOURCES = $(libminimi_la_SOURCES) miinitext.c
+libmi_la_SOURCES = $(libminimi_la_SOURCES)
 
 INCLUDES = -I$(top_srcdir)/mfb
diff --git a/xkb/Makefile.am b/xkb/Makefile.am
index d51566734..d4142b6df 100644
--- a/xkb/Makefile.am
+++ b/xkb/Makefile.am
@@ -51,5 +51,3 @@ libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) $(XKBFILE_SRCS) \
                     $(X11_SRCS)
 
 EXTRA_DIST = xkb.h xkbDflts.h
-
-INCLUDES = -I$(top_srcdir)/Xext/extmod