diff options
Diffstat (limited to 'libX11/nls/en_US.UTF-8')
| -rw-r--r-- | libX11/nls/en_US.UTF-8/Compose.pre | 205 | ||||
| -rw-r--r-- | libX11/nls/en_US.UTF-8/Makefile.in | 139 |
2 files changed, 330 insertions, 14 deletions
diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre index a4174bbe3..1edfdebb9 100644 --- a/libX11/nls/en_US.UTF-8/Compose.pre +++ b/libX11/nls/en_US.UTF-8/Compose.pre @@ -5164,3 +5164,208 @@ XCOMM <dead_ogonek> <dead_macron> <o> : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON <dead_tilde> <dead_macron> <O> : "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON <dead_tilde> <dead_macron> <o> : "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON + +XCOMM +XCOMM Cyrillic NFDs +XCOMM + +<dead_doublegrave> <Cyrillic_a> : "а̏" # CYRILLIC SMALL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT +<Multi_key> <grave> <grave> <Cyrillic_a> : "а̏" # CYRILLIC SMALL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT + +<dead_invertedbreve> <Cyrillic_a> : "а̑" # CYRILLIC SMALL LETTER A WITH COMBINING INVERTED BREVE + +<dead_grave> <Cyrillic_a> : "а̀" # CYRILLIC SMALL LETTER A WITH COMBINING GRAVE ACCENT +<Multi_key> <grave> <Cyrillic_a> : "а̀" # CYRILLIC SMALL LETTER A WITH COMBINING GRAVE ACCENT + +<dead_acute> <Cyrillic_a> : "а́" # CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT +<Multi_key> <acute> <Cyrillic_a> : "а́" # CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT +<Multi_key> <apostrophe> <Cyrillic_a> : "а́" # CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT + +<dead_macron> <Cyrillic_a> : "а̄" # CYRILLIC SMALL LETTER A WITH COMBINING MACRON +<Multi_key> <macron> <Cyrillic_a> : "а̄" # CYRILLIC SMALL LETTER A WITH COMBINING MACRON +<Multi_key> <underscore> <Cyrillic_a> : "а̄" # CYRILLIC SMALL LETTER A WITH COMBINING MACRON + +<dead_circumflex> <Cyrillic_a> : "а̂" # CYRILLIC SMALL LETTER A WITH COMBINING CIRCUMFLEX ACCENT +<Multi_key> <asciicircum> <Cyrillic_a> : "а̂" # CYRILLIC SMALL LETTER A WITH COMBINING CIRCUMFLEX ACCENT + +<dead_doublegrave> <Cyrillic_A> : "А̏" # CYRILLIC CAPITAL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT +<Multi_key> <grave> <grave> <Cyrillic_A> : "А̏" # CYRILLIC CAPITAL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT + +<dead_invertedbreve> <Cyrillic_A> : "А̑" # CYRILLIC CAPITAL LETTER A WITH COMBINING INVERTED BREVE + +<dead_grave> <Cyrillic_A> : "А̀" # CYRILLIC CAPITAL LETTER A WITH COMBINING GRAVE ACCENT +<Multi_key> <grave> <Cyrillic_A> : "А̀" # CYRILLIC CAPITAL LETTER A WITH COMBINING GRAVE ACCENT + +<dead_acute> <Cyrillic_A> : "А́" # CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT +<Multi_key> <acute> <Cyrillic_A> : "А́" # CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT +<Multi_key> <apostrophe> <Cyrillic_A> : "А́" # CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT + +<dead_macron> <Cyrillic_A> : "А̄" # CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON +<Multi_key> <macron> <Cyrillic_A> : "А̄" # CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON +<Multi_key> <underscore> <Cyrillic_A> : "А̄" # CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON + +<dead_circumflex> <Cyrillic_A> : "А̂" # CYRILLIC CAPITAL LETTER A WITH COMBINING CIRCUMFLEX ACCENT +<Multi_key> <asciicircum> <Cyrillic_A> : "А̂" # CYRILLIC CAPITAL LETTER A WITH COMBINING CIRCUMFLEX ACCENT + +<dead_doublegrave> <Cyrillic_ie> : "е̏" # CYRILLIC SMALL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT +<Multi_key> <grave> <grave> <Cyrillic_ie> : "е̏" # CYRILLIC SMALL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT + +<dead_invertedbreve> <Cyrillic_ie> : "е̑" # CYRILLIC SMALL LETTER IE WITH COMBINING INVERTED BREVE + +<dead_acute> <Cyrillic_ie> : "е́" # CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT +<Multi_key> <acute> <Cyrillic_ie> : "е́" # CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT +<Multi_key> <apostrophe> <Cyrillic_ie> : "е́" # CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT + +<dead_macron> <Cyrillic_ie> : "е̄" # CYRILLIC SMALL LETTER IE WITH COMBINING MACRON +<Multi_key> <macron> <Cyrillic_ie> : "е̄" # CYRILLIC SMALL LETTER IE WITH COMBINING MACRON +<Multi_key> <underscore> <Cyrillic_ie> : "е̄" # CYRILLIC SMALL LETTER IE WITH COMBINING MACRON + +<dead_circumflex> <Cyrillic_ie> : "е̂" # CYRILLIC SMALL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT +<Multi_key> <asciicircum> <Cyrillic_ie> : "е̂" # CYRILLIC SMALL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT + +<dead_doublegrave> <Cyrillic_IE> : "Е̏" # CYRILLIC CAPITAL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT +<Multi_key> <grave> <grave> <Cyrillic_IE> : "Е̏" # CYRILLIC CAPITAL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT + +<dead_invertedbreve> <Cyrillic_IE> : "Е̑" # CYRILLIC CAPITAL LETTER IE WITH COMBINING INVERTED BREVE + +<dead_acute> <Cyrillic_IE> : "Е́" # CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT +<Multi_key> <acute> <Cyrillic_IE> : "Е́" # CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT +<Multi_key> <apostrophe> <Cyrillic_IE> : "Е́" # CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT + +<dead_macron> <Cyrillic_IE> : "Е̄" # CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON +<Multi_key> <macron> <Cyrillic_IE> : "Е̄" # CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON +<Multi_key> <underscore> <Cyrillic_IE> : "Е̄" # CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON + +<dead_circumflex> <Cyrillic_IE> : "Е̂" # CYRILLIC CAPITAL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT +<Multi_key> <asciicircum> <Cyrillic_IE> : "Е̂" # CYRILLIC CAPITAL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT + +<dead_doublegrave> <Cyrillic_i> : "и̏" # CYRILLIC SMALL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT +<Multi_key> <grave> <grave> <Cyrillic_i> : "и̏" # CYRILLIC SMALL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT + +<dead_invertedbreve> <Cyrillic_i> : "и̑" # CYRILLIC SMALL LETTER I WITH COMBINING INVERTED BREVE + +<dead_acute> <Cyrillic_i> : "и́" # CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT +<Multi_key> <acute> <Cyrillic_i> : "и́" # CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT +<Multi_key> <apostrophe> <Cyrillic_i> : "и́" # CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT + +<dead_circumflex> <Cyrillic_i> : "и̂" # CYRILLIC SMALL LETTER I WITH COMBINING CIRCUMFLEX ACCENT +<Multi_key> <asciicircum> <Cyrillic_i> : "и̂" # CYRILLIC SMALL LETTER I WITH COMBINING CIRCUMFLEX ACCENT + +<dead_doublegrave> <Cyrillic_I> : "И̏" # CYRILLIC CAPITAL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT +<Multi_key> <grave> <grave> <Cyrillic_I> : "И̏" # CYRILLIC CAPITAL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT + +<dead_invertedbreve> <Cyrillic_I> : "И̑" # CYRILLIC CAPITAL LETTER I WITH COMBINING INVERTED BREVE + +<dead_acute> <Cyrillic_I> : "И́" # CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT +<Multi_key> <acute> <Cyrillic_I> : "И́" # CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT +<Multi_key> <apostrophe> <Cyrillic_I> : "И́" # CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT + +<dead_circumflex> <Cyrillic_I> : "И̂" # CYRILLIC CAPITAL LETTER I WITH COMBINING CIRCUMFLEX ACCENT +<Multi_key> <asciicircum> <Cyrillic_I> : "И̂" # CYRILLIC CAPITAL LETTER I WITH COMBINING CIRCUMFLEX ACCENT + +<dead_doublegrave> <Cyrillic_o> : "о̏" # CYRILLIC SMALL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT +<Multi_key> <grave> <grave> <Cyrillic_o> : "о̏" # CYRILLIC SMALL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT + +<dead_invertedbreve> <Cyrillic_o> : "о̑" # CYRILLIC SMALL LETTER O WITH COMBINING INVERTED BREVE + +<dead_grave> <Cyrillic_o> : "о̀" # CYRILLIC SMALL LETTER O WITH COMBINING GRAVE ACCENT +<Multi_key> <grave> <Cyrillic_o> : "о̀" # CYRILLIC SMALL LETTER O WITH COMBINING GRAVE ACCENT + +<dead_acute> <Cyrillic_o> : "о́" # CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT +<Multi_key> <acute> <Cyrillic_o> : "о́" # CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT +<Multi_key> <apostrophe> <Cyrillic_o> : "о́" # CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT + +<dead_macron> <Cyrillic_o> : "о̄" # CYRILLIC SMALL LETTER O WITH COMBINING MACRON +<Multi_key> <macron> <Cyrillic_o> : "о̄" # CYRILLIC SMALL LETTER O WITH COMBINING MACRON +<Multi_key> <underscore> <Cyrillic_o> : "о̄" # CYRILLIC SMALL LETTER O WITH COMBINING MACRON + +<dead_circumflex> <Cyrillic_o> : "о̂" # CYRILLIC SMALL LETTER O WITH COMBINING CIRCUMFLEX ACCENT +<Multi_key> <asciicircum> <Cyrillic_o> : "о̂" # CYRILLIC SMALL LETTER O WITH COMBINING CIRCUMFLEX ACCENT + +<dead_doublegrave> <Cyrillic_O> : "О̏" # CYRILLIC CAPITAL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT +<Multi_key> <grave> <grave> <Cyrillic_O> : "О̏" # CYRILLIC CAPITAL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT + +<dead_invertedbreve> <Cyrillic_O> : "О̑" # CYRILLIC CAPITAL LETTER O WITH COMBINING INVERTED BREVE + +<dead_grave> <Cyrillic_O> : "О̀" # CYRILLIC CAPITAL LETTER O WITH COMBINING GRAVE ACCENT +<Multi_key> <grave> <Cyrillic_O> : "О̀" # CYRILLIC CAPITAL LETTER O WITH COMBINING GRAVE ACCENT + +<dead_acute> <Cyrillic_O> : "О́" # CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT +<Multi_key> <acute> <Cyrillic_O> : "О́" # CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT +<Multi_key> <apostrophe> <Cyrillic_O> : "О́" # CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT + +<dead_macron> <Cyrillic_O> : "О̄" # CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON +<Multi_key> <macron> <Cyrillic_O> : "О̄" # CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON +<Multi_key> <underscore> <Cyrillic_O> : "О̄" # CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON + +<dead_circumflex> <Cyrillic_O> : "О̂" # CYRILLIC CAPITAL LETTER O WITH COMBINING CIRCUMFLEX ACCENT +<Multi_key> <asciicircum> <Cyrillic_O> : "О̂" # CYRILLIC CAPITAL LETTER O WITH COMBINING CIRCUMFLEX ACCENT + +<dead_doublegrave> <Cyrillic_u> : "у̏" # CYRILLIC SMALL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT +<Multi_key> <grave> <grave> <Cyrillic_u> : "у̏" # CYRILLIC SMALL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT + +<dead_invertedbreve> <Cyrillic_u> : "у̑" # CYRILLIC SMALL LETTER U WITH COMBINING INVERTED BREVE + +<dead_grave> <Cyrillic_u> : "у̀" # CYRILLIC SMALL LETTER U WITH COMBINING GRAVE ACCENT +<Multi_key> <grave> <Cyrillic_u> : "у̀" # CYRILLIC SMALL LETTER U WITH COMBINING GRAVE ACCENT + +<dead_acute> <Cyrillic_u> : "у́" # CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT +<Multi_key> <acute> <Cyrillic_u> : "у́" # CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT +<Multi_key> <apostrophe> <Cyrillic_u> : "у́" # CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT + +<dead_circumflex> <Cyrillic_u> : "у̂" # CYRILLIC SMALL LETTER U WITH COMBINING CIRCUMFLEX ACCENT +<Multi_key> <asciicircum> <Cyrillic_u> : "у̂" # CYRILLIC SMALL LETTER U WITH COMBINING CIRCUMFLEX ACCENT + +<dead_doublegrave> <Cyrillic_U> : "У̏" # CYRILLIC CAPITAL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT +<Multi_key> <grave> <grave> <Cyrillic_U> : "У̏" # CYRILLIC CAPITAL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT + +<dead_invertedbreve> <Cyrillic_U> : "У̑" # CYRILLIC CAPITAL LETTER U WITH COMBINING INVERTED BREVE + +<dead_grave> <Cyrillic_U> : "У̀" # CYRILLIC CAPITAL LETTER U WITH COMBINING GRAVE ACCENT +<Multi_key> <grave> <Cyrillic_U> : "У̀" # CYRILLIC CAPITAL LETTER U WITH COMBINING GRAVE ACCENT + +<dead_acute> <Cyrillic_U> : "У́" # CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT +<Multi_key> <acute> <Cyrillic_U> : "У́" # CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT +<Multi_key> <apostrophe> <Cyrillic_U> : "У́" # CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT + +<dead_circumflex> <Cyrillic_U> : "У̂" # CYRILLIC CAPITAL LETTER U WITH COMBINING CIRCUMFLEX ACCENT +<Multi_key> <asciicircum> <Cyrillic_U> : "У̂" # CYRILLIC CAPITAL LETTER U WITH COMBINING CIRCUMFLEX ACCENT + +<dead_doublegrave> <Cyrillic_er> : "р̏" # CYRILLIC SMALL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT +<Multi_key> <grave> <grave> <Cyrillic_er> : "р̏" # CYRILLIC SMALL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT + +<dead_invertedbreve> <Cyrillic_er> : "р̑" # CYRILLIC SMALL LETTER ER WITH COMBINING INVERTED BREVE + +<dead_grave> <Cyrillic_er> : "р̀" # CYRILLIC SMALL LETTER ER WITH COMBINING GRAVE ACCENT +<Multi_key> <grave> <Cyrillic_er> : "р̀" # CYRILLIC SMALL LETTER ER WITH COMBINING GRAVE ACCENT + +<dead_acute> <Cyrillic_er> : "р́" # CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT +<Multi_key> <acute> <Cyrillic_er> : "р́" # CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT +<Multi_key> <apostrophe> <Cyrillic_er> : "р́" # CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT + +<dead_macron> <Cyrillic_er> : "р̄" # CYRILLIC SMALL LETTER ER WITH COMBINING MACRON +<Multi_key> <macron> <Cyrillic_er> : "р̄" # CYRILLIC SMALL LETTER ER WITH COMBINING MACRON +<Multi_key> <underscore> <Cyrillic_er> : "р̄" # CYRILLIC SMALL LETTER ER WITH COMBINING MACRON + +<dead_circumflex> <Cyrillic_er> : "р̂" # CYRILLIC SMALL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT +<Multi_key> <asciicircum> <Cyrillic_er> : "р̂" # CYRILLIC SMALL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT + +<dead_doublegrave> <Cyrillic_ER> : "Р̏" # CYRILLIC CAPITAL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT +<Multi_key> <grave> <grave> <Cyrillic_ER> : "Р̏" # CYRILLIC CAPITAL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT + +<dead_invertedbreve> <Cyrillic_ER> : "Р̑" # CYRILLIC CAPITAL LETTER ER WITH COMBINING INVERTED BREVE + +<dead_grave> <Cyrillic_ER> : "Р̀" # CYRILLIC CAPITAL LETTER ER WITH COMBINING GRAVE ACCENT +<Multi_key> <grave> <Cyrillic_ER> : "Р̀" # CYRILLIC CAPITAL LETTER ER WITH COMBINING GRAVE ACCENT + +<dead_acute> <Cyrillic_ER> : "Р́" # CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT +<Multi_key> <acute> <Cyrillic_ER> : "Р́" # CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT +<Multi_key> <apostrophe> <Cyrillic_ER> : "Р́" # CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT + +<dead_macron> <Cyrillic_ER> : "Р̄" # CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON +<Multi_key> <macron> <Cyrillic_ER> : "Р̄" # CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON +<Multi_key> <underscore> <Cyrillic_ER> : "Р̄" # CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON + +<dead_circumflex> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT +<Multi_key> <asciicircum> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT + diff --git a/libX11/nls/en_US.UTF-8/Makefile.in b/libX11/nls/en_US.UTF-8/Makefile.in index 583ae36c4..6eca0a155 100644 --- a/libX11/nls/en_US.UTF-8/Makefile.in +++ b/libX11/nls/en_US.UTF-8/Makefile.in @@ -52,6 +52,12 @@ CONFIG_HEADER = $(top_builddir)/src/config.h \ $(top_builddir)/include/X11/XlibConf.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -78,11 +84,14 @@ am__base_list = \ am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \ "$(DESTDIR)$(x11thislocaledir)" DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA) +am__tty_colors = \ +red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ AR = @AR@ @@ -159,6 +168,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ @@ -265,10 +275,17 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \ -e '/\@\@$$/s/\@\@$$/\\/' + +# Support for automake 1.11 AM_SILENT_RULES +@HAVE_AM_SILENT_RULES_TRUE@cpp_verbose = $(cpp_verbose_$(V)) +@HAVE_AM_SILENT_RULES_TRUE@cpp_verbose_ = $(cpp_verbose_$(AM_DEFAULT_VERBOSITY)) +@HAVE_AM_SILENT_RULES_TRUE@cpp_verbose_0 = @echo " CPP " $@; EXTRA_DIST = XLC_LOCALE.pre Compose.pre dist_x11thislocale_DATA = XI18N_OBJS x11thislocale_DATA = XLC_LOCALE Compose CLEANFILES = XLC_LOCALE Compose +@HAVE_PERL_TRUE@TESTS_ENVIRONMENT = $(PERL) +@HAVE_PERL_TRUE@TESTS = $(top_srcdir)/nls/compose-check.pl all: all-am .SUFFIXES: @@ -356,6 +373,98 @@ ctags: CTAGS CTAGS: +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + col=$$red; res=XPASS; \ + ;; \ + *) \ + col=$$grn; res=PASS; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + col=$$lgn; res=XFAIL; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + col=$$red; res=FAIL; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + col=$$blu; res=SKIP; \ + fi; \ + echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ + All=""; \ + else \ + tests="tests"; \ + All="All "; \ + fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="$$All$$all $$tests passed"; \ + else \ + if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ + banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all $$tests failed"; \ + else \ + if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ + banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + if test "$$skip" -eq 1; then \ + skipped="($$skip test was not run)"; \ + else \ + skipped="($$skip tests were not run)"; \ + fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + if test "$$failed" -eq 0; then \ + echo "$$grn$$dashes"; \ + else \ + echo "$$red$$dashes"; \ + fi; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes$$std"; \ + test "$$failed" -eq 0; \ + else :; fi + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -387,6 +496,7 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile $(DATA) installdirs: @@ -487,24 +597,25 @@ ps-am: uninstall-am: uninstall-dist_x11thislocaleDATA \ uninstall-x11thislocaleDATA -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_x11thislocaleDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip install-x11thislocaleDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +.MAKE: check-am install-am install-strip + +.PHONY: all all-am check check-TESTS check-am clean clean-generic \ + clean-libtool distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am \ + install-dist_x11thislocaleDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + install-x11thislocaleDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am \ uninstall-dist_x11thislocaleDATA uninstall-x11thislocaleDATA .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. |