From 91ed79852e790049ab54e68f288afb3c953194c9 Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Fri, 7 Oct 2005 15:00:00 +0000
Subject: [PATCH] Clean up generated files Add missing dist tarball files

---
 ChangeLog                | 10 ++++++++++
 nls/Makefile.am          |  2 +-
 nls/localerules.in       |  2 +-
 src/bigreqstr.h          |  1 -
 src/util/Makefile.am     |  4 +++-
 src/xlibi18n/Makefile.am |  5 +++++
 6 files changed, 20 insertions(+), 4 deletions(-)
 delete mode 100644 src/bigreqstr.h

diff --git a/ChangeLog b/ChangeLog
index 48a816eb..8afa5090 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-07  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* nls/Makefile.am:
+	* nls/localerules.in:
+	Clean up generated files
+
+	* src/util/Makefile.am:
+	* src/xlibi18n/Makefile.am:
+	Add missing dist tarball files
+
 2005-09-30  Daniel Stone  <daniel@fooishbar.org>
 
 	* nls/Makefile.am:
diff --git a/nls/Makefile.am b/nls/Makefile.am
index 805b7c87..d8e83bf0 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -4,7 +4,7 @@ EXTRA_DIST = locale.alias.pre compose.dir.pre locale.dir.pre
 
 x11locale_DATA = locale.alias locale.dir compose.dir
 
-DISTCLEANFILES= \
+CLEANFILES= \
 	locale.alias locale.alias.l1 locale.alias.l2 \
 	compose.dir compose.dir.l1 compose.dir.l2 \
 	locale.dir locale.dir.l1 locale.dir.l2 \
diff --git a/nls/localerules.in b/nls/localerules.in
index 75bd3f41..6dfc7704 100644
--- a/nls/localerules.in
+++ b/nls/localerules.in
@@ -5,4 +5,4 @@ EXTRA_DIST = XLC_LOCALE.pre Compose.pre
 dist_x11thislocale_DATA = XI18N_OBJS
 x11thislocale_DATA = XLC_LOCALE Compose
 
-DISTCLEANFILES = XLC_LOCALE Compose
+CLEANFILES = XLC_LOCALE Compose
diff --git a/src/bigreqstr.h b/src/bigreqstr.h
deleted file mode 100644
index dc333095..00000000
--- a/src/bigreqstr.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <X11/extensions/bigreqstr.h>
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 999b04d4..b4160500 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,4 +1,4 @@
-# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.2 2005-05-21 04:26:12 alanc Exp $
+# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.3 2005-10-07 15:00:01 kem Exp $
 
 noinst_PROGRAMS=makekeys
 
@@ -6,3 +6,5 @@ makekeys_CFLAGS=$(X11_CFLAGS) $(BIGREQS_CFLAGS)
 
 #override CC = gcc
 LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+
+EXTRA_DIST = mkks.sh
diff --git a/src/xlibi18n/Makefile.am b/src/xlibi18n/Makefile.am
index ce090ead..7abb8ef6 100644
--- a/src/xlibi18n/Makefile.am
+++ b/src/xlibi18n/Makefile.am
@@ -129,3 +129,8 @@ libi18n_la_SOURCES = \
 	lcUniConv/utf8.h\
 	lcUniConv/viscii.h
 
+EXTRA_DIST = \
+	lcUniConv/README \
+	lcUniConv/COPYRIGHT \
+	lcUniConv/8bit_tab_to_h.c \
+	lcUniConv/cjk_tab_to_h.c