libX11 22/9/2010

1 files changed, 149 insertions, 94 deletions

diff --git a/libX11/nls/Makefile.am b/libX11/nls/Makefile.am
index 076bf31ad..4c7f57797 100644
--- a/libX11/nls/Makefile.am
+++ b/libX11/nls/Makefile.am
@@ -1,94 +1,149 @@
-x11localedir = $(X11_LOCALEDATADIR)
-
-EXTRA_DIST = locale.alias.pre compose.dir.pre locale.dir.pre \
-	compose-check.pl
-
-x11locale_DATA = locale.alias locale.dir compose.dir
-
-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 \
-	XLC_LOCALE
-
-SUBDIRS= \
-	am_ET.UTF-8		\
-	armscii-8		\
-	C			\
-	el_GR.UTF-8		\
-	en_US.UTF-8		\
-	fi_FI.UTF-8		\
-	georgian-academy	\
-	georgian-ps		\
-	ibm-cp1133		\
-	iscii-dev		\
-	isiri-3342		\
-	iso8859-1		\
-	iso8859-10		\
-	iso8859-11		\
-	iso8859-13		\
-	iso8859-14		\
-	iso8859-15		\
-	iso8859-2		\
-	iso8859-3		\
-	iso8859-4		\
-	iso8859-5		\
-	iso8859-6		\
-	iso8859-7		\
-	iso8859-8		\
-	iso8859-9		\
-	iso8859-9e		\
-	ja			\
-	ja.JIS			\
-	ja_JP.UTF-8		\
-	ja.S90			\
-	ja.SJIS			\
-	ja.U90			\
-	ko			\
-	koi8-c			\
-	koi8-r			\
-	koi8-u			\
-	ko_KR.UTF-8		\
-	microsoft-cp1251	\
-	microsoft-cp1255	\
-	microsoft-cp1256	\
-	mulelao-1		\
-	nokhchi-1		\
-	pt_BR.UTF-8		\
-	ru_RU.UTF-8		\
-	tatar-cyr		\
-	th_TH			\
-	th_TH.UTF-8		\
-	tscii-0			\
-	vi_VN.tcvn		\
-	vi_VN.viscii		\
-	zh_CN			\
-	zh_CN.gb18030		\
-	zh_CN.gbk		\
-	zh_CN.UTF-8		\
-	zh_HK.big5		\
-	zh_HK.big5hkscs		\
-	zh_HK.UTF-8		\
-	zh_TW			\
-	zh_TW.big5		\
-	zh_TW.UTF-8
-
-include $(top_srcdir)/cpprules.in
-
-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' \
-        < locale.alias.l1 > locale.alias.l2
-	cat locale.alias.l2 locale.alias.l1 > locale.alias
-
-compose.dir: compose.dir.pre
-	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1
-	sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \
-        < compose.dir.l1 > compose.dir.l2
-	cat compose.dir.l2 compose.dir.l1 > compose.dir
-
-locale.dir: locale.dir.pre
-	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1
-	sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \
-        < locale.dir.l1 > locale.dir.l2
-	cat locale.dir.l2 locale.dir.l1 > locale.dir
+x11localedir = $(X11_LOCALEDATADIR)

+specdir = $(docdir)/Compose

+

+include $(top_srcdir)/specs/xmlrules.in

+

+EXTRA_DIST = locale.alias.pre compose.dir.pre locale.dir.pre \

+	compose-check.pl compose-chart.pl

+

+x11locale_DATA = locale.alias locale.dir compose.dir

+

+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 \

+	XLC_LOCALE

+

+locales = \

+	am_ET.UTF-8		\

+	armscii-8		\

+	C			\

+	el_GR.UTF-8		\

+	en_US.UTF-8		\

+	fi_FI.UTF-8		\

+	georgian-academy	\

+	georgian-ps		\

+	ibm-cp1133		\

+	iscii-dev		\

+	isiri-3342		\

+	iso8859-1		\

+	iso8859-10		\

+	iso8859-11		\

+	iso8859-13		\

+	iso8859-14		\

+	iso8859-15		\

+	iso8859-2		\

+	iso8859-3		\

+	iso8859-4		\

+	iso8859-5		\

+	iso8859-6		\

+	iso8859-7		\

+	iso8859-8		\

+	iso8859-9		\

+	iso8859-9e		\

+	ja			\

+	ja.JIS			\

+	ja_JP.UTF-8		\

+	ja.S90			\

+	ja.SJIS			\

+	ja.U90			\

+	ko			\

+	koi8-c			\

+	koi8-r			\

+	koi8-u			\

+	ko_KR.UTF-8		\

+	microsoft-cp1251	\

+	microsoft-cp1255	\

+	microsoft-cp1256	\

+	mulelao-1		\

+	nokhchi-1		\

+	pt_BR.UTF-8		\

+	ru_RU.UTF-8		\

+	tatar-cyr		\

+	th_TH			\

+	th_TH.UTF-8		\

+	tscii-0			\

+	vi_VN.tcvn		\

+	vi_VN.viscii		\

+	zh_CN			\

+	zh_CN.gb18030		\

+	zh_CN.gbk		\

+	zh_CN.UTF-8		\

+	zh_HK.big5		\

+	zh_HK.big5hkscs		\

+	zh_HK.UTF-8		\

+	zh_TW			\

+	zh_TW.big5		\

+	zh_TW.UTF-8

+

+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' \

+        < locale.alias.l1 > locale.alias.l2

+	cat locale.alias.l2 locale.alias.l1 > locale.alias

+

+compose.dir: compose.dir.pre

+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1

+	sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \

+        < compose.dir.l1 > compose.dir.l2

+	cat compose.dir.l2 compose.dir.l1 > compose.dir

+

+locale.dir: locale.dir.pre

+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1

+	sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \

+        < locale.dir.l1 > locale.dir.l2

+	cat locale.dir.l2 locale.dir.l1 > locale.dir

+

+if HAVE_PERL

+doc_sources = Compose/index.xml

+

+Compose/index.xml: Compose

+	$(AM_V_GEN)$(PERL) $(srcdir)/compose-chart.pl \

+	 --index --output="$@" $(locales)

+

+Compose:

+	$(MKDIR_P) $@

+

+clean-local: clean-Compose-dir

+clean-Compose-dir:

+	-rm -rf Compose

+endif HAVE_PERL

+

+

+# 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

+

+COMPOSE_CHARTS = $(locales:%=%/Compose.xml)

+doc_sources += $(locales:%=Compose/%.xml)

+CLEANFILES += $(COMPOSE_CHARTS) $(doc_sources)

+

+XMLTO_FLAGS += -o $(@D)

+

+%/Compose.xml: %/Compose

+	$(AM_V_GEN)$(PERL) $(srcdir)/compose-chart.pl \

+	 --locale="$(@D)" --output="$@" $<

+

+Compose/%.xml: %/Compose.xml

+	$(AM_V_GEN)cp $< $@

+

+$(doc_sources): Compose

+

+endif HAVE_PERL