Make locale data build non-recursive / parallelizable

On a 4 core CPU with gmake -j 16 the nls subdir builds in half the time,
plus this simplifies the next set of changes.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: James Cloos <cloos@jhcloos.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>

64 files changed, 28 insertions, 256 deletions

diff --git a/configure.ac b/configure.ac
index 6631930b..cc406a00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ if test x"$LDFLAGS_FOR_BUILD" = x; then
 fi
 AC_SUBST(LDFLAGS_FOR_BUILD)
 
-# Find perl for "make check" tests in nls/localerules.in
+# Find perl for "make check" tests in nls/Makefile.am
 AC_ARG_WITH(perl,
 	AC_HELP_STRING([--with-perl=<path>],
 			[path to perl interpreter for build-time tests]),
@@ -462,66 +462,6 @@ AC_OUTPUT([Makefile
 	   modules/om/generic/Makefile
 	   src/xkb/Makefile
 	   nls/Makefile
-	   nls/am_ET.UTF-8/Makefile
-	   nls/armscii-8/Makefile
-	   nls/C/Makefile
-	   nls/el_GR.UTF-8/Makefile
-	   nls/en_US.UTF-8/Makefile
-	   nls/fi_FI.UTF-8/Makefile
-	   nls/georgian-academy/Makefile
-	   nls/georgian-ps/Makefile
-	   nls/ibm-cp1133/Makefile
-	   nls/iscii-dev/Makefile
-	   nls/isiri-3342/Makefile
-	   nls/iso8859-1/Makefile
-	   nls/iso8859-10/Makefile
-	   nls/iso8859-11/Makefile
-	   nls/iso8859-13/Makefile
-	   nls/iso8859-14/Makefile
-	   nls/iso8859-15/Makefile
-	   nls/iso8859-2/Makefile
-	   nls/iso8859-3/Makefile
-	   nls/iso8859-4/Makefile
-	   nls/iso8859-5/Makefile
-	   nls/iso8859-6/Makefile
-	   nls/iso8859-7/Makefile
-	   nls/iso8859-8/Makefile
-	   nls/iso8859-9/Makefile
-	   nls/iso8859-9e/Makefile
-	   nls/ja/Makefile
-	   nls/ja.JIS/Makefile
-	   nls/ja_JP.UTF-8/Makefile
-	   nls/ja.S90/Makefile
-	   nls/ja.SJIS/Makefile
-	   nls/ja.U90/Makefile
-	   nls/ko/Makefile
-	   nls/koi8-c/Makefile
-	   nls/koi8-r/Makefile
-	   nls/koi8-u/Makefile
-	   nls/ko_KR.UTF-8/Makefile
-	   nls/microsoft-cp1251/Makefile
-	   nls/microsoft-cp1255/Makefile
-	   nls/microsoft-cp1256/Makefile
-	   nls/mulelao-1/Makefile
-	   nls/nokhchi-1/Makefile
-	   nls/pt_BR.UTF-8/Makefile
-	   nls/ru_RU.UTF-8/Makefile
-	   nls/tatar-cyr/Makefile
-	   nls/th_TH/Makefile
-	   nls/th_TH.UTF-8/Makefile
-	   nls/tscii-0/Makefile
-	   nls/vi_VN.tcvn/Makefile
-	   nls/vi_VN.viscii/Makefile
-	   nls/zh_CN/Makefile
-	   nls/zh_CN.gb18030/Makefile
-	   nls/zh_CN.gbk/Makefile
-	   nls/zh_CN.UTF-8/Makefile
-	   nls/zh_HK.big5/Makefile
-	   nls/zh_HK.big5hkscs/Makefile
-	   nls/zh_HK.UTF-8/Makefile
-	   nls/zh_TW/Makefile
-	   nls/zh_TW.big5/Makefile
-	   nls/zh_TW.UTF-8/Makefile
 	   specs/Makefile
 	   specs/i18n/Makefile
 	   specs/i18n/framework/Makefile
diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am
deleted file mode 100644
index c4826e2e..00000000
--- a/nls/C/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/C
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/Makefile.am b/nls/Makefile.am
index 076bf31a..8247207a 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -11,7 +11,7 @@ CLEANFILES= \
 	locale.dir locale.dir.l1 locale.dir.l2 \
 	XLC_LOCALE
 
-SUBDIRS= \
+locales = \
 	am_ET.UTF-8		\
 	armscii-8		\
 	C			\
@@ -75,6 +75,8 @@ SUBDIRS= \
 
 include $(top_srcdir)/cpprules.in
 
+# Global data files
+
 locale.alias: locale.alias.pre
 	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1
 	sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \
@@ -92,3 +94,21 @@ locale.dir: locale.dir.pre
 	sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \
         < locale.dir.l1 > locale.dir.l2
 	cat locale.dir.l2 locale.dir.l1 > locale.dir
+
+# Per-locale data files
+
+nobase_dist_x11locale_DATA = $(locales:%=%/XI18N_OBJS)
+
+nobase_x11locale_DATA = $(locales:%=%/XLC_LOCALE) $(locales:%=%/Compose)
+EXTRA_DIST += $(nobase_x11locale_DATA:%=%.pre)
+CLEANFILES += $(nobase_x11locale_DATA)
+
+$(nobase_x11locale_DATA): builddirs
+
+builddirs:
+	$(MKDIR_P) $(locales)
+
+if HAVE_PERL
+TESTS_ENVIRONMENT = $(PERL)
+TESTS = $(srcdir)/compose-check.pl
+endif HAVE_PERL
diff --git a/nls/am_ET.UTF-8/Makefile.am b/nls/am_ET.UTF-8/Makefile.am
deleted file mode 100644
index a2904fbd..00000000
--- a/nls/am_ET.UTF-8/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/am_ET.UTF-8
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/armscii-8/Makefile.am b/nls/armscii-8/Makefile.am
deleted file mode 100644
index 45b00e74..00000000
--- a/nls/armscii-8/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/armscii-8
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/compose-check.pl b/nls/compose-check.pl
index 660d7544..399bfa99 100755
--- a/nls/compose-check.pl
+++ b/nls/compose-check.pl
@@ -34,10 +34,15 @@ use warnings;
 my $error_count = 0;
 
 if (scalar(@ARGV) == 0) {
-  push @ARGV, "Compose";
+  if ( -f 'Compose' ) {
+    push @ARGV, 'Compose';
+  } else {
+    push @ARGV, glob '*/Compose';
+  }
 }
 
 foreach my $cf (@ARGV) {
+  # print "Checking $cf\n";
   $error_count += check_compose_file($cf);
 }
 
diff --git a/nls/el_GR.UTF-8/Makefile.am b/nls/el_GR.UTF-8/Makefile.am
deleted file mode 100644
index 99aa8630..00000000
--- a/nls/el_GR.UTF-8/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/el_GR.UTF-8
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/en_US.UTF-8/Makefile.am b/nls/en_US.UTF-8/Makefile.am
deleted file mode 100644
index c364315a..00000000
--- a/nls/en_US.UTF-8/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/en_US.UTF-8
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/fi_FI.UTF-8/Makefile.am b/nls/fi_FI.UTF-8/Makefile.am
deleted file mode 100644
index 800e800e..00000000
--- a/nls/fi_FI.UTF-8/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/fi_FI.UTF-8
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/georgian-academy/Makefile.am b/nls/georgian-academy/Makefile.am
deleted file mode 100644
index a1340cf8..00000000
--- a/nls/georgian-academy/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/georgian-academy
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/georgian-ps/Makefile.am b/nls/georgian-ps/Makefile.am
deleted file mode 100644
index fc85c823..00000000
--- a/nls/georgian-ps/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/georgian-ps
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/ibm-cp1133/Makefile.am b/nls/ibm-cp1133/Makefile.am
deleted file mode 100644
index 5ecced23..00000000
--- a/nls/ibm-cp1133/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/ibm-cp1133
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iscii-dev/Makefile.am b/nls/iscii-dev/Makefile.am
deleted file mode 100644
index 21e31e23..00000000
--- a/nls/iscii-dev/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iscii-dev
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/isiri-3342/Makefile.am b/nls/isiri-3342/Makefile.am
deleted file mode 100644
index 103d9c9f..00000000
--- a/nls/isiri-3342/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/isiri-3342
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-1/Makefile.am b/nls/iso8859-1/Makefile.am
deleted file mode 100644
index e689716b..00000000
--- a/nls/iso8859-1/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-1
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-10/Makefile.am b/nls/iso8859-10/Makefile.am
deleted file mode 100644
index 871cdf16..00000000
--- a/nls/iso8859-10/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-10
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-11/Makefile.am b/nls/iso8859-11/Makefile.am
deleted file mode 100644
index 391c4c4e..00000000
--- a/nls/iso8859-11/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-11
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-13/Makefile.am b/nls/iso8859-13/Makefile.am
deleted file mode 100644
index 2635ce95..00000000
--- a/nls/iso8859-13/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-13
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-14/Makefile.am b/nls/iso8859-14/Makefile.am
deleted file mode 100644
index fa68e42f..00000000
--- a/nls/iso8859-14/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-14
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-15/Makefile.am b/nls/iso8859-15/Makefile.am
deleted file mode 100644
index f6f5fee9..00000000
--- a/nls/iso8859-15/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-15
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-2/Makefile.am b/nls/iso8859-2/Makefile.am
deleted file mode 100644
index 13e60532..00000000
--- a/nls/iso8859-2/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-2
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-3/Makefile.am b/nls/iso8859-3/Makefile.am
deleted file mode 100644
index f389d91d..00000000
--- a/nls/iso8859-3/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-3
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-4/Makefile.am b/nls/iso8859-4/Makefile.am
deleted file mode 100644
index 5e68d036..00000000
--- a/nls/iso8859-4/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-4
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-5/Makefile.am b/nls/iso8859-5/Makefile.am
deleted file mode 100644
index 574ce1eb..00000000
--- a/nls/iso8859-5/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-5
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-6/Makefile.am b/nls/iso8859-6/Makefile.am
deleted file mode 100644
index cfde9845..00000000
--- a/nls/iso8859-6/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-6
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-7/Makefile.am b/nls/iso8859-7/Makefile.am
deleted file mode 100644
index 6395d322..00000000
--- a/nls/iso8859-7/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-7
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-8/Makefile.am b/nls/iso8859-8/Makefile.am
deleted file mode 100644
index 351cfa4f..00000000
--- a/nls/iso8859-8/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-8
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-9/Makefile.am b/nls/iso8859-9/Makefile.am
deleted file mode 100644
index c46388f4..00000000
--- a/nls/iso8859-9/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-9
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/iso8859-9e/Makefile.am b/nls/iso8859-9e/Makefile.am
deleted file mode 100644
index 1f53628b..00000000
--- a/nls/iso8859-9e/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-9e
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/ja.JIS/Makefile.am b/nls/ja.JIS/Makefile.am
deleted file mode 100644
index bb5b1bb6..00000000
--- a/nls/ja.JIS/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/ja.JIS
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/ja.S90/Makefile.am b/nls/ja.S90/Makefile.am
deleted file mode 100644
index c4c843d6..00000000
--- a/nls/ja.S90/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/ja.S90
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/ja.SJIS/Makefile.am b/nls/ja.SJIS/Makefile.am
deleted file mode 100644
index 19f2b840..00000000
--- a/nls/ja.SJIS/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/ja.SJIS
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/ja.U90/Makefile.am b/nls/ja.U90/Makefile.am
deleted file mode 100644
index a98374ab..00000000
--- a/nls/ja.U90/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/ja.U90
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/ja/Makefile.am b/nls/ja/Makefile.am
deleted file mode 100644
index 47fbacc2..00000000
--- a/nls/ja/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/ja
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/ja_JP.UTF-8/Makefile.am b/nls/ja_JP.UTF-8/Makefile.am
deleted file mode 100644
index 8bdf5e42..00000000
--- a/nls/ja_JP.UTF-8/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/ja_JP.UTF-8
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/ko/Makefile.am b/nls/ko/Makefile.am
deleted file mode 100644
index 17e39a35..00000000
--- a/nls/ko/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/ko
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/ko_KR.UTF-8/Makefile.am b/nls/ko_KR.UTF-8/Makefile.am
deleted file mode 100644
index dc98b9d0..00000000
--- a/nls/ko_KR.UTF-8/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/ko_KR.UTF-8
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/koi8-c/Makefile.am b/nls/koi8-c/Makefile.am
deleted file mode 100644
index 88ae93fe..00000000
--- a/nls/koi8-c/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-c
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/koi8-r/Makefile.am b/nls/koi8-r/Makefile.am
deleted file mode 100644
index af5a2302..00000000
--- a/nls/koi8-r/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-r
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/koi8-u/Makefile.am b/nls/koi8-u/Makefile.am
deleted file mode 100644
index 92ead47a..00000000
--- a/nls/koi8-u/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-u
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/localerules.in b/nls/localerules.in
deleted file mode 100644
index 9fcf5438..00000000
--- a/nls/localerules.in
+++ /dev/null
@@ -1,13 +0,0 @@
-include $(top_srcdir)/cpprules.in
-
-EXTRA_DIST = XLC_LOCALE.pre Compose.pre
-
-dist_x11thislocale_DATA = XI18N_OBJS
-x11thislocale_DATA = XLC_LOCALE Compose
-
-CLEANFILES = XLC_LOCALE Compose
-
-if HAVE_PERL
-TESTS_ENVIRONMENT = $(PERL)
-TESTS = $(top_srcdir)/nls/compose-check.pl
-endif HAVE_PERL
diff --git a/nls/microsoft-cp1251/Makefile.am b/nls/microsoft-cp1251/Makefile.am
deleted file mode 100644
index 5842c904..00000000
--- a/nls/microsoft-cp1251/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1251
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/microsoft-cp1255/Makefile.am b/nls/microsoft-cp1255/Makefile.am
deleted file mode 100644
index d8b71228..00000000
--- a/nls/microsoft-cp1255/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1255
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/microsoft-cp1256/Makefile.am b/nls/microsoft-cp1256/Makefile.am
deleted file mode 100644
index c4250bda..00000000
--- a/nls/microsoft-cp1256/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1256
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/mulelao-1/Makefile.am b/nls/mulelao-1/Makefile.am
deleted file mode 100644
index 8d37d331..00000000
--- a/nls/mulelao-1/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/mulelao-1
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/nokhchi-1/Makefile.am b/nls/nokhchi-1/Makefile.am
deleted file mode 100644
index 5504ff3f..00000000
--- a/nls/nokhchi-1/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/nokhchi-1
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/pt_BR.UTF-8/Makefile.am b/nls/pt_BR.UTF-8/Makefile.am
deleted file mode 100644
index 18684798..00000000
--- a/nls/pt_BR.UTF-8/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/pt_BR.UTF-8
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/ru_RU.UTF-8/Makefile.am b/nls/ru_RU.UTF-8/Makefile.am
deleted file mode 100644
index f138e53d..00000000
--- a/nls/ru_RU.UTF-8/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/ru_RU.UTF-8
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/tatar-cyr/Makefile.am b/nls/tatar-cyr/Makefile.am
deleted file mode 100644
index 505956c7..00000000
--- a/nls/tatar-cyr/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/tatar-cyr
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/th_TH.UTF-8/Makefile.am b/nls/th_TH.UTF-8/Makefile.am
deleted file mode 100644
index ab216189..00000000
--- a/nls/th_TH.UTF-8/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/th_TH.UTF-8
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/th_TH/Makefile.am b/nls/th_TH/Makefile.am
deleted file mode 100644
index 39cbc233..00000000
--- a/nls/th_TH/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/th_TH
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/tscii-0/Makefile.am b/nls/tscii-0/Makefile.am
deleted file mode 100644
index f8aa71fb..00000000
--- a/nls/tscii-0/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/tscii-0
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/vi_VN.tcvn/Makefile.am b/nls/vi_VN.tcvn/Makefile.am
deleted file mode 100644
index ed94bd64..00000000
--- a/nls/vi_VN.tcvn/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/vi_VN.tcvn
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/vi_VN.viscii/Makefile.am b/nls/vi_VN.viscii/Makefile.am
deleted file mode 100644
index 1b2bc34b..00000000
--- a/nls/vi_VN.viscii/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/vi_VN.viscii
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/zh_CN.UTF-8/Makefile.am b/nls/zh_CN.UTF-8/Makefile.am
deleted file mode 100644
index 7dd4aba9..00000000
--- a/nls/zh_CN.UTF-8/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.UTF-8
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/zh_CN.gb18030/Makefile.am b/nls/zh_CN.gb18030/Makefile.am
deleted file mode 100644
index de647431..00000000
--- a/nls/zh_CN.gb18030/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.gb18030
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/zh_CN.gbk/Makefile.am b/nls/zh_CN.gbk/Makefile.am
deleted file mode 100644
index c4586656..00000000
--- a/nls/zh_CN.gbk/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.gbk
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/zh_CN/Makefile.am b/nls/zh_CN/Makefile.am
deleted file mode 100644
index e4c74e7b..00000000
--- a/nls/zh_CN/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/zh_HK.UTF-8/Makefile.am b/nls/zh_HK.UTF-8/Makefile.am
deleted file mode 100644
index 89d75307..00000000
--- a/nls/zh_HK.UTF-8/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.UTF-8
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/zh_HK.big5/Makefile.am b/nls/zh_HK.big5/Makefile.am
deleted file mode 100644
index b8229ddd..00000000
--- a/nls/zh_HK.big5/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.big5
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/zh_HK.big5hkscs/Makefile.am b/nls/zh_HK.big5hkscs/Makefile.am
deleted file mode 100644
index b4d5f83b..00000000
--- a/nls/zh_HK.big5hkscs/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.big5hkscs
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/zh_TW.UTF-8/Makefile.am b/nls/zh_TW.UTF-8/Makefile.am
deleted file mode 100644
index 12794176..00000000
--- a/nls/zh_TW.UTF-8/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW.UTF-8
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/zh_TW.big5/Makefile.am b/nls/zh_TW.big5/Makefile.am
deleted file mode 100644
index b8fbe546..00000000
--- a/nls/zh_TW.big5/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW.big5
-
-include $(top_srcdir)/nls/localerules.in
diff --git a/nls/zh_TW/Makefile.am b/nls/zh_TW/Makefile.am
deleted file mode 100644
index a847cc3b..00000000
--- a/nls/zh_TW/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW
-
-include $(top_srcdir)/nls/localerules.in