Imported Upstream version 0.9.6upstream/0.9.6

1 files changed, 7677 insertions, 2410 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 09832816..ea30f88c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,12 +14,24 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
 #
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
@@ -28,10 +39,64 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -46,25 +111,34 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.gnulib $(srcdir)/Makefile.in
 TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
-	test-c-ctype$(EXEEXT) test-c-strcase.sh test-environ$(EXEEXT) \
-	test-errno$(EXEEXT) test-frexpl-nolibm$(EXEEXT) \
-	test-fseterr$(EXEEXT) test-iconv-h$(EXEEXT) \
-	test-iconv$(EXEEXT) test-isnand-nolibm$(EXEEXT) \
-	test-isnanf-nolibm$(EXEEXT) test-isnanl-nolibm$(EXEEXT) \
-	test-locale$(EXEEXT) test-localename$(EXEEXT) \
-	test-lock$(EXEEXT) test-malloca$(EXEEXT) test-math$(EXEEXT) \
-	test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
-	test-mbrtowc4.sh test-mbsinit.sh test-memchr$(EXEEXT) \
+	test-btowc1.sh test-btowc2.sh test-c-ctype$(EXEEXT) \
+	test-c-strcase.sh test-environ$(EXEEXT) test-errno$(EXEEXT) \
+	test-fdopen$(EXEEXT) test-fgetc$(EXEEXT) test-float$(EXEEXT) \
+	test-fputc$(EXEEXT) test-fread$(EXEEXT) \
+	test-frexp-nolibm$(EXEEXT) test-frexpl-nolibm$(EXEEXT) \
+	test-fseterr$(EXEEXT) test-fwrite$(EXEEXT) \
+	test-iconv-h$(EXEEXT) test-iconv$(EXEEXT) \
+	test-intprops$(EXEEXT) test-inttypes$(EXEEXT) \
+	test-isnand-nolibm$(EXEEXT) test-isnanf-nolibm$(EXEEXT) \
+	test-isnanl-nolibm$(EXEEXT) test-iswblank$(EXEEXT) \
+	test-langinfo$(EXEEXT) test-locale$(EXEEXT) \
+	test-localename$(EXEEXT) test-lock$(EXEEXT) \
+	test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc1.sh \
+	test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
+	test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \
+	test-mbrtowc-w32-3.sh test-mbrtowc-w32-4.sh \
+	test-mbrtowc-w32-5.sh test-mbsinit.sh test-memchr$(EXEEXT) \
 	test-printf-frexp$(EXEEXT) test-printf-frexpl$(EXEEXT) \
-	test-setenv$(EXEEXT) test-signbit$(EXEEXT) \
+	test-setenv$(EXEEXT) test-setlocale1.sh test-setlocale2.sh \
+	test-signbit$(EXEEXT) test-stdalign$(EXEEXT) \
 	test-stdbool$(EXEEXT) test-stddef$(EXEEXT) \
-	test-stdint$(EXEEXT) test-stdlib$(EXEEXT) \
+	test-stdint$(EXEEXT) test-stdio$(EXEEXT) test-stdlib$(EXEEXT) \
 	test-strerror$(EXEEXT) test-striconveh$(EXEEXT) \
 	test-striconveha$(EXEEXT) test-string$(EXEEXT) \
-	test-strncat$(EXEEXT) test-cased$(EXEEXT) \
+	test-strncat$(EXEEXT) test-strstr$(EXEEXT) \
+	test-sys_types$(EXEEXT) test-init.sh test-thread_self$(EXEEXT) \
+	test-thread_create$(EXEEXT) test-cased$(EXEEXT) \
 	test-ignorable$(EXEEXT) unicase/test-locale-language.sh \
 	test-uc_tolower$(EXEEXT) test-uc_totitle$(EXEEXT) \
 	test-uc_toupper$(EXEEXT) test-u16-casecmp$(EXEEXT) \
@@ -95,13 +169,14 @@ TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
 	test-u8-conv-from-enc$(EXEEXT) test-u8-conv-to-enc$(EXEEXT) \
 	test-u8-strconv-from-enc$(EXEEXT) \
 	test-u8-strconv-to-enc$(EXEEXT) test-bidi_byname$(EXEEXT) \
-	test-bidi_name$(EXEEXT) test-bidi_of$(EXEEXT) \
-	test-bidi_test$(EXEEXT) test-block_list$(EXEEXT) \
-	test-block_of$(EXEEXT) test-block_test$(EXEEXT) \
-	test-categ_C$(EXEEXT) test-categ_Cc$(EXEEXT) \
-	test-categ_Cf$(EXEEXT) test-categ_Cn$(EXEEXT) \
-	test-categ_Co$(EXEEXT) test-categ_Cs$(EXEEXT) \
-	test-categ_L$(EXEEXT) test-categ_Ll$(EXEEXT) \
+	test-bidi_longname$(EXEEXT) test-bidi_name$(EXEEXT) \
+	test-bidi_of$(EXEEXT) test-bidi_test$(EXEEXT) \
+	test-block_list$(EXEEXT) test-block_of$(EXEEXT) \
+	test-block_test$(EXEEXT) test-categ_C$(EXEEXT) \
+	test-categ_Cc$(EXEEXT) test-categ_Cf$(EXEEXT) \
+	test-categ_Cn$(EXEEXT) test-categ_Co$(EXEEXT) \
+	test-categ_Cs$(EXEEXT) test-categ_L$(EXEEXT) \
+	test-categ_LC$(EXEEXT) test-categ_Ll$(EXEEXT) \
 	test-categ_Lm$(EXEEXT) test-categ_Lo$(EXEEXT) \
 	test-categ_Lt$(EXEEXT) test-categ_Lu$(EXEEXT) \
 	test-categ_M$(EXEEXT) test-categ_Mc$(EXEEXT) \
@@ -118,9 +193,12 @@ TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
 	test-categ_Zl$(EXEEXT) test-categ_Zp$(EXEEXT) \
 	test-categ_Zs$(EXEEXT) test-categ_and_not$(EXEEXT) \
 	test-categ_and$(EXEEXT) test-categ_byname$(EXEEXT) \
-	test-categ_name$(EXEEXT) $(am__EXEEXT_1) \
-	test-categ_of$(EXEEXT) test-categ_or$(EXEEXT) \
-	test-categ_test_withtable$(EXEEXT) test-combining$(EXEEXT) \
+	test-categ_longname$(EXEEXT) test-categ_name$(EXEEXT) \
+	$(am__EXEEXT_1) test-categ_of$(EXEEXT) test-categ_or$(EXEEXT) \
+	test-categ_test_withtable$(EXEEXT) \
+	test-combiningclass_byname$(EXEEXT) \
+	test-combiningclass_longname$(EXEEXT) \
+	test-combiningclass_name$(EXEEXT) test-combiningclass$(EXEEXT) \
 	test-ctype_alnum$(EXEEXT) test-ctype_alpha$(EXEEXT) \
 	test-ctype_blank$(EXEEXT) test-ctype_cntrl$(EXEEXT) \
 	test-ctype_digit$(EXEEXT) test-ctype_graph$(EXEEXT) \
@@ -128,6 +206,11 @@ TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
 	test-ctype_punct$(EXEEXT) test-ctype_space$(EXEEXT) \
 	test-ctype_upper$(EXEEXT) test-ctype_xdigit$(EXEEXT) \
 	test-decdigit$(EXEEXT) test-digit$(EXEEXT) \
+	test-joininggroup_byname$(EXEEXT) \
+	test-joininggroup_name$(EXEEXT) test-joininggroup_of$(EXEEXT) \
+	test-joiningtype_byname$(EXEEXT) \
+	test-joiningtype_longname$(EXEEXT) \
+	test-joiningtype_name$(EXEEXT) test-joiningtype_of$(EXEEXT) \
 	test-mirror$(EXEEXT) test-numeric$(EXEEXT) \
 	test-pr_alphabetic$(EXEEXT) test-pr_ascii_hex_digit$(EXEEXT) \
 	test-pr_bidi_arabic_digit$(EXEEXT) \
@@ -146,6 +229,12 @@ TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
 	test-pr_bidi_other_neutral$(EXEEXT) test-pr_bidi_pdf$(EXEEXT) \
 	test-pr_bidi_segment_separator$(EXEEXT) \
 	test-pr_bidi_whitespace$(EXEEXT) test-pr_byname$(EXEEXT) \
+	test-pr_case_ignorable$(EXEEXT) test-pr_cased$(EXEEXT) \
+	test-pr_changes_when_casefolded$(EXEEXT) \
+	test-pr_changes_when_casemapped$(EXEEXT) \
+	test-pr_changes_when_lowercased$(EXEEXT) \
+	test-pr_changes_when_titlecased$(EXEEXT) \
+	test-pr_changes_when_uppercased$(EXEEXT) \
 	test-pr_combining$(EXEEXT) test-pr_composite$(EXEEXT) \
 	test-pr_currency_symbol$(EXEEXT) test-pr_dash$(EXEEXT) \
 	test-pr_decimal_digit$(EXEEXT) \
@@ -190,6 +279,17 @@ TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
 	test-scripts$(EXEEXT) test-sy_c_ident$(EXEEXT) \
 	test-sy_c_whitespace$(EXEEXT) test-sy_java_ident$(EXEEXT) \
 	test-sy_java_whitespace$(EXEEXT) \
+	test-u16-grapheme-breaks$(EXEEXT) \
+	test-u16-grapheme-next$(EXEEXT) \
+	test-u16-grapheme-prev$(EXEEXT) \
+	test-u32-grapheme-breaks$(EXEEXT) \
+	test-u32-grapheme-next$(EXEEXT) \
+	test-u32-grapheme-prev$(EXEEXT) \
+	test-u8-grapheme-breaks$(EXEEXT) \
+	test-u8-grapheme-next$(EXEEXT) test-u8-grapheme-prev$(EXEEXT) \
+	test-uc-gbrk-prop$(EXEEXT) \
+	unigbrk/test-uc-is-grapheme-break.sh \
+	unigbrk/test-ulc-grapheme-breaks.sh \
 	test-u16-possible-linebreaks$(EXEEXT) \
 	test-u16-width-linebreaks$(EXEEXT) \
 	test-u32-possible-linebreaks$(EXEEXT) \
@@ -197,7 +297,7 @@ TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
 	test-u8-possible-linebreaks$(EXEEXT) \
 	test-u8-width-linebreaks$(EXEEXT) \
 	test-ulc-possible-linebreaks$(EXEEXT) \
-	test-ulc-width-linebreaks$(EXEEXT) uniname/test-uninames.sh \
+	test-ulc-width-linebreaks$(EXEEXT) $(am__append_3) \
 	test-canonical-decomposition$(EXEEXT) \
 	test-compat-decomposition$(EXEEXT) test-composition$(EXEEXT) \
 	test-decomposing-form$(EXEEXT) test-decomposition$(EXEEXT) \
@@ -234,28 +334,31 @@ TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
 	test-u16-next$(EXEEXT) test-u16-prev$(EXEEXT) \
 	test-u16-set$(EXEEXT) test-u16-stpcpy$(EXEEXT) \
 	test-u16-stpncpy$(EXEEXT) test-u16-strcat$(EXEEXT) \
-	test-u16-strcmp$(EXEEXT) test-u16-strcoll$(EXEEXT) \
-	test-u16-strcpy$(EXEEXT) test-u16-strdup$(EXEEXT) \
-	test-u16-strlen$(EXEEXT) test-u16-strmblen$(EXEEXT) \
-	test-u16-strmbtouc$(EXEEXT) test-u16-strncat$(EXEEXT) \
-	test-u16-strncmp$(EXEEXT) test-u16-strncpy$(EXEEXT) \
-	test-u16-strnlen$(EXEEXT) test-u16-to-u32$(EXEEXT) \
-	test-u16-to-u8$(EXEEXT) test-u16-uctomb$(EXEEXT) \
-	test-u32-check$(EXEEXT) test-u32-chr$(EXEEXT) \
-	test-u32-cmp$(EXEEXT) test-u32-cmp2$(EXEEXT) \
-	test-u32-cpy-alloc$(EXEEXT) test-u32-cpy$(EXEEXT) \
-	test-u32-mblen$(EXEEXT) test-u32-mbsnlen$(EXEEXT) \
-	test-u32-mbtouc$(EXEEXT) test-u32-mbtouc-unsafe$(EXEEXT) \
-	test-u32-mbtoucr$(EXEEXT) test-u32-move$(EXEEXT) \
-	test-u32-next$(EXEEXT) test-u32-prev$(EXEEXT) \
-	test-u32-set$(EXEEXT) test-u32-stpcpy$(EXEEXT) \
-	test-u32-stpncpy$(EXEEXT) test-u32-strcat$(EXEEXT) \
+	test-u16-strchr$(EXEEXT) test-u16-strcmp$(EXEEXT) \
+	test-u16-strcoll$(EXEEXT) test-u16-strcpy$(EXEEXT) \
+	test-u16-strdup$(EXEEXT) test-u16-strlen$(EXEEXT) \
+	test-u16-strmblen$(EXEEXT) test-u16-strmbtouc$(EXEEXT) \
+	test-u16-strncat$(EXEEXT) test-u16-strncmp$(EXEEXT) \
+	test-u16-strncpy$(EXEEXT) test-u16-strnlen$(EXEEXT) \
+	test-u16-strstr$(EXEEXT) test-u16-strtok$(EXEEXT) \
+	test-u16-to-u32$(EXEEXT) test-u16-to-u8$(EXEEXT) \
+	test-u16-uctomb$(EXEEXT) test-u32-check$(EXEEXT) \
+	test-u32-chr$(EXEEXT) test-u32-cmp$(EXEEXT) \
+	test-u32-cmp2$(EXEEXT) test-u32-cpy-alloc$(EXEEXT) \
+	test-u32-cpy$(EXEEXT) test-u32-mblen$(EXEEXT) \
+	test-u32-mbsnlen$(EXEEXT) test-u32-mbtouc$(EXEEXT) \
+	test-u32-mbtouc-unsafe$(EXEEXT) test-u32-mbtoucr$(EXEEXT) \
+	test-u32-move$(EXEEXT) test-u32-next$(EXEEXT) \
+	test-u32-prev$(EXEEXT) test-u32-set$(EXEEXT) \
+	test-u32-stpcpy$(EXEEXT) test-u32-stpncpy$(EXEEXT) \
+	test-u32-strcat$(EXEEXT) test-u32-strchr$(EXEEXT) \
 	test-u32-strcmp$(EXEEXT) test-u32-strcoll$(EXEEXT) \
 	test-u32-strcpy$(EXEEXT) test-u32-strdup$(EXEEXT) \
 	test-u32-strlen$(EXEEXT) test-u32-strmblen$(EXEEXT) \
 	test-u32-strmbtouc$(EXEEXT) test-u32-strncat$(EXEEXT) \
 	test-u32-strncmp$(EXEEXT) test-u32-strncpy$(EXEEXT) \
-	test-u32-strnlen$(EXEEXT) test-u32-to-u16$(EXEEXT) \
+	test-u32-strnlen$(EXEEXT) test-u32-strstr$(EXEEXT) \
+	test-u32-strtok$(EXEEXT) test-u32-to-u16$(EXEEXT) \
 	test-u32-to-u8$(EXEEXT) test-u32-uctomb$(EXEEXT) \
 	test-u8-check$(EXEEXT) test-u8-chr$(EXEEXT) \
 	test-u8-cmp$(EXEEXT) test-u8-cmp2$(EXEEXT) \
@@ -266,41 +369,56 @@ TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
 	test-u8-next$(EXEEXT) test-u8-prev$(EXEEXT) \
 	test-u8-set$(EXEEXT) test-u8-stpcpy$(EXEEXT) \
 	test-u8-stpncpy$(EXEEXT) test-u8-strcat$(EXEEXT) \
-	test-u8-strcmp$(EXEEXT) test-u8-strcoll$(EXEEXT) \
-	test-u8-strcpy$(EXEEXT) test-u8-strdup$(EXEEXT) \
-	test-u8-strlen$(EXEEXT) test-u8-strmblen$(EXEEXT) \
-	test-u8-strmbtouc$(EXEEXT) test-u8-strncat$(EXEEXT) \
-	test-u8-strncmp$(EXEEXT) test-u8-strncpy$(EXEEXT) \
-	test-u8-strnlen$(EXEEXT) test-u8-to-u16$(EXEEXT) \
-	test-u8-to-u32$(EXEEXT) test-u8-uctomb$(EXEEXT) \
-	test-u16-wordbreaks$(EXEEXT) test-u32-wordbreaks$(EXEEXT) \
+	test-u8-strchr$(EXEEXT) test-u8-strcmp$(EXEEXT) \
+	test-u8-strcoll$(EXEEXT) test-u8-strcpy$(EXEEXT) \
+	test-u8-strdup$(EXEEXT) test-u8-strlen$(EXEEXT) \
+	test-u8-strmblen$(EXEEXT) test-u8-strmbtouc$(EXEEXT) \
+	test-u8-strncat$(EXEEXT) test-u8-strncmp$(EXEEXT) \
+	test-u8-strncpy$(EXEEXT) test-u8-strnlen$(EXEEXT) \
+	test-u8-strstr$(EXEEXT) test-u8-strtok$(EXEEXT) \
+	test-u8-to-u16$(EXEEXT) test-u8-to-u32$(EXEEXT) \
+	test-u8-uctomb$(EXEEXT) test-u16-wordbreaks$(EXEEXT) \
+	test-u32-wordbreaks$(EXEEXT) uniwbrk/test-uc-wordbreaks.sh \
 	test-u8-wordbreaks$(EXEEXT) uniwbrk/test-ulc-wordbreaks.sh \
 	test-u16-strwidth$(EXEEXT) test-u16-width$(EXEEXT) \
 	test-u32-strwidth$(EXEEXT) test-u32-width$(EXEEXT) \
 	test-u8-strwidth$(EXEEXT) test-u8-width$(EXEEXT) \
 	test-uc_width$(EXEEXT) uniwidth/test-uc_width2.sh \
-	test-unsetenv$(EXEEXT) test-wchar$(EXEEXT) \
-	test-wctype$(EXEEXT) test-wcwidth$(EXEEXT) test-xalloc-die.sh
+	test-unsetenv$(EXEEXT) test-verify$(EXEEXT) test-verify.sh \
+	test-wchar$(EXEEXT) test-wcrtomb.sh test-wcrtomb-w32-1.sh \
+	test-wcrtomb-w32-2.sh test-wcrtomb-w32-3.sh \
+	test-wcrtomb-w32-4.sh test-wcrtomb-w32-5.sh \
+	test-wctype-h$(EXEEXT) test-wcwidth$(EXEEXT) \
+	test-xalloc-die.sh
 XFAIL_TESTS =
 noinst_PROGRAMS =
 check_PROGRAMS = test-alloca-opt$(EXEEXT) \
-	test-array-mergesort$(EXEEXT) test-c-ctype$(EXEEXT) \
-	test-c-strcasecmp$(EXEEXT) test-c-strncasecmp$(EXEEXT) \
-	test-environ$(EXEEXT) test-errno$(EXEEXT) \
-	test-frexpl-nolibm$(EXEEXT) test-fseterr$(EXEEXT) \
+	test-array-mergesort$(EXEEXT) test-btowc$(EXEEXT) \
+	test-c-ctype$(EXEEXT) test-c-strcasecmp$(EXEEXT) \
+	test-c-strncasecmp$(EXEEXT) test-environ$(EXEEXT) \
+	test-errno$(EXEEXT) test-fdopen$(EXEEXT) test-fgetc$(EXEEXT) \
+	test-float$(EXEEXT) test-fputc$(EXEEXT) test-fread$(EXEEXT) \
+	test-frexp-nolibm$(EXEEXT) test-frexpl-nolibm$(EXEEXT) \
+	test-fseterr$(EXEEXT) test-fwrite$(EXEEXT) \
 	test-iconv-h$(EXEEXT) test-iconv$(EXEEXT) \
+	test-intprops$(EXEEXT) test-inttypes$(EXEEXT) \
 	test-isnand-nolibm$(EXEEXT) test-isnanf-nolibm$(EXEEXT) \
-	test-isnanl-nolibm$(EXEEXT) test-locale$(EXEEXT) \
+	test-isnanl-nolibm$(EXEEXT) test-iswblank$(EXEEXT) \
+	test-langinfo$(EXEEXT) test-locale$(EXEEXT) \
 	test-localename$(EXEEXT) test-lock$(EXEEXT) \
 	test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc$(EXEEXT) \
-	test-mbsinit$(EXEEXT) test-memchr$(EXEEXT) \
-	test-printf-frexp$(EXEEXT) test-printf-frexpl$(EXEEXT) \
-	test-setenv$(EXEEXT) test-signbit$(EXEEXT) \
+	test-mbrtowc-w32$(EXEEXT) test-mbsinit$(EXEEXT) \
+	test-memchr$(EXEEXT) test-printf-frexp$(EXEEXT) \
+	test-printf-frexpl$(EXEEXT) test-setenv$(EXEEXT) \
+	test-setlocale1$(EXEEXT) test-setlocale2$(EXEEXT) \
+	test-signbit$(EXEEXT) test-stdalign$(EXEEXT) \
 	test-stdbool$(EXEEXT) test-stddef$(EXEEXT) \
-	test-stdint$(EXEEXT) test-stdlib$(EXEEXT) \
+	test-stdint$(EXEEXT) test-stdio$(EXEEXT) test-stdlib$(EXEEXT) \
 	test-strerror$(EXEEXT) test-striconveh$(EXEEXT) \
 	test-striconveha$(EXEEXT) test-string$(EXEEXT) \
-	test-strncat$(EXEEXT) test-cased$(EXEEXT) \
+	test-strncat$(EXEEXT) test-strstr$(EXEEXT) \
+	test-sys_types$(EXEEXT) test-thread_self$(EXEEXT) \
+	test-thread_create$(EXEEXT) test-cased$(EXEEXT) \
 	test-ignorable$(EXEEXT) test-locale-language$(EXEEXT) \
 	test-uc_tolower$(EXEEXT) test-uc_totitle$(EXEEXT) \
 	test-uc_toupper$(EXEEXT) test-u16-casecmp$(EXEEXT) \
@@ -330,13 +448,14 @@ check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-u8-conv-from-enc$(EXEEXT) test-u8-conv-to-enc$(EXEEXT) \
 	test-u8-strconv-from-enc$(EXEEXT) \
 	test-u8-strconv-to-enc$(EXEEXT) test-bidi_byname$(EXEEXT) \
-	test-bidi_name$(EXEEXT) test-bidi_of$(EXEEXT) \
-	test-bidi_test$(EXEEXT) test-block_list$(EXEEXT) \
-	test-block_of$(EXEEXT) test-block_test$(EXEEXT) \
-	test-categ_C$(EXEEXT) test-categ_Cc$(EXEEXT) \
-	test-categ_Cf$(EXEEXT) test-categ_Cn$(EXEEXT) \
-	test-categ_Co$(EXEEXT) test-categ_Cs$(EXEEXT) \
-	test-categ_L$(EXEEXT) test-categ_Ll$(EXEEXT) \
+	test-bidi_longname$(EXEEXT) test-bidi_name$(EXEEXT) \
+	test-bidi_of$(EXEEXT) test-bidi_test$(EXEEXT) \
+	test-block_list$(EXEEXT) test-block_of$(EXEEXT) \
+	test-block_test$(EXEEXT) test-categ_C$(EXEEXT) \
+	test-categ_Cc$(EXEEXT) test-categ_Cf$(EXEEXT) \
+	test-categ_Cn$(EXEEXT) test-categ_Co$(EXEEXT) \
+	test-categ_Cs$(EXEEXT) test-categ_L$(EXEEXT) \
+	test-categ_LC$(EXEEXT) test-categ_Ll$(EXEEXT) \
 	test-categ_Lm$(EXEEXT) test-categ_Lo$(EXEEXT) \
 	test-categ_Lt$(EXEEXT) test-categ_Lu$(EXEEXT) \
 	test-categ_M$(EXEEXT) test-categ_Mc$(EXEEXT) \
@@ -353,9 +472,12 @@ check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-categ_Zl$(EXEEXT) test-categ_Zp$(EXEEXT) \
 	test-categ_Zs$(EXEEXT) test-categ_and_not$(EXEEXT) \
 	test-categ_and$(EXEEXT) test-categ_byname$(EXEEXT) \
-	test-categ_name$(EXEEXT) $(am__EXEEXT_1) \
-	test-categ_of$(EXEEXT) test-categ_or$(EXEEXT) \
-	test-categ_test_withtable$(EXEEXT) test-combining$(EXEEXT) \
+	test-categ_longname$(EXEEXT) test-categ_name$(EXEEXT) \
+	$(am__EXEEXT_1) test-categ_of$(EXEEXT) test-categ_or$(EXEEXT) \
+	test-categ_test_withtable$(EXEEXT) \
+	test-combiningclass_byname$(EXEEXT) \
+	test-combiningclass_longname$(EXEEXT) \
+	test-combiningclass_name$(EXEEXT) test-combiningclass$(EXEEXT) \
 	test-ctype_alnum$(EXEEXT) test-ctype_alpha$(EXEEXT) \
 	test-ctype_blank$(EXEEXT) test-ctype_cntrl$(EXEEXT) \
 	test-ctype_digit$(EXEEXT) test-ctype_graph$(EXEEXT) \
@@ -363,6 +485,11 @@ check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-ctype_punct$(EXEEXT) test-ctype_space$(EXEEXT) \
 	test-ctype_upper$(EXEEXT) test-ctype_xdigit$(EXEEXT) \
 	test-decdigit$(EXEEXT) test-digit$(EXEEXT) \
+	test-joininggroup_byname$(EXEEXT) \
+	test-joininggroup_name$(EXEEXT) test-joininggroup_of$(EXEEXT) \
+	test-joiningtype_byname$(EXEEXT) \
+	test-joiningtype_longname$(EXEEXT) \
+	test-joiningtype_name$(EXEEXT) test-joiningtype_of$(EXEEXT) \
 	test-mirror$(EXEEXT) test-numeric$(EXEEXT) \
 	test-pr_alphabetic$(EXEEXT) test-pr_ascii_hex_digit$(EXEEXT) \
 	test-pr_bidi_arabic_digit$(EXEEXT) \
@@ -381,6 +508,12 @@ check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-pr_bidi_other_neutral$(EXEEXT) test-pr_bidi_pdf$(EXEEXT) \
 	test-pr_bidi_segment_separator$(EXEEXT) \
 	test-pr_bidi_whitespace$(EXEEXT) test-pr_byname$(EXEEXT) \
+	test-pr_case_ignorable$(EXEEXT) test-pr_cased$(EXEEXT) \
+	test-pr_changes_when_casefolded$(EXEEXT) \
+	test-pr_changes_when_casemapped$(EXEEXT) \
+	test-pr_changes_when_lowercased$(EXEEXT) \
+	test-pr_changes_when_titlecased$(EXEEXT) \
+	test-pr_changes_when_uppercased$(EXEEXT) \
 	test-pr_combining$(EXEEXT) test-pr_composite$(EXEEXT) \
 	test-pr_currency_symbol$(EXEEXT) test-pr_dash$(EXEEXT) \
 	test-pr_decimal_digit$(EXEEXT) \
@@ -425,6 +558,16 @@ check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-scripts$(EXEEXT) test-sy_c_ident$(EXEEXT) \
 	test-sy_c_whitespace$(EXEEXT) test-sy_java_ident$(EXEEXT) \
 	test-sy_java_whitespace$(EXEEXT) \
+	test-u16-grapheme-breaks$(EXEEXT) \
+	test-u16-grapheme-next$(EXEEXT) \
+	test-u16-grapheme-prev$(EXEEXT) \
+	test-u32-grapheme-breaks$(EXEEXT) \
+	test-u32-grapheme-next$(EXEEXT) \
+	test-u32-grapheme-prev$(EXEEXT) \
+	test-u8-grapheme-breaks$(EXEEXT) \
+	test-u8-grapheme-next$(EXEEXT) test-u8-grapheme-prev$(EXEEXT) \
+	test-uc-gbrk-prop$(EXEEXT) test-uc-is-grapheme-break$(EXEEXT) \
+	test-ulc-grapheme-breaks$(EXEEXT) \
 	test-u16-possible-linebreaks$(EXEEXT) \
 	test-u16-width-linebreaks$(EXEEXT) \
 	test-u32-possible-linebreaks$(EXEEXT) \
@@ -432,7 +575,7 @@ check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-u8-possible-linebreaks$(EXEEXT) \
 	test-u8-width-linebreaks$(EXEEXT) \
 	test-ulc-possible-linebreaks$(EXEEXT) \
-	test-ulc-width-linebreaks$(EXEEXT) test-uninames$(EXEEXT) \
+	test-ulc-width-linebreaks$(EXEEXT) $(am__EXEEXT_2) \
 	test-canonical-decomposition$(EXEEXT) \
 	test-compat-decomposition$(EXEEXT) test-composition$(EXEEXT) \
 	test-decomposing-form$(EXEEXT) test-decomposition$(EXEEXT) \
@@ -467,28 +610,31 @@ check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-u16-next$(EXEEXT) test-u16-prev$(EXEEXT) \
 	test-u16-set$(EXEEXT) test-u16-stpcpy$(EXEEXT) \
 	test-u16-stpncpy$(EXEEXT) test-u16-strcat$(EXEEXT) \
-	test-u16-strcmp$(EXEEXT) test-u16-strcoll$(EXEEXT) \
-	test-u16-strcpy$(EXEEXT) test-u16-strdup$(EXEEXT) \
-	test-u16-strlen$(EXEEXT) test-u16-strmblen$(EXEEXT) \
-	test-u16-strmbtouc$(EXEEXT) test-u16-strncat$(EXEEXT) \
-	test-u16-strncmp$(EXEEXT) test-u16-strncpy$(EXEEXT) \
-	test-u16-strnlen$(EXEEXT) test-u16-to-u32$(EXEEXT) \
-	test-u16-to-u8$(EXEEXT) test-u16-uctomb$(EXEEXT) \
-	test-u32-check$(EXEEXT) test-u32-chr$(EXEEXT) \
-	test-u32-cmp$(EXEEXT) test-u32-cmp2$(EXEEXT) \
-	test-u32-cpy-alloc$(EXEEXT) test-u32-cpy$(EXEEXT) \
-	test-u32-mblen$(EXEEXT) test-u32-mbsnlen$(EXEEXT) \
-	test-u32-mbtouc$(EXEEXT) test-u32-mbtouc-unsafe$(EXEEXT) \
-	test-u32-mbtoucr$(EXEEXT) test-u32-move$(EXEEXT) \
-	test-u32-next$(EXEEXT) test-u32-prev$(EXEEXT) \
-	test-u32-set$(EXEEXT) test-u32-stpcpy$(EXEEXT) \
-	test-u32-stpncpy$(EXEEXT) test-u32-strcat$(EXEEXT) \
+	test-u16-strchr$(EXEEXT) test-u16-strcmp$(EXEEXT) \
+	test-u16-strcoll$(EXEEXT) test-u16-strcpy$(EXEEXT) \
+	test-u16-strdup$(EXEEXT) test-u16-strlen$(EXEEXT) \
+	test-u16-strmblen$(EXEEXT) test-u16-strmbtouc$(EXEEXT) \
+	test-u16-strncat$(EXEEXT) test-u16-strncmp$(EXEEXT) \
+	test-u16-strncpy$(EXEEXT) test-u16-strnlen$(EXEEXT) \
+	test-u16-strstr$(EXEEXT) test-u16-strtok$(EXEEXT) \
+	test-u16-to-u32$(EXEEXT) test-u16-to-u8$(EXEEXT) \
+	test-u16-uctomb$(EXEEXT) test-u32-check$(EXEEXT) \
+	test-u32-chr$(EXEEXT) test-u32-cmp$(EXEEXT) \
+	test-u32-cmp2$(EXEEXT) test-u32-cpy-alloc$(EXEEXT) \
+	test-u32-cpy$(EXEEXT) test-u32-mblen$(EXEEXT) \
+	test-u32-mbsnlen$(EXEEXT) test-u32-mbtouc$(EXEEXT) \
+	test-u32-mbtouc-unsafe$(EXEEXT) test-u32-mbtoucr$(EXEEXT) \
+	test-u32-move$(EXEEXT) test-u32-next$(EXEEXT) \
+	test-u32-prev$(EXEEXT) test-u32-set$(EXEEXT) \
+	test-u32-stpcpy$(EXEEXT) test-u32-stpncpy$(EXEEXT) \
+	test-u32-strcat$(EXEEXT) test-u32-strchr$(EXEEXT) \
 	test-u32-strcmp$(EXEEXT) test-u32-strcoll$(EXEEXT) \
 	test-u32-strcpy$(EXEEXT) test-u32-strdup$(EXEEXT) \
 	test-u32-strlen$(EXEEXT) test-u32-strmblen$(EXEEXT) \
 	test-u32-strmbtouc$(EXEEXT) test-u32-strncat$(EXEEXT) \
 	test-u32-strncmp$(EXEEXT) test-u32-strncpy$(EXEEXT) \
-	test-u32-strnlen$(EXEEXT) test-u32-to-u16$(EXEEXT) \
+	test-u32-strnlen$(EXEEXT) test-u32-strstr$(EXEEXT) \
+	test-u32-strtok$(EXEEXT) test-u32-to-u16$(EXEEXT) \
 	test-u32-to-u8$(EXEEXT) test-u32-uctomb$(EXEEXT) \
 	test-u8-check$(EXEEXT) test-u8-chr$(EXEEXT) \
 	test-u8-cmp$(EXEEXT) test-u8-cmp2$(EXEEXT) \
@@ -499,29 +645,40 @@ check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-u8-next$(EXEEXT) test-u8-prev$(EXEEXT) \
 	test-u8-set$(EXEEXT) test-u8-stpcpy$(EXEEXT) \
 	test-u8-stpncpy$(EXEEXT) test-u8-strcat$(EXEEXT) \
-	test-u8-strcmp$(EXEEXT) test-u8-strcoll$(EXEEXT) \
-	test-u8-strcpy$(EXEEXT) test-u8-strdup$(EXEEXT) \
-	test-u8-strlen$(EXEEXT) test-u8-strmblen$(EXEEXT) \
-	test-u8-strmbtouc$(EXEEXT) test-u8-strncat$(EXEEXT) \
-	test-u8-strncmp$(EXEEXT) test-u8-strncpy$(EXEEXT) \
-	test-u8-strnlen$(EXEEXT) test-u8-to-u16$(EXEEXT) \
-	test-u8-to-u32$(EXEEXT) test-u8-uctomb$(EXEEXT) \
-	test-u16-wordbreaks$(EXEEXT) test-u32-wordbreaks$(EXEEXT) \
+	test-u8-strchr$(EXEEXT) test-u8-strcmp$(EXEEXT) \
+	test-u8-strcoll$(EXEEXT) test-u8-strcpy$(EXEEXT) \
+	test-u8-strdup$(EXEEXT) test-u8-strlen$(EXEEXT) \
+	test-u8-strmblen$(EXEEXT) test-u8-strmbtouc$(EXEEXT) \
+	test-u8-strncat$(EXEEXT) test-u8-strncmp$(EXEEXT) \
+	test-u8-strncpy$(EXEEXT) test-u8-strnlen$(EXEEXT) \
+	test-u8-strstr$(EXEEXT) test-u8-strtok$(EXEEXT) \
+	test-u8-to-u16$(EXEEXT) test-u8-to-u32$(EXEEXT) \
+	test-u8-uctomb$(EXEEXT) test-u16-wordbreaks$(EXEEXT) \
+	test-u32-wordbreaks$(EXEEXT) test-uc-wordbreaks$(EXEEXT) \
 	test-u8-wordbreaks$(EXEEXT) test-ulc-wordbreaks$(EXEEXT) \
 	test-u16-strwidth$(EXEEXT) test-u16-width$(EXEEXT) \
 	test-u32-strwidth$(EXEEXT) test-u32-width$(EXEEXT) \
 	test-u8-strwidth$(EXEEXT) test-u8-width$(EXEEXT) \
 	test-uc_width$(EXEEXT) test-uc_width2$(EXEEXT) \
-	test-unsetenv$(EXEEXT) test-wchar$(EXEEXT) \
-	test-wctype$(EXEEXT) test-wcwidth$(EXEEXT) \
-	test-xalloc-die$(EXEEXT)
+	test-unsetenv$(EXEEXT) test-verify$(EXEEXT) \
+	test-wchar$(EXEEXT) test-wcrtomb$(EXEEXT) \
+	test-wcrtomb-w32$(EXEEXT) test-wctype-h$(EXEEXT) \
+	test-wcwidth$(EXEEXT) test-xalloc-die$(EXEEXT)
 @WOE32DLL_FALSE@am__append_1 = test-categ_none
 @WOE32DLL_FALSE@am__append_2 = test-categ_none
+
+# Unlike other libunistring modules, this test passes only when the
+# same version of uniname/uniname.c is used (even if it is newer).
+@LIBUNISTRING_COMPILE_UNINAME_UNINAME_TRUE@am__append_3 = uniname/test-uninames.sh
+@LIBUNISTRING_COMPILE_UNINAME_UNINAME_TRUE@am__append_4 = test-uninames
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
+	$(top_srcdir)/gnulib-m4/absolute-header.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
+	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/codeset.m4 \
+	$(top_srcdir)/gnulib-m4/configmake.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
@@ -530,11 +687,14 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/exponentf.m4 \
 	$(top_srcdir)/gnulib-m4/exponentl.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
+	$(top_srcdir)/gnulib-m4/extern-inline.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl-o.m4 \
+	$(top_srcdir)/gnulib-m4/fdopen.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fpieee.m4 \
 	$(top_srcdir)/gnulib-m4/frexp.m4 \
 	$(top_srcdir)/gnulib-m4/frexpl.m4 \
+	$(top_srcdir)/gnulib-m4/fseterr.m4 \
 	$(top_srcdir)/gnulib-m4/getpagesize.m4 \
 	$(top_srcdir)/gnulib-m4/glibc21.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
@@ -546,16 +706,22 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intlmacosx.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
+	$(top_srcdir)/gnulib-m4/inttypes-pri.m4 \
+	$(top_srcdir)/gnulib-m4/inttypes.m4 \
 	$(top_srcdir)/gnulib-m4/inttypes_h.m4 \
 	$(top_srcdir)/gnulib-m4/isnand.m4 \
 	$(top_srcdir)/gnulib-m4/isnanf.m4 \
 	$(top_srcdir)/gnulib-m4/isnanl.m4 \
+	$(top_srcdir)/gnulib-m4/iswblank.m4 \
+	$(top_srcdir)/gnulib-m4/langinfo_h.m4 \
 	$(top_srcdir)/gnulib-m4/lcmessage.m4 \
 	$(top_srcdir)/gnulib-m4/ldexpl.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
 	$(top_srcdir)/gnulib-m4/lib-prefix.m4 \
+	$(top_srcdir)/gnulib-m4/libunistring-base.m4 \
 	$(top_srcdir)/gnulib-m4/localcharset.m4 \
+	$(top_srcdir)/gnulib-m4/locale-ar.m4 \
 	$(top_srcdir)/gnulib-m4/locale-fr.m4 \
 	$(top_srcdir)/gnulib-m4/locale-ja.m4 \
 	$(top_srcdir)/gnulib-m4/locale-tr.m4 \
@@ -572,27 +738,38 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/mbrtowc.m4 \
 	$(top_srcdir)/gnulib-m4/mbsinit.m4 \
 	$(top_srcdir)/gnulib-m4/mbstate_t.m4 \
+	$(top_srcdir)/gnulib-m4/mbtowc.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/minmax.m4 \
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
+	$(top_srcdir)/gnulib-m4/msvc-inval.m4 \
+	$(top_srcdir)/gnulib-m4/msvc-nothrow.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/nocrash.m4 \
+	$(top_srcdir)/gnulib-m4/off_t.m4 \
 	$(top_srcdir)/gnulib-m4/printf-frexp.m4 \
 	$(top_srcdir)/gnulib-m4/printf-frexpl.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
+	$(top_srcdir)/gnulib-m4/setlocale.m4 \
 	$(top_srcdir)/gnulib-m4/signbit.m4 \
 	$(top_srcdir)/gnulib-m4/size_max.m4 \
+	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
+	$(top_srcdir)/gnulib-m4/stdalign.m4 \
 	$(top_srcdir)/gnulib-m4/stdbool.m4 \
 	$(top_srcdir)/gnulib-m4/stddef_h.m4 \
 	$(top_srcdir)/gnulib-m4/stdint.m4 \
 	$(top_srcdir)/gnulib-m4/stdint_h.m4 \
+	$(top_srcdir)/gnulib-m4/stdio_h.m4 \
 	$(top_srcdir)/gnulib-m4/stdlib_h.m4 \
 	$(top_srcdir)/gnulib-m4/strerror.m4 \
 	$(top_srcdir)/gnulib-m4/string_h.m4 \
 	$(top_srcdir)/gnulib-m4/strncat.m4 \
+	$(top_srcdir)/gnulib-m4/strstr.m4 \
+	$(top_srcdir)/gnulib-m4/sys_socket_h.m4 \
+	$(top_srcdir)/gnulib-m4/sys_types_h.m4 \
 	$(top_srcdir)/gnulib-m4/thread.m4 \
 	$(top_srcdir)/gnulib-m4/threadlib.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
@@ -600,7 +777,9 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_t.m4 \
+	$(top_srcdir)/gnulib-m4/wcrtomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
+	$(top_srcdir)/gnulib-m4/wctomb.m4 \
 	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/wint_t.m4 \
@@ -614,34 +793,36 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
-ARFLAGS = cru
-AM_V_AR = $(am__v_AR_$(V))
-am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
-am__v_AR_0 = @echo "  AR    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
 libtests_a_AR = $(AR) $(ARFLAGS)
 am__DEPENDENCIES_1 =
 am__dirstamp = $(am__leading_dot)dirstamp
 am_libtests_a_OBJECTS = exitfail.$(OBJEXT) progname.$(OBJEXT) \
-	glthread/thread.$(OBJEXT) xalloc-die.$(OBJEXT)
+	glthread/thread.$(OBJEXT) xmalloc.$(OBJEXT) \
+	xalloc-die.$(OBJEXT)
 libtests_a_OBJECTS = $(am_libtests_a_OBJECTS)
 @WOE32DLL_FALSE@am__EXEEXT_1 = test-categ_none$(EXEEXT)
+@LIBUNISTRING_COMPILE_UNINAME_UNINAME_TRUE@am__EXEEXT_2 = test-uninames$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 test_alloca_opt_SOURCES = test-alloca-opt.c
 test_alloca_opt_OBJECTS = test-alloca-opt.$(OBJEXT)
 test_alloca_opt_LDADD = $(LDADD)
 test_alloca_opt_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 test_array_mergesort_SOURCES = test-array-mergesort.c
 test_array_mergesort_OBJECTS = test-array-mergesort.$(OBJEXT)
 test_array_mergesort_LDADD = $(LDADD)
@@ -649,39 +830,35 @@ test_array_mergesort_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
 am_test_bidi_byname_OBJECTS = unictype/test-bidi_byname.$(OBJEXT)
 test_bidi_byname_OBJECTS = $(am_test_bidi_byname_OBJECTS)
-test_bidi_byname_LDADD = $(LDADD)
-test_bidi_byname_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_2 = libtests.a ../lib/libunistring.la libtests.a \
+	$(am__DEPENDENCIES_1)
+test_bidi_byname_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_bidi_longname_OBJECTS = unictype/test-bidi_longname.$(OBJEXT)
+test_bidi_longname_OBJECTS = $(am_test_bidi_longname_OBJECTS)
+test_bidi_longname_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_bidi_name_OBJECTS = unictype/test-bidi_name.$(OBJEXT)
 test_bidi_name_OBJECTS = $(am_test_bidi_name_OBJECTS)
-test_bidi_name_LDADD = $(LDADD)
-test_bidi_name_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_bidi_name_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_bidi_of_OBJECTS = unictype/test-bidi_of.$(OBJEXT)
 test_bidi_of_OBJECTS = $(am_test_bidi_of_OBJECTS)
-test_bidi_of_LDADD = $(LDADD)
-test_bidi_of_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_bidi_of_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_bidi_test_OBJECTS = unictype/test-bidi_test.$(OBJEXT)
 test_bidi_test_OBJECTS = $(am_test_bidi_test_OBJECTS)
-test_bidi_test_LDADD = $(LDADD)
-test_bidi_test_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_bidi_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_block_list_OBJECTS = unictype/test-block_list.$(OBJEXT)
 test_block_list_OBJECTS = $(am_test_block_list_OBJECTS)
-test_block_list_LDADD = $(LDADD)
-test_block_list_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_block_list_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_block_of_OBJECTS = unictype/test-block_of.$(OBJEXT)
 test_block_of_OBJECTS = $(am_test_block_of_OBJECTS)
-test_block_of_LDADD = $(LDADD)
-test_block_of_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_block_of_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_block_test_OBJECTS = unictype/test-block_test.$(OBJEXT)
 test_block_test_OBJECTS = $(am_test_block_test_OBJECTS)
-test_block_test_LDADD = $(LDADD)
-test_block_test_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_block_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_btowc_SOURCES = test-btowc.c
+test_btowc_OBJECTS = test-btowc.$(OBJEXT)
+test_btowc_LDADD = $(LDADD)
+test_btowc_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
+	$(am__DEPENDENCIES_1)
 test_c_ctype_SOURCES = test-c-ctype.c
 test_c_ctype_OBJECTS = test-c-ctype.$(OBJEXT)
 test_c_ctype_LDADD = $(LDADD)
@@ -701,341 +878,232 @@ am_test_canonical_decomposition_OBJECTS =  \
 	uninorm/test-canonical-decomposition.$(OBJEXT)
 test_canonical_decomposition_OBJECTS =  \
 	$(am_test_canonical_decomposition_OBJECTS)
-test_canonical_decomposition_LDADD = $(LDADD)
-test_canonical_decomposition_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_canonical_decomposition_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_cased_OBJECTS = unicase/test-cased.$(OBJEXT)
 test_cased_OBJECTS = $(am_test_cased_OBJECTS)
-test_cased_LDADD = $(LDADD)
-test_cased_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
-	$(am__DEPENDENCIES_1)
+test_cased_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_C_OBJECTS = unictype/test-categ_C.$(OBJEXT)
 test_categ_C_OBJECTS = $(am_test_categ_C_OBJECTS)
-test_categ_C_LDADD = $(LDADD)
-test_categ_C_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_C_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Cc_OBJECTS = unictype/test-categ_Cc.$(OBJEXT)
 test_categ_Cc_OBJECTS = $(am_test_categ_Cc_OBJECTS)
-test_categ_Cc_LDADD = $(LDADD)
-test_categ_Cc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Cc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Cf_OBJECTS = unictype/test-categ_Cf.$(OBJEXT)
 test_categ_Cf_OBJECTS = $(am_test_categ_Cf_OBJECTS)
-test_categ_Cf_LDADD = $(LDADD)
-test_categ_Cf_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Cf_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Cn_OBJECTS = unictype/test-categ_Cn.$(OBJEXT)
 test_categ_Cn_OBJECTS = $(am_test_categ_Cn_OBJECTS)
-test_categ_Cn_LDADD = $(LDADD)
-test_categ_Cn_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Cn_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Co_OBJECTS = unictype/test-categ_Co.$(OBJEXT)
 test_categ_Co_OBJECTS = $(am_test_categ_Co_OBJECTS)
-test_categ_Co_LDADD = $(LDADD)
-test_categ_Co_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Co_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Cs_OBJECTS = unictype/test-categ_Cs.$(OBJEXT)
 test_categ_Cs_OBJECTS = $(am_test_categ_Cs_OBJECTS)
-test_categ_Cs_LDADD = $(LDADD)
-test_categ_Cs_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Cs_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_L_OBJECTS = unictype/test-categ_L.$(OBJEXT)
 test_categ_L_OBJECTS = $(am_test_categ_L_OBJECTS)
-test_categ_L_LDADD = $(LDADD)
-test_categ_L_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_L_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_categ_LC_OBJECTS = unictype/test-categ_LC.$(OBJEXT)
+test_categ_LC_OBJECTS = $(am_test_categ_LC_OBJECTS)
+test_categ_LC_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Ll_OBJECTS = unictype/test-categ_Ll.$(OBJEXT)
 test_categ_Ll_OBJECTS = $(am_test_categ_Ll_OBJECTS)
-test_categ_Ll_LDADD = $(LDADD)
-test_categ_Ll_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Ll_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Lm_OBJECTS = unictype/test-categ_Lm.$(OBJEXT)
 test_categ_Lm_OBJECTS = $(am_test_categ_Lm_OBJECTS)
-test_categ_Lm_LDADD = $(LDADD)
-test_categ_Lm_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Lm_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Lo_OBJECTS = unictype/test-categ_Lo.$(OBJEXT)
 test_categ_Lo_OBJECTS = $(am_test_categ_Lo_OBJECTS)
-test_categ_Lo_LDADD = $(LDADD)
-test_categ_Lo_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Lo_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Lt_OBJECTS = unictype/test-categ_Lt.$(OBJEXT)
 test_categ_Lt_OBJECTS = $(am_test_categ_Lt_OBJECTS)
-test_categ_Lt_LDADD = $(LDADD)
-test_categ_Lt_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Lt_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Lu_OBJECTS = unictype/test-categ_Lu.$(OBJEXT)
 test_categ_Lu_OBJECTS = $(am_test_categ_Lu_OBJECTS)
-test_categ_Lu_LDADD = $(LDADD)
-test_categ_Lu_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Lu_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_M_OBJECTS = unictype/test-categ_M.$(OBJEXT)
 test_categ_M_OBJECTS = $(am_test_categ_M_OBJECTS)
-test_categ_M_LDADD = $(LDADD)
-test_categ_M_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_M_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Mc_OBJECTS = unictype/test-categ_Mc.$(OBJEXT)
 test_categ_Mc_OBJECTS = $(am_test_categ_Mc_OBJECTS)
-test_categ_Mc_LDADD = $(LDADD)
-test_categ_Mc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Mc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Me_OBJECTS = unictype/test-categ_Me.$(OBJEXT)
 test_categ_Me_OBJECTS = $(am_test_categ_Me_OBJECTS)
-test_categ_Me_LDADD = $(LDADD)
-test_categ_Me_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Me_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Mn_OBJECTS = unictype/test-categ_Mn.$(OBJEXT)
 test_categ_Mn_OBJECTS = $(am_test_categ_Mn_OBJECTS)
-test_categ_Mn_LDADD = $(LDADD)
-test_categ_Mn_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Mn_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_N_OBJECTS = unictype/test-categ_N.$(OBJEXT)
 test_categ_N_OBJECTS = $(am_test_categ_N_OBJECTS)
-test_categ_N_LDADD = $(LDADD)
-test_categ_N_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_N_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Nd_OBJECTS = unictype/test-categ_Nd.$(OBJEXT)
 test_categ_Nd_OBJECTS = $(am_test_categ_Nd_OBJECTS)
-test_categ_Nd_LDADD = $(LDADD)
-test_categ_Nd_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Nd_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Nl_OBJECTS = unictype/test-categ_Nl.$(OBJEXT)
 test_categ_Nl_OBJECTS = $(am_test_categ_Nl_OBJECTS)
-test_categ_Nl_LDADD = $(LDADD)
-test_categ_Nl_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Nl_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_No_OBJECTS = unictype/test-categ_No.$(OBJEXT)
 test_categ_No_OBJECTS = $(am_test_categ_No_OBJECTS)
-test_categ_No_LDADD = $(LDADD)
-test_categ_No_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_No_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_P_OBJECTS = unictype/test-categ_P.$(OBJEXT)
 test_categ_P_OBJECTS = $(am_test_categ_P_OBJECTS)
-test_categ_P_LDADD = $(LDADD)
-test_categ_P_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_P_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Pc_OBJECTS = unictype/test-categ_Pc.$(OBJEXT)
 test_categ_Pc_OBJECTS = $(am_test_categ_Pc_OBJECTS)
-test_categ_Pc_LDADD = $(LDADD)
-test_categ_Pc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Pc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Pd_OBJECTS = unictype/test-categ_Pd.$(OBJEXT)
 test_categ_Pd_OBJECTS = $(am_test_categ_Pd_OBJECTS)
-test_categ_Pd_LDADD = $(LDADD)
-test_categ_Pd_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Pd_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Pe_OBJECTS = unictype/test-categ_Pe.$(OBJEXT)
 test_categ_Pe_OBJECTS = $(am_test_categ_Pe_OBJECTS)
-test_categ_Pe_LDADD = $(LDADD)
-test_categ_Pe_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Pe_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Pf_OBJECTS = unictype/test-categ_Pf.$(OBJEXT)
 test_categ_Pf_OBJECTS = $(am_test_categ_Pf_OBJECTS)
-test_categ_Pf_LDADD = $(LDADD)
-test_categ_Pf_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Pf_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Pi_OBJECTS = unictype/test-categ_Pi.$(OBJEXT)
 test_categ_Pi_OBJECTS = $(am_test_categ_Pi_OBJECTS)
-test_categ_Pi_LDADD = $(LDADD)
-test_categ_Pi_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Pi_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Po_OBJECTS = unictype/test-categ_Po.$(OBJEXT)
 test_categ_Po_OBJECTS = $(am_test_categ_Po_OBJECTS)
-test_categ_Po_LDADD = $(LDADD)
-test_categ_Po_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Po_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Ps_OBJECTS = unictype/test-categ_Ps.$(OBJEXT)
 test_categ_Ps_OBJECTS = $(am_test_categ_Ps_OBJECTS)
-test_categ_Ps_LDADD = $(LDADD)
-test_categ_Ps_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Ps_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_S_OBJECTS = unictype/test-categ_S.$(OBJEXT)
 test_categ_S_OBJECTS = $(am_test_categ_S_OBJECTS)
-test_categ_S_LDADD = $(LDADD)
-test_categ_S_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_S_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Sc_OBJECTS = unictype/test-categ_Sc.$(OBJEXT)
 test_categ_Sc_OBJECTS = $(am_test_categ_Sc_OBJECTS)
-test_categ_Sc_LDADD = $(LDADD)
-test_categ_Sc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Sc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Sk_OBJECTS = unictype/test-categ_Sk.$(OBJEXT)
 test_categ_Sk_OBJECTS = $(am_test_categ_Sk_OBJECTS)
-test_categ_Sk_LDADD = $(LDADD)
-test_categ_Sk_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Sk_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Sm_OBJECTS = unictype/test-categ_Sm.$(OBJEXT)
 test_categ_Sm_OBJECTS = $(am_test_categ_Sm_OBJECTS)
-test_categ_Sm_LDADD = $(LDADD)
-test_categ_Sm_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Sm_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_So_OBJECTS = unictype/test-categ_So.$(OBJEXT)
 test_categ_So_OBJECTS = $(am_test_categ_So_OBJECTS)
-test_categ_So_LDADD = $(LDADD)
-test_categ_So_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_So_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Z_OBJECTS = unictype/test-categ_Z.$(OBJEXT)
 test_categ_Z_OBJECTS = $(am_test_categ_Z_OBJECTS)
-test_categ_Z_LDADD = $(LDADD)
-test_categ_Z_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Z_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Zl_OBJECTS = unictype/test-categ_Zl.$(OBJEXT)
 test_categ_Zl_OBJECTS = $(am_test_categ_Zl_OBJECTS)
-test_categ_Zl_LDADD = $(LDADD)
-test_categ_Zl_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Zl_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Zp_OBJECTS = unictype/test-categ_Zp.$(OBJEXT)
 test_categ_Zp_OBJECTS = $(am_test_categ_Zp_OBJECTS)
-test_categ_Zp_LDADD = $(LDADD)
-test_categ_Zp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Zp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_Zs_OBJECTS = unictype/test-categ_Zs.$(OBJEXT)
 test_categ_Zs_OBJECTS = $(am_test_categ_Zs_OBJECTS)
-test_categ_Zs_LDADD = $(LDADD)
-test_categ_Zs_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_Zs_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_and_OBJECTS = unictype/test-categ_and.$(OBJEXT)
 test_categ_and_OBJECTS = $(am_test_categ_and_OBJECTS)
-test_categ_and_LDADD = $(LDADD)
-test_categ_and_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_and_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_and_not_OBJECTS = unictype/test-categ_and_not.$(OBJEXT)
 test_categ_and_not_OBJECTS = $(am_test_categ_and_not_OBJECTS)
-test_categ_and_not_LDADD = $(LDADD)
-test_categ_and_not_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_and_not_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_byname_OBJECTS = unictype/test-categ_byname.$(OBJEXT)
 test_categ_byname_OBJECTS = $(am_test_categ_byname_OBJECTS)
-test_categ_byname_LDADD = $(LDADD)
-test_categ_byname_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_byname_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_categ_longname_OBJECTS =  \
+	unictype/test-categ_longname.$(OBJEXT)
+test_categ_longname_OBJECTS = $(am_test_categ_longname_OBJECTS)
+test_categ_longname_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_name_OBJECTS = unictype/test-categ_name.$(OBJEXT)
 test_categ_name_OBJECTS = $(am_test_categ_name_OBJECTS)
-test_categ_name_LDADD = $(LDADD)
-test_categ_name_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_name_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am__test_categ_none_SOURCES_DIST = unictype/test-categ_none.c
 @WOE32DLL_FALSE@am_test_categ_none_OBJECTS =  \
 @WOE32DLL_FALSE@	unictype/test-categ_none.$(OBJEXT)
 test_categ_none_OBJECTS = $(am_test_categ_none_OBJECTS)
-test_categ_none_LDADD = $(LDADD)
-test_categ_none_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+@WOE32DLL_FALSE@test_categ_none_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_of_OBJECTS = unictype/test-categ_of.$(OBJEXT)
 test_categ_of_OBJECTS = $(am_test_categ_of_OBJECTS)
-test_categ_of_LDADD = $(LDADD)
-test_categ_of_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_of_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_or_OBJECTS = unictype/test-categ_or.$(OBJEXT)
 test_categ_or_OBJECTS = $(am_test_categ_or_OBJECTS)
-test_categ_or_LDADD = $(LDADD)
-test_categ_or_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_or_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_categ_test_withtable_OBJECTS =  \
 	unictype/test-categ_test_withtable.$(OBJEXT)
 test_categ_test_withtable_OBJECTS =  \
 	$(am_test_categ_test_withtable_OBJECTS)
-test_categ_test_withtable_LDADD = $(LDADD)
-test_categ_test_withtable_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
-am_test_combining_OBJECTS = unictype/test-combining.$(OBJEXT)
-test_combining_OBJECTS = $(am_test_combining_OBJECTS)
-test_combining_LDADD = $(LDADD)
-test_combining_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_categ_test_withtable_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_combiningclass_OBJECTS =  \
+	unictype/test-combiningclass.$(OBJEXT)
+test_combiningclass_OBJECTS = $(am_test_combiningclass_OBJECTS)
+test_combiningclass_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_combiningclass_byname_OBJECTS =  \
+	unictype/test-combiningclass_byname.$(OBJEXT)
+test_combiningclass_byname_OBJECTS =  \
+	$(am_test_combiningclass_byname_OBJECTS)
+test_combiningclass_byname_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_combiningclass_longname_OBJECTS =  \
+	unictype/test-combiningclass_longname.$(OBJEXT)
+test_combiningclass_longname_OBJECTS =  \
+	$(am_test_combiningclass_longname_OBJECTS)
+test_combiningclass_longname_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_combiningclass_name_OBJECTS =  \
+	unictype/test-combiningclass_name.$(OBJEXT)
+test_combiningclass_name_OBJECTS =  \
+	$(am_test_combiningclass_name_OBJECTS)
+test_combiningclass_name_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_compat_decomposition_OBJECTS =  \
 	uninorm/test-compat-decomposition.$(OBJEXT)
 test_compat_decomposition_OBJECTS =  \
 	$(am_test_compat_decomposition_OBJECTS)
-test_compat_decomposition_LDADD = $(LDADD)
-test_compat_decomposition_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_compat_decomposition_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_composition_OBJECTS = uninorm/test-composition.$(OBJEXT)
 test_composition_OBJECTS = $(am_test_composition_OBJECTS)
-test_composition_LDADD = $(LDADD)
-test_composition_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_composition_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ctype_alnum_OBJECTS = unictype/test-ctype_alnum.$(OBJEXT)
 test_ctype_alnum_OBJECTS = $(am_test_ctype_alnum_OBJECTS)
-test_ctype_alnum_LDADD = $(LDADD)
-test_ctype_alnum_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_ctype_alnum_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ctype_alpha_OBJECTS = unictype/test-ctype_alpha.$(OBJEXT)
 test_ctype_alpha_OBJECTS = $(am_test_ctype_alpha_OBJECTS)
-test_ctype_alpha_LDADD = $(LDADD)
-test_ctype_alpha_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_ctype_alpha_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ctype_blank_OBJECTS = unictype/test-ctype_blank.$(OBJEXT)
 test_ctype_blank_OBJECTS = $(am_test_ctype_blank_OBJECTS)
-test_ctype_blank_LDADD = $(LDADD)
-test_ctype_blank_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_ctype_blank_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ctype_cntrl_OBJECTS = unictype/test-ctype_cntrl.$(OBJEXT)
 test_ctype_cntrl_OBJECTS = $(am_test_ctype_cntrl_OBJECTS)
-test_ctype_cntrl_LDADD = $(LDADD)
-test_ctype_cntrl_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_ctype_cntrl_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ctype_digit_OBJECTS = unictype/test-ctype_digit.$(OBJEXT)
 test_ctype_digit_OBJECTS = $(am_test_ctype_digit_OBJECTS)
-test_ctype_digit_LDADD = $(LDADD)
-test_ctype_digit_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_ctype_digit_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ctype_graph_OBJECTS = unictype/test-ctype_graph.$(OBJEXT)
 test_ctype_graph_OBJECTS = $(am_test_ctype_graph_OBJECTS)
-test_ctype_graph_LDADD = $(LDADD)
-test_ctype_graph_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_ctype_graph_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ctype_lower_OBJECTS = unictype/test-ctype_lower.$(OBJEXT)
 test_ctype_lower_OBJECTS = $(am_test_ctype_lower_OBJECTS)
-test_ctype_lower_LDADD = $(LDADD)
-test_ctype_lower_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_ctype_lower_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ctype_print_OBJECTS = unictype/test-ctype_print.$(OBJEXT)
 test_ctype_print_OBJECTS = $(am_test_ctype_print_OBJECTS)
-test_ctype_print_LDADD = $(LDADD)
-test_ctype_print_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_ctype_print_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ctype_punct_OBJECTS = unictype/test-ctype_punct.$(OBJEXT)
 test_ctype_punct_OBJECTS = $(am_test_ctype_punct_OBJECTS)
-test_ctype_punct_LDADD = $(LDADD)
-test_ctype_punct_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_ctype_punct_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ctype_space_OBJECTS = unictype/test-ctype_space.$(OBJEXT)
 test_ctype_space_OBJECTS = $(am_test_ctype_space_OBJECTS)
-test_ctype_space_LDADD = $(LDADD)
-test_ctype_space_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_ctype_space_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ctype_upper_OBJECTS = unictype/test-ctype_upper.$(OBJEXT)
 test_ctype_upper_OBJECTS = $(am_test_ctype_upper_OBJECTS)
-test_ctype_upper_LDADD = $(LDADD)
-test_ctype_upper_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_ctype_upper_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ctype_xdigit_OBJECTS = unictype/test-ctype_xdigit.$(OBJEXT)
 test_ctype_xdigit_OBJECTS = $(am_test_ctype_xdigit_OBJECTS)
-test_ctype_xdigit_LDADD = $(LDADD)
-test_ctype_xdigit_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_ctype_xdigit_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_decdigit_OBJECTS = unictype/test-decdigit.$(OBJEXT)
 test_decdigit_OBJECTS = $(am_test_decdigit_OBJECTS)
-test_decdigit_LDADD = $(LDADD)
-test_decdigit_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_decdigit_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_decomposing_form_OBJECTS =  \
 	uninorm/test-decomposing-form.$(OBJEXT)
 test_decomposing_form_OBJECTS = $(am_test_decomposing_form_OBJECTS)
-test_decomposing_form_LDADD = $(LDADD)
-test_decomposing_form_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_decomposing_form_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_decomposition_OBJECTS = uninorm/test-decomposition.$(OBJEXT)
 test_decomposition_OBJECTS = $(am_test_decomposition_OBJECTS)
-test_decomposition_LDADD = $(LDADD)
-test_decomposition_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_decomposition_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_digit_OBJECTS = unictype/test-digit.$(OBJEXT)
 test_digit_OBJECTS = $(am_test_digit_OBJECTS)
-test_digit_LDADD = $(LDADD)
-test_digit_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
-	$(am__DEPENDENCIES_1)
+test_digit_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_environ_SOURCES = test-environ.c
 test_environ_OBJECTS = test-environ.$(OBJEXT)
 test_environ_LDADD = $(LDADD)
@@ -1046,7 +1114,38 @@ test_errno_OBJECTS = test-errno.$(OBJEXT)
 test_errno_LDADD = $(LDADD)
 test_errno_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
 	$(am__DEPENDENCIES_1)
-am_test_frexpl_nolibm_OBJECTS = test-frexpl.$(OBJEXT)
+test_fdopen_SOURCES = test-fdopen.c
+test_fdopen_OBJECTS = test-fdopen.$(OBJEXT)
+test_fdopen_LDADD = $(LDADD)
+test_fdopen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+test_fgetc_SOURCES = test-fgetc.c
+test_fgetc_OBJECTS = test-fgetc.$(OBJEXT)
+test_fgetc_LDADD = $(LDADD)
+test_fgetc_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
+	$(am__DEPENDENCIES_1)
+test_float_SOURCES = test-float.c
+test_float_OBJECTS = test-float.$(OBJEXT)
+test_float_LDADD = $(LDADD)
+test_float_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
+	$(am__DEPENDENCIES_1)
+test_fputc_SOURCES = test-fputc.c
+test_fputc_OBJECTS = test-fputc.$(OBJEXT)
+test_fputc_LDADD = $(LDADD)
+test_fputc_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
+	$(am__DEPENDENCIES_1)
+test_fread_SOURCES = test-fread.c
+test_fread_OBJECTS = test-fread.$(OBJEXT)
+test_fread_LDADD = $(LDADD)
+test_fread_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
+	$(am__DEPENDENCIES_1)
+am_test_frexp_nolibm_OBJECTS = test-frexp.$(OBJEXT) randomd.$(OBJEXT)
+test_frexp_nolibm_OBJECTS = $(am_test_frexp_nolibm_OBJECTS)
+test_frexp_nolibm_LDADD = $(LDADD)
+test_frexp_nolibm_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_frexpl_nolibm_OBJECTS = test-frexpl.$(OBJEXT) \
+	randoml.$(OBJEXT)
 test_frexpl_nolibm_OBJECTS = $(am_test_frexpl_nolibm_OBJECTS)
 test_frexpl_nolibm_LDADD = $(LDADD)
 test_frexpl_nolibm_DEPENDENCIES = libtests.a ../lib/libunistring.la \
@@ -1056,10 +1155,13 @@ test_fseterr_OBJECTS = test-fseterr.$(OBJEXT)
 test_fseterr_LDADD = $(LDADD)
 test_fseterr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_fwrite_SOURCES = test-fwrite.c
+test_fwrite_OBJECTS = test-fwrite.$(OBJEXT)
+test_fwrite_LDADD = $(LDADD)
+test_fwrite_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 test_iconv_SOURCES = test-iconv.c
 test_iconv_OBJECTS = test-iconv.$(OBJEXT)
-am__DEPENDENCIES_2 = libtests.a ../lib/libunistring.la libtests.a \
-	$(am__DEPENDENCIES_1)
 test_iconv_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_iconv_h_SOURCES = test-iconv-h.c
 test_iconv_h_OBJECTS = test-iconv-h.$(OBJEXT)
@@ -1068,8 +1170,16 @@ test_iconv_h_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
 am_test_ignorable_OBJECTS = unicase/test-ignorable.$(OBJEXT)
 test_ignorable_OBJECTS = $(am_test_ignorable_OBJECTS)
-test_ignorable_LDADD = $(LDADD)
-test_ignorable_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+test_ignorable_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_intprops_SOURCES = test-intprops.c
+test_intprops_OBJECTS = test-intprops.$(OBJEXT)
+test_intprops_LDADD = $(LDADD)
+test_intprops_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+test_inttypes_SOURCES = test-inttypes.c
+test_inttypes_OBJECTS = test-inttypes.$(OBJEXT)
+test_inttypes_LDADD = $(LDADD)
+test_inttypes_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
 test_isnand_nolibm_SOURCES = test-isnand-nolibm.c
 test_isnand_nolibm_OBJECTS = test-isnand-nolibm.$(OBJEXT)
@@ -1086,6 +1196,47 @@ test_isnanl_nolibm_OBJECTS = test-isnanl-nolibm.$(OBJEXT)
 test_isnanl_nolibm_LDADD = $(LDADD)
 test_isnanl_nolibm_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_iswblank_SOURCES = test-iswblank.c
+test_iswblank_OBJECTS = test-iswblank.$(OBJEXT)
+test_iswblank_LDADD = $(LDADD)
+test_iswblank_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_joininggroup_byname_OBJECTS =  \
+	unictype/test-joininggroup_byname.$(OBJEXT)
+test_joininggroup_byname_OBJECTS =  \
+	$(am_test_joininggroup_byname_OBJECTS)
+test_joininggroup_byname_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_joininggroup_name_OBJECTS =  \
+	unictype/test-joininggroup_name.$(OBJEXT)
+test_joininggroup_name_OBJECTS = $(am_test_joininggroup_name_OBJECTS)
+test_joininggroup_name_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_joininggroup_of_OBJECTS =  \
+	unictype/test-joininggroup_of.$(OBJEXT)
+test_joininggroup_of_OBJECTS = $(am_test_joininggroup_of_OBJECTS)
+test_joininggroup_of_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_joiningtype_byname_OBJECTS =  \
+	unictype/test-joiningtype_byname.$(OBJEXT)
+test_joiningtype_byname_OBJECTS =  \
+	$(am_test_joiningtype_byname_OBJECTS)
+test_joiningtype_byname_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_joiningtype_longname_OBJECTS =  \
+	unictype/test-joiningtype_longname.$(OBJEXT)
+test_joiningtype_longname_OBJECTS =  \
+	$(am_test_joiningtype_longname_OBJECTS)
+test_joiningtype_longname_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_joiningtype_name_OBJECTS =  \
+	unictype/test-joiningtype_name.$(OBJEXT)
+test_joiningtype_name_OBJECTS = $(am_test_joiningtype_name_OBJECTS)
+test_joiningtype_name_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_joiningtype_of_OBJECTS =  \
+	unictype/test-joiningtype_of.$(OBJEXT)
+test_joiningtype_of_OBJECTS = $(am_test_joiningtype_of_OBJECTS)
+test_joiningtype_of_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_langinfo_SOURCES = test-langinfo.c
+test_langinfo_OBJECTS = test-langinfo.$(OBJEXT)
+test_langinfo_LDADD = $(LDADD)
+test_langinfo_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 test_locale_SOURCES = test-locale.c
 test_locale_OBJECTS = test-locale.$(OBJEXT)
 test_locale_LDADD = $(LDADD)
@@ -1097,7 +1248,8 @@ test_locale_language_OBJECTS = $(am_test_locale_language_OBJECTS)
 test_locale_language_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_localename_SOURCES = test-localename.c
 test_localename_OBJECTS = test-localename.$(OBJEXT)
-test_localename_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_localename_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1)
 test_lock_SOURCES = test-lock.c
 test_lock_OBJECTS = test-lock.$(OBJEXT)
 test_lock_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -1116,6 +1268,11 @@ test_mbrtowc_OBJECTS = test-mbrtowc.$(OBJEXT)
 test_mbrtowc_LDADD = $(LDADD)
 test_mbrtowc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_mbrtowc_w32_SOURCES = test-mbrtowc-w32.c
+test_mbrtowc_w32_OBJECTS = test-mbrtowc-w32.$(OBJEXT)
+test_mbrtowc_w32_LDADD = $(LDADD)
+test_mbrtowc_w32_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 test_mbsinit_SOURCES = test-mbsinit.c
 test_mbsinit_OBJECTS = test-mbsinit.$(OBJEXT)
 test_mbsinit_LDADD = $(LDADD)
@@ -1128,542 +1285,405 @@ test_memchr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
 am_test_mirror_OBJECTS = unictype/test-mirror.$(OBJEXT)
 test_mirror_OBJECTS = $(am_test_mirror_OBJECTS)
-test_mirror_LDADD = $(LDADD)
-test_mirror_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_mirror_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_nfc_OBJECTS = uninorm/test-nfc.$(OBJEXT) \
 	uninorm/test-u8-nfc.$(OBJEXT) uninorm/test-u16-nfc.$(OBJEXT) \
 	uninorm/test-u32-nfc.$(OBJEXT)
 test_nfc_OBJECTS = $(am_test_nfc_OBJECTS)
-test_nfc_LDADD = $(LDADD)
-test_nfc_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
-	$(am__DEPENDENCIES_1)
+test_nfc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_nfd_OBJECTS = uninorm/test-nfd.$(OBJEXT) \
 	uninorm/test-u8-nfd.$(OBJEXT) uninorm/test-u16-nfd.$(OBJEXT) \
 	uninorm/test-u32-nfd.$(OBJEXT)
 test_nfd_OBJECTS = $(am_test_nfd_OBJECTS)
-test_nfd_LDADD = $(LDADD)
-test_nfd_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
-	$(am__DEPENDENCIES_1)
+test_nfd_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_nfkc_OBJECTS = uninorm/test-nfkc.$(OBJEXT) \
 	uninorm/test-u8-nfkc.$(OBJEXT) uninorm/test-u16-nfkc.$(OBJEXT) \
 	uninorm/test-u32-nfkc.$(OBJEXT)
 test_nfkc_OBJECTS = $(am_test_nfkc_OBJECTS)
-test_nfkc_LDADD = $(LDADD)
-test_nfkc_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
-	$(am__DEPENDENCIES_1)
+test_nfkc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_nfkd_OBJECTS = uninorm/test-nfkd.$(OBJEXT) \
 	uninorm/test-u8-nfkd.$(OBJEXT) uninorm/test-u16-nfkd.$(OBJEXT) \
 	uninorm/test-u32-nfkd.$(OBJEXT)
 test_nfkd_OBJECTS = $(am_test_nfkd_OBJECTS)
-test_nfkd_LDADD = $(LDADD)
-test_nfkd_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
-	$(am__DEPENDENCIES_1)
+test_nfkd_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_numeric_OBJECTS = unictype/test-numeric.$(OBJEXT)
 test_numeric_OBJECTS = $(am_test_numeric_OBJECTS)
-test_numeric_LDADD = $(LDADD)
-test_numeric_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_numeric_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_alphabetic_OBJECTS = unictype/test-pr_alphabetic.$(OBJEXT)
 test_pr_alphabetic_OBJECTS = $(am_test_pr_alphabetic_OBJECTS)
-test_pr_alphabetic_LDADD = $(LDADD)
-test_pr_alphabetic_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_alphabetic_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_ascii_hex_digit_OBJECTS =  \
 	unictype/test-pr_ascii_hex_digit.$(OBJEXT)
 test_pr_ascii_hex_digit_OBJECTS =  \
 	$(am_test_pr_ascii_hex_digit_OBJECTS)
-test_pr_ascii_hex_digit_LDADD = $(LDADD)
-test_pr_ascii_hex_digit_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_ascii_hex_digit_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_bidi_arabic_digit_OBJECTS =  \
 	unictype/test-pr_bidi_arabic_digit.$(OBJEXT)
 test_pr_bidi_arabic_digit_OBJECTS =  \
 	$(am_test_pr_bidi_arabic_digit_OBJECTS)
-test_pr_bidi_arabic_digit_LDADD = $(LDADD)
-test_pr_bidi_arabic_digit_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_arabic_digit_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_bidi_arabic_right_to_left_OBJECTS =  \
 	unictype/test-pr_bidi_arabic_right_to_left.$(OBJEXT)
 test_pr_bidi_arabic_right_to_left_OBJECTS =  \
 	$(am_test_pr_bidi_arabic_right_to_left_OBJECTS)
-test_pr_bidi_arabic_right_to_left_LDADD = $(LDADD)
-test_pr_bidi_arabic_right_to_left_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_arabic_right_to_left_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_2)
 am_test_pr_bidi_block_separator_OBJECTS =  \
 	unictype/test-pr_bidi_block_separator.$(OBJEXT)
 test_pr_bidi_block_separator_OBJECTS =  \
 	$(am_test_pr_bidi_block_separator_OBJECTS)
-test_pr_bidi_block_separator_LDADD = $(LDADD)
-test_pr_bidi_block_separator_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_block_separator_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_bidi_boundary_neutral_OBJECTS =  \
 	unictype/test-pr_bidi_boundary_neutral.$(OBJEXT)
 test_pr_bidi_boundary_neutral_OBJECTS =  \
 	$(am_test_pr_bidi_boundary_neutral_OBJECTS)
-test_pr_bidi_boundary_neutral_LDADD = $(LDADD)
-test_pr_bidi_boundary_neutral_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_boundary_neutral_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_bidi_common_separator_OBJECTS =  \
 	unictype/test-pr_bidi_common_separator.$(OBJEXT)
 test_pr_bidi_common_separator_OBJECTS =  \
 	$(am_test_pr_bidi_common_separator_OBJECTS)
-test_pr_bidi_common_separator_LDADD = $(LDADD)
-test_pr_bidi_common_separator_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_common_separator_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_bidi_control_OBJECTS =  \
 	unictype/test-pr_bidi_control.$(OBJEXT)
 test_pr_bidi_control_OBJECTS = $(am_test_pr_bidi_control_OBJECTS)
-test_pr_bidi_control_LDADD = $(LDADD)
-test_pr_bidi_control_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_control_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_bidi_embedding_or_override_OBJECTS =  \
 	unictype/test-pr_bidi_embedding_or_override.$(OBJEXT)
 test_pr_bidi_embedding_or_override_OBJECTS =  \
 	$(am_test_pr_bidi_embedding_or_override_OBJECTS)
-test_pr_bidi_embedding_or_override_LDADD = $(LDADD)
-test_pr_bidi_embedding_or_override_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_embedding_or_override_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_2)
 am_test_pr_bidi_eur_num_separator_OBJECTS =  \
 	unictype/test-pr_bidi_eur_num_separator.$(OBJEXT)
 test_pr_bidi_eur_num_separator_OBJECTS =  \
 	$(am_test_pr_bidi_eur_num_separator_OBJECTS)
-test_pr_bidi_eur_num_separator_LDADD = $(LDADD)
-test_pr_bidi_eur_num_separator_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_eur_num_separator_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_bidi_eur_num_terminator_OBJECTS =  \
 	unictype/test-pr_bidi_eur_num_terminator.$(OBJEXT)
 test_pr_bidi_eur_num_terminator_OBJECTS =  \
 	$(am_test_pr_bidi_eur_num_terminator_OBJECTS)
-test_pr_bidi_eur_num_terminator_LDADD = $(LDADD)
-test_pr_bidi_eur_num_terminator_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_eur_num_terminator_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_bidi_european_digit_OBJECTS =  \
 	unictype/test-pr_bidi_european_digit.$(OBJEXT)
 test_pr_bidi_european_digit_OBJECTS =  \
 	$(am_test_pr_bidi_european_digit_OBJECTS)
-test_pr_bidi_european_digit_LDADD = $(LDADD)
-test_pr_bidi_european_digit_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_european_digit_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_bidi_hebrew_right_to_left_OBJECTS =  \
 	unictype/test-pr_bidi_hebrew_right_to_left.$(OBJEXT)
 test_pr_bidi_hebrew_right_to_left_OBJECTS =  \
 	$(am_test_pr_bidi_hebrew_right_to_left_OBJECTS)
-test_pr_bidi_hebrew_right_to_left_LDADD = $(LDADD)
-test_pr_bidi_hebrew_right_to_left_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_hebrew_right_to_left_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_2)
 am_test_pr_bidi_left_to_right_OBJECTS =  \
 	unictype/test-pr_bidi_left_to_right.$(OBJEXT)
 test_pr_bidi_left_to_right_OBJECTS =  \
 	$(am_test_pr_bidi_left_to_right_OBJECTS)
-test_pr_bidi_left_to_right_LDADD = $(LDADD)
-test_pr_bidi_left_to_right_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_left_to_right_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_bidi_non_spacing_mark_OBJECTS =  \
 	unictype/test-pr_bidi_non_spacing_mark.$(OBJEXT)
 test_pr_bidi_non_spacing_mark_OBJECTS =  \
 	$(am_test_pr_bidi_non_spacing_mark_OBJECTS)
-test_pr_bidi_non_spacing_mark_LDADD = $(LDADD)
-test_pr_bidi_non_spacing_mark_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_non_spacing_mark_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_bidi_other_neutral_OBJECTS =  \
 	unictype/test-pr_bidi_other_neutral.$(OBJEXT)
 test_pr_bidi_other_neutral_OBJECTS =  \
 	$(am_test_pr_bidi_other_neutral_OBJECTS)
-test_pr_bidi_other_neutral_LDADD = $(LDADD)
-test_pr_bidi_other_neutral_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_other_neutral_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_bidi_pdf_OBJECTS = unictype/test-pr_bidi_pdf.$(OBJEXT)
 test_pr_bidi_pdf_OBJECTS = $(am_test_pr_bidi_pdf_OBJECTS)
-test_pr_bidi_pdf_LDADD = $(LDADD)
-test_pr_bidi_pdf_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_pdf_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_bidi_segment_separator_OBJECTS =  \
 	unictype/test-pr_bidi_segment_separator.$(OBJEXT)
 test_pr_bidi_segment_separator_OBJECTS =  \
 	$(am_test_pr_bidi_segment_separator_OBJECTS)
-test_pr_bidi_segment_separator_LDADD = $(LDADD)
-test_pr_bidi_segment_separator_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_segment_separator_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_bidi_whitespace_OBJECTS =  \
 	unictype/test-pr_bidi_whitespace.$(OBJEXT)
 test_pr_bidi_whitespace_OBJECTS =  \
 	$(am_test_pr_bidi_whitespace_OBJECTS)
-test_pr_bidi_whitespace_LDADD = $(LDADD)
-test_pr_bidi_whitespace_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_bidi_whitespace_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_byname_OBJECTS = unictype/test-pr_byname.$(OBJEXT)
 test_pr_byname_OBJECTS = $(am_test_pr_byname_OBJECTS)
-test_pr_byname_LDADD = $(LDADD)
-test_pr_byname_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_byname_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_pr_case_ignorable_OBJECTS =  \
+	unictype/test-pr_case_ignorable.$(OBJEXT)
+test_pr_case_ignorable_OBJECTS = $(am_test_pr_case_ignorable_OBJECTS)
+test_pr_case_ignorable_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_pr_cased_OBJECTS = unictype/test-pr_cased.$(OBJEXT)
+test_pr_cased_OBJECTS = $(am_test_pr_cased_OBJECTS)
+test_pr_cased_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_pr_changes_when_casefolded_OBJECTS =  \
+	unictype/test-pr_changes_when_casefolded.$(OBJEXT)
+test_pr_changes_when_casefolded_OBJECTS =  \
+	$(am_test_pr_changes_when_casefolded_OBJECTS)
+test_pr_changes_when_casefolded_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_pr_changes_when_casemapped_OBJECTS =  \
+	unictype/test-pr_changes_when_casemapped.$(OBJEXT)
+test_pr_changes_when_casemapped_OBJECTS =  \
+	$(am_test_pr_changes_when_casemapped_OBJECTS)
+test_pr_changes_when_casemapped_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_pr_changes_when_lowercased_OBJECTS =  \
+	unictype/test-pr_changes_when_lowercased.$(OBJEXT)
+test_pr_changes_when_lowercased_OBJECTS =  \
+	$(am_test_pr_changes_when_lowercased_OBJECTS)
+test_pr_changes_when_lowercased_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_pr_changes_when_titlecased_OBJECTS =  \
+	unictype/test-pr_changes_when_titlecased.$(OBJEXT)
+test_pr_changes_when_titlecased_OBJECTS =  \
+	$(am_test_pr_changes_when_titlecased_OBJECTS)
+test_pr_changes_when_titlecased_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_pr_changes_when_uppercased_OBJECTS =  \
+	unictype/test-pr_changes_when_uppercased.$(OBJEXT)
+test_pr_changes_when_uppercased_OBJECTS =  \
+	$(am_test_pr_changes_when_uppercased_OBJECTS)
+test_pr_changes_when_uppercased_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_combining_OBJECTS = unictype/test-pr_combining.$(OBJEXT)
 test_pr_combining_OBJECTS = $(am_test_pr_combining_OBJECTS)
-test_pr_combining_LDADD = $(LDADD)
-test_pr_combining_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_combining_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_composite_OBJECTS = unictype/test-pr_composite.$(OBJEXT)
 test_pr_composite_OBJECTS = $(am_test_pr_composite_OBJECTS)
-test_pr_composite_LDADD = $(LDADD)
-test_pr_composite_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_composite_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_currency_symbol_OBJECTS =  \
 	unictype/test-pr_currency_symbol.$(OBJEXT)
 test_pr_currency_symbol_OBJECTS =  \
 	$(am_test_pr_currency_symbol_OBJECTS)
-test_pr_currency_symbol_LDADD = $(LDADD)
-test_pr_currency_symbol_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_currency_symbol_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_dash_OBJECTS = unictype/test-pr_dash.$(OBJEXT)
 test_pr_dash_OBJECTS = $(am_test_pr_dash_OBJECTS)
-test_pr_dash_LDADD = $(LDADD)
-test_pr_dash_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_dash_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_decimal_digit_OBJECTS =  \
 	unictype/test-pr_decimal_digit.$(OBJEXT)
 test_pr_decimal_digit_OBJECTS = $(am_test_pr_decimal_digit_OBJECTS)
-test_pr_decimal_digit_LDADD = $(LDADD)
-test_pr_decimal_digit_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_decimal_digit_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_default_ignorable_code_point_OBJECTS =  \
 	unictype/test-pr_default_ignorable_code_point.$(OBJEXT)
 test_pr_default_ignorable_code_point_OBJECTS =  \
 	$(am_test_pr_default_ignorable_code_point_OBJECTS)
-test_pr_default_ignorable_code_point_LDADD = $(LDADD)
-test_pr_default_ignorable_code_point_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_default_ignorable_code_point_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_2)
 am_test_pr_deprecated_OBJECTS = unictype/test-pr_deprecated.$(OBJEXT)
 test_pr_deprecated_OBJECTS = $(am_test_pr_deprecated_OBJECTS)
-test_pr_deprecated_LDADD = $(LDADD)
-test_pr_deprecated_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_deprecated_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_diacritic_OBJECTS = unictype/test-pr_diacritic.$(OBJEXT)
 test_pr_diacritic_OBJECTS = $(am_test_pr_diacritic_OBJECTS)
-test_pr_diacritic_LDADD = $(LDADD)
-test_pr_diacritic_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_diacritic_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_extender_OBJECTS = unictype/test-pr_extender.$(OBJEXT)
 test_pr_extender_OBJECTS = $(am_test_pr_extender_OBJECTS)
-test_pr_extender_LDADD = $(LDADD)
-test_pr_extender_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_extender_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_format_control_OBJECTS =  \
 	unictype/test-pr_format_control.$(OBJEXT)
 test_pr_format_control_OBJECTS = $(am_test_pr_format_control_OBJECTS)
-test_pr_format_control_LDADD = $(LDADD)
-test_pr_format_control_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_format_control_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_grapheme_base_OBJECTS =  \
 	unictype/test-pr_grapheme_base.$(OBJEXT)
 test_pr_grapheme_base_OBJECTS = $(am_test_pr_grapheme_base_OBJECTS)
-test_pr_grapheme_base_LDADD = $(LDADD)
-test_pr_grapheme_base_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_grapheme_base_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_grapheme_extend_OBJECTS =  \
 	unictype/test-pr_grapheme_extend.$(OBJEXT)
 test_pr_grapheme_extend_OBJECTS =  \
 	$(am_test_pr_grapheme_extend_OBJECTS)
-test_pr_grapheme_extend_LDADD = $(LDADD)
-test_pr_grapheme_extend_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_grapheme_extend_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_grapheme_link_OBJECTS =  \
 	unictype/test-pr_grapheme_link.$(OBJEXT)
 test_pr_grapheme_link_OBJECTS = $(am_test_pr_grapheme_link_OBJECTS)
-test_pr_grapheme_link_LDADD = $(LDADD)
-test_pr_grapheme_link_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_grapheme_link_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_hex_digit_OBJECTS = unictype/test-pr_hex_digit.$(OBJEXT)
 test_pr_hex_digit_OBJECTS = $(am_test_pr_hex_digit_OBJECTS)
-test_pr_hex_digit_LDADD = $(LDADD)
-test_pr_hex_digit_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_hex_digit_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_hyphen_OBJECTS = unictype/test-pr_hyphen.$(OBJEXT)
 test_pr_hyphen_OBJECTS = $(am_test_pr_hyphen_OBJECTS)
-test_pr_hyphen_LDADD = $(LDADD)
-test_pr_hyphen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_hyphen_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_id_continue_OBJECTS =  \
 	unictype/test-pr_id_continue.$(OBJEXT)
 test_pr_id_continue_OBJECTS = $(am_test_pr_id_continue_OBJECTS)
-test_pr_id_continue_LDADD = $(LDADD)
-test_pr_id_continue_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_id_continue_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_id_start_OBJECTS = unictype/test-pr_id_start.$(OBJEXT)
 test_pr_id_start_OBJECTS = $(am_test_pr_id_start_OBJECTS)
-test_pr_id_start_LDADD = $(LDADD)
-test_pr_id_start_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_id_start_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_ideographic_OBJECTS =  \
 	unictype/test-pr_ideographic.$(OBJEXT)
 test_pr_ideographic_OBJECTS = $(am_test_pr_ideographic_OBJECTS)
-test_pr_ideographic_LDADD = $(LDADD)
-test_pr_ideographic_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_ideographic_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_ids_binary_operator_OBJECTS =  \
 	unictype/test-pr_ids_binary_operator.$(OBJEXT)
 test_pr_ids_binary_operator_OBJECTS =  \
 	$(am_test_pr_ids_binary_operator_OBJECTS)
-test_pr_ids_binary_operator_LDADD = $(LDADD)
-test_pr_ids_binary_operator_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_ids_binary_operator_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_ids_trinary_operator_OBJECTS =  \
 	unictype/test-pr_ids_trinary_operator.$(OBJEXT)
 test_pr_ids_trinary_operator_OBJECTS =  \
 	$(am_test_pr_ids_trinary_operator_OBJECTS)
-test_pr_ids_trinary_operator_LDADD = $(LDADD)
-test_pr_ids_trinary_operator_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_ids_trinary_operator_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_ignorable_control_OBJECTS =  \
 	unictype/test-pr_ignorable_control.$(OBJEXT)
 test_pr_ignorable_control_OBJECTS =  \
 	$(am_test_pr_ignorable_control_OBJECTS)
-test_pr_ignorable_control_LDADD = $(LDADD)
-test_pr_ignorable_control_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_ignorable_control_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_iso_control_OBJECTS =  \
 	unictype/test-pr_iso_control.$(OBJEXT)
 test_pr_iso_control_OBJECTS = $(am_test_pr_iso_control_OBJECTS)
-test_pr_iso_control_LDADD = $(LDADD)
-test_pr_iso_control_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_iso_control_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_join_control_OBJECTS =  \
 	unictype/test-pr_join_control.$(OBJEXT)
 test_pr_join_control_OBJECTS = $(am_test_pr_join_control_OBJECTS)
-test_pr_join_control_LDADD = $(LDADD)
-test_pr_join_control_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_join_control_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_left_of_pair_OBJECTS =  \
 	unictype/test-pr_left_of_pair.$(OBJEXT)
 test_pr_left_of_pair_OBJECTS = $(am_test_pr_left_of_pair_OBJECTS)
-test_pr_left_of_pair_LDADD = $(LDADD)
-test_pr_left_of_pair_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_left_of_pair_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_line_separator_OBJECTS =  \
 	unictype/test-pr_line_separator.$(OBJEXT)
 test_pr_line_separator_OBJECTS = $(am_test_pr_line_separator_OBJECTS)
-test_pr_line_separator_LDADD = $(LDADD)
-test_pr_line_separator_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_line_separator_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_logical_order_exception_OBJECTS =  \
 	unictype/test-pr_logical_order_exception.$(OBJEXT)
 test_pr_logical_order_exception_OBJECTS =  \
 	$(am_test_pr_logical_order_exception_OBJECTS)
-test_pr_logical_order_exception_LDADD = $(LDADD)
-test_pr_logical_order_exception_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_logical_order_exception_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_lowercase_OBJECTS = unictype/test-pr_lowercase.$(OBJEXT)
 test_pr_lowercase_OBJECTS = $(am_test_pr_lowercase_OBJECTS)
-test_pr_lowercase_LDADD = $(LDADD)
-test_pr_lowercase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_lowercase_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_math_OBJECTS = unictype/test-pr_math.$(OBJEXT)
 test_pr_math_OBJECTS = $(am_test_pr_math_OBJECTS)
-test_pr_math_LDADD = $(LDADD)
-test_pr_math_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_math_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_non_break_OBJECTS = unictype/test-pr_non_break.$(OBJEXT)
 test_pr_non_break_OBJECTS = $(am_test_pr_non_break_OBJECTS)
-test_pr_non_break_LDADD = $(LDADD)
-test_pr_non_break_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_non_break_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_not_a_character_OBJECTS =  \
 	unictype/test-pr_not_a_character.$(OBJEXT)
 test_pr_not_a_character_OBJECTS =  \
 	$(am_test_pr_not_a_character_OBJECTS)
-test_pr_not_a_character_LDADD = $(LDADD)
-test_pr_not_a_character_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_not_a_character_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_numeric_OBJECTS = unictype/test-pr_numeric.$(OBJEXT)
 test_pr_numeric_OBJECTS = $(am_test_pr_numeric_OBJECTS)
-test_pr_numeric_LDADD = $(LDADD)
-test_pr_numeric_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_numeric_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_other_alphabetic_OBJECTS =  \
 	unictype/test-pr_other_alphabetic.$(OBJEXT)
 test_pr_other_alphabetic_OBJECTS =  \
 	$(am_test_pr_other_alphabetic_OBJECTS)
-test_pr_other_alphabetic_LDADD = $(LDADD)
-test_pr_other_alphabetic_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_other_alphabetic_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_other_default_ignorable_code_point_OBJECTS =  \
 	unictype/test-pr_other_default_ignorable_code_point.$(OBJEXT)
 test_pr_other_default_ignorable_code_point_OBJECTS =  \
 	$(am_test_pr_other_default_ignorable_code_point_OBJECTS)
-test_pr_other_default_ignorable_code_point_LDADD = $(LDADD)
-test_pr_other_default_ignorable_code_point_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_other_default_ignorable_code_point_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_2)
 am_test_pr_other_grapheme_extend_OBJECTS =  \
 	unictype/test-pr_other_grapheme_extend.$(OBJEXT)
 test_pr_other_grapheme_extend_OBJECTS =  \
 	$(am_test_pr_other_grapheme_extend_OBJECTS)
-test_pr_other_grapheme_extend_LDADD = $(LDADD)
-test_pr_other_grapheme_extend_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_other_grapheme_extend_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_other_id_continue_OBJECTS =  \
 	unictype/test-pr_other_id_continue.$(OBJEXT)
 test_pr_other_id_continue_OBJECTS =  \
 	$(am_test_pr_other_id_continue_OBJECTS)
-test_pr_other_id_continue_LDADD = $(LDADD)
-test_pr_other_id_continue_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_other_id_continue_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_other_id_start_OBJECTS =  \
 	unictype/test-pr_other_id_start.$(OBJEXT)
 test_pr_other_id_start_OBJECTS = $(am_test_pr_other_id_start_OBJECTS)
-test_pr_other_id_start_LDADD = $(LDADD)
-test_pr_other_id_start_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_other_id_start_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_other_lowercase_OBJECTS =  \
 	unictype/test-pr_other_lowercase.$(OBJEXT)
 test_pr_other_lowercase_OBJECTS =  \
 	$(am_test_pr_other_lowercase_OBJECTS)
-test_pr_other_lowercase_LDADD = $(LDADD)
-test_pr_other_lowercase_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_other_lowercase_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_other_math_OBJECTS = unictype/test-pr_other_math.$(OBJEXT)
 test_pr_other_math_OBJECTS = $(am_test_pr_other_math_OBJECTS)
-test_pr_other_math_LDADD = $(LDADD)
-test_pr_other_math_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_other_math_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_other_uppercase_OBJECTS =  \
 	unictype/test-pr_other_uppercase.$(OBJEXT)
 test_pr_other_uppercase_OBJECTS =  \
 	$(am_test_pr_other_uppercase_OBJECTS)
-test_pr_other_uppercase_LDADD = $(LDADD)
-test_pr_other_uppercase_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_other_uppercase_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_paired_punctuation_OBJECTS =  \
 	unictype/test-pr_paired_punctuation.$(OBJEXT)
 test_pr_paired_punctuation_OBJECTS =  \
 	$(am_test_pr_paired_punctuation_OBJECTS)
-test_pr_paired_punctuation_LDADD = $(LDADD)
-test_pr_paired_punctuation_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_paired_punctuation_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_paragraph_separator_OBJECTS =  \
 	unictype/test-pr_paragraph_separator.$(OBJEXT)
 test_pr_paragraph_separator_OBJECTS =  \
 	$(am_test_pr_paragraph_separator_OBJECTS)
-test_pr_paragraph_separator_LDADD = $(LDADD)
-test_pr_paragraph_separator_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_paragraph_separator_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_pattern_syntax_OBJECTS =  \
 	unictype/test-pr_pattern_syntax.$(OBJEXT)
 test_pr_pattern_syntax_OBJECTS = $(am_test_pr_pattern_syntax_OBJECTS)
-test_pr_pattern_syntax_LDADD = $(LDADD)
-test_pr_pattern_syntax_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_pattern_syntax_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_pattern_white_space_OBJECTS =  \
 	unictype/test-pr_pattern_white_space.$(OBJEXT)
 test_pr_pattern_white_space_OBJECTS =  \
 	$(am_test_pr_pattern_white_space_OBJECTS)
-test_pr_pattern_white_space_LDADD = $(LDADD)
-test_pr_pattern_white_space_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_pattern_white_space_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_private_use_OBJECTS =  \
 	unictype/test-pr_private_use.$(OBJEXT)
 test_pr_private_use_OBJECTS = $(am_test_pr_private_use_OBJECTS)
-test_pr_private_use_LDADD = $(LDADD)
-test_pr_private_use_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_private_use_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_punctuation_OBJECTS =  \
 	unictype/test-pr_punctuation.$(OBJEXT)
 test_pr_punctuation_OBJECTS = $(am_test_pr_punctuation_OBJECTS)
-test_pr_punctuation_LDADD = $(LDADD)
-test_pr_punctuation_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_punctuation_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_quotation_mark_OBJECTS =  \
 	unictype/test-pr_quotation_mark.$(OBJEXT)
 test_pr_quotation_mark_OBJECTS = $(am_test_pr_quotation_mark_OBJECTS)
-test_pr_quotation_mark_LDADD = $(LDADD)
-test_pr_quotation_mark_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_quotation_mark_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_radical_OBJECTS = unictype/test-pr_radical.$(OBJEXT)
 test_pr_radical_OBJECTS = $(am_test_pr_radical_OBJECTS)
-test_pr_radical_LDADD = $(LDADD)
-test_pr_radical_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_radical_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_sentence_terminal_OBJECTS =  \
 	unictype/test-pr_sentence_terminal.$(OBJEXT)
 test_pr_sentence_terminal_OBJECTS =  \
 	$(am_test_pr_sentence_terminal_OBJECTS)
-test_pr_sentence_terminal_LDADD = $(LDADD)
-test_pr_sentence_terminal_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_sentence_terminal_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_soft_dotted_OBJECTS =  \
 	unictype/test-pr_soft_dotted.$(OBJEXT)
 test_pr_soft_dotted_OBJECTS = $(am_test_pr_soft_dotted_OBJECTS)
-test_pr_soft_dotted_LDADD = $(LDADD)
-test_pr_soft_dotted_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_soft_dotted_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_space_OBJECTS = unictype/test-pr_space.$(OBJEXT)
 test_pr_space_OBJECTS = $(am_test_pr_space_OBJECTS)
-test_pr_space_LDADD = $(LDADD)
-test_pr_space_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_space_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_terminal_punctuation_OBJECTS =  \
 	unictype/test-pr_terminal_punctuation.$(OBJEXT)
 test_pr_terminal_punctuation_OBJECTS =  \
 	$(am_test_pr_terminal_punctuation_OBJECTS)
-test_pr_terminal_punctuation_LDADD = $(LDADD)
-test_pr_terminal_punctuation_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_terminal_punctuation_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_test_OBJECTS = unictype/test-pr_test.$(OBJEXT)
 test_pr_test_OBJECTS = $(am_test_pr_test_OBJECTS)
-test_pr_test_LDADD = $(LDADD)
-test_pr_test_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_titlecase_OBJECTS = unictype/test-pr_titlecase.$(OBJEXT)
 test_pr_titlecase_OBJECTS = $(am_test_pr_titlecase_OBJECTS)
-test_pr_titlecase_LDADD = $(LDADD)
-test_pr_titlecase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_titlecase_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_unassigned_code_value_OBJECTS =  \
 	unictype/test-pr_unassigned_code_value.$(OBJEXT)
 test_pr_unassigned_code_value_OBJECTS =  \
 	$(am_test_pr_unassigned_code_value_OBJECTS)
-test_pr_unassigned_code_value_LDADD = $(LDADD)
-test_pr_unassigned_code_value_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_unassigned_code_value_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_unified_ideograph_OBJECTS =  \
 	unictype/test-pr_unified_ideograph.$(OBJEXT)
 test_pr_unified_ideograph_OBJECTS =  \
 	$(am_test_pr_unified_ideograph_OBJECTS)
-test_pr_unified_ideograph_LDADD = $(LDADD)
-test_pr_unified_ideograph_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_unified_ideograph_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_uppercase_OBJECTS = unictype/test-pr_uppercase.$(OBJEXT)
 test_pr_uppercase_OBJECTS = $(am_test_pr_uppercase_OBJECTS)
-test_pr_uppercase_LDADD = $(LDADD)
-test_pr_uppercase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_uppercase_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_variation_selector_OBJECTS =  \
 	unictype/test-pr_variation_selector.$(OBJEXT)
 test_pr_variation_selector_OBJECTS =  \
 	$(am_test_pr_variation_selector_OBJECTS)
-test_pr_variation_selector_LDADD = $(LDADD)
-test_pr_variation_selector_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_pr_variation_selector_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_white_space_OBJECTS =  \
 	unictype/test-pr_white_space.$(OBJEXT)
 test_pr_white_space_OBJECTS = $(am_test_pr_white_space_OBJECTS)
-test_pr_white_space_LDADD = $(LDADD)
-test_pr_white_space_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_white_space_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_xid_continue_OBJECTS =  \
 	unictype/test-pr_xid_continue.$(OBJEXT)
 test_pr_xid_continue_OBJECTS = $(am_test_pr_xid_continue_OBJECTS)
-test_pr_xid_continue_LDADD = $(LDADD)
-test_pr_xid_continue_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_xid_continue_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_xid_start_OBJECTS = unictype/test-pr_xid_start.$(OBJEXT)
 test_pr_xid_start_OBJECTS = $(am_test_pr_xid_start_OBJECTS)
-test_pr_xid_start_LDADD = $(LDADD)
-test_pr_xid_start_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_xid_start_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_zero_width_OBJECTS = unictype/test-pr_zero_width.$(OBJEXT)
 test_pr_zero_width_OBJECTS = $(am_test_pr_zero_width_OBJECTS)
-test_pr_zero_width_LDADD = $(LDADD)
-test_pr_zero_width_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_pr_zero_width_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_printf_frexp_SOURCES = test-printf-frexp.c
 test_printf_frexp_OBJECTS = test-printf-frexp.$(OBJEXT)
 test_printf_frexp_LDADD = $(LDADD)
@@ -1676,19 +1696,32 @@ test_printf_frexpl_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
 am_test_scripts_OBJECTS = unictype/test-scripts.$(OBJEXT)
 test_scripts_OBJECTS = $(am_test_scripts_OBJECTS)
-test_scripts_LDADD = $(LDADD)
-test_scripts_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_scripts_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_setenv_SOURCES = test-setenv.c
 test_setenv_OBJECTS = test-setenv.$(OBJEXT)
 test_setenv_LDADD = $(LDADD)
 test_setenv_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_setlocale1_SOURCES = test-setlocale1.c
+test_setlocale1_OBJECTS = test-setlocale1.$(OBJEXT)
+test_setlocale1_LDADD = $(LDADD)
+test_setlocale1_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+test_setlocale2_SOURCES = test-setlocale2.c
+test_setlocale2_OBJECTS = test-setlocale2.$(OBJEXT)
+test_setlocale2_LDADD = $(LDADD)
+test_setlocale2_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 test_signbit_SOURCES = test-signbit.c
 test_signbit_OBJECTS = test-signbit.$(OBJEXT)
 test_signbit_LDADD = $(LDADD)
 test_signbit_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_stdalign_SOURCES = test-stdalign.c
+test_stdalign_OBJECTS = test-stdalign.$(OBJEXT)
+test_stdalign_LDADD = $(LDADD)
+test_stdalign_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 test_stdbool_SOURCES = test-stdbool.c
 test_stdbool_OBJECTS = test-stdbool.$(OBJEXT)
 test_stdbool_LDADD = $(LDADD)
@@ -1704,6 +1737,11 @@ test_stdint_OBJECTS = test-stdint.$(OBJEXT)
 test_stdint_LDADD = $(LDADD)
 test_stdint_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_stdio_SOURCES = test-stdio.c
+test_stdio_OBJECTS = test-stdio.$(OBJEXT)
+test_stdio_LDADD = $(LDADD)
+test_stdio_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
+	$(am__DEPENDENCIES_1)
 test_stdlib_SOURCES = test-stdlib.c
 test_stdlib_OBJECTS = test-stdlib.$(OBJEXT)
 test_stdlib_LDADD = $(LDADD)
@@ -1730,66 +1768,62 @@ test_strncat_OBJECTS = test-strncat.$(OBJEXT)
 test_strncat_LDADD = $(LDADD)
 test_strncat_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_strstr_SOURCES = test-strstr.c
+test_strstr_OBJECTS = test-strstr.$(OBJEXT)
+test_strstr_LDADD = $(LDADD)
+test_strstr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_sy_c_ident_OBJECTS = unictype/test-sy_c_ident.$(OBJEXT)
 test_sy_c_ident_OBJECTS = $(am_test_sy_c_ident_OBJECTS)
-test_sy_c_ident_LDADD = $(LDADD)
-test_sy_c_ident_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_sy_c_ident_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_sy_c_whitespace_OBJECTS =  \
 	unictype/test-sy_c_whitespace.$(OBJEXT)
 test_sy_c_whitespace_OBJECTS = $(am_test_sy_c_whitespace_OBJECTS)
-test_sy_c_whitespace_LDADD = $(LDADD)
-test_sy_c_whitespace_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_sy_c_whitespace_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_sy_java_ident_OBJECTS = unictype/test-sy_java_ident.$(OBJEXT)
 test_sy_java_ident_OBJECTS = $(am_test_sy_java_ident_OBJECTS)
-test_sy_java_ident_LDADD = $(LDADD)
-test_sy_java_ident_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_sy_java_ident_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_sy_java_whitespace_OBJECTS =  \
 	unictype/test-sy_java_whitespace.$(OBJEXT)
 test_sy_java_whitespace_OBJECTS =  \
 	$(am_test_sy_java_whitespace_OBJECTS)
-test_sy_java_whitespace_LDADD = $(LDADD)
-test_sy_java_whitespace_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_sy_java_whitespace_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_sys_types_SOURCES = test-sys_types.c
+test_sys_types_OBJECTS = test-sys_types.$(OBJEXT)
+test_sys_types_LDADD = $(LDADD)
+test_sys_types_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+test_thread_create_SOURCES = test-thread_create.c
+test_thread_create_OBJECTS = test-thread_create.$(OBJEXT)
+test_thread_create_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_thread_self_SOURCES = test-thread_self.c
+test_thread_self_OBJECTS = test-thread_self.$(OBJEXT)
+test_thread_self_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_asnprintf1_OBJECTS =  \
 	unistdio/test-u16-asnprintf1.$(OBJEXT)
 test_u16_asnprintf1_OBJECTS = $(am_test_u16_asnprintf1_OBJECTS)
 test_u16_asnprintf1_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_casecmp_OBJECTS = unicase/test-u16-casecmp.$(OBJEXT)
 test_u16_casecmp_OBJECTS = $(am_test_u16_casecmp_OBJECTS)
-test_u16_casecmp_LDADD = $(LDADD)
-test_u16_casecmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_casecmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_casecoll_OBJECTS = unicase/test-u16-casecoll.$(OBJEXT)
 test_u16_casecoll_OBJECTS = $(am_test_u16_casecoll_OBJECTS)
 test_u16_casecoll_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_casefold_OBJECTS = unicase/test-u16-casefold.$(OBJEXT)
 test_u16_casefold_OBJECTS = $(am_test_u16_casefold_OBJECTS)
-test_u16_casefold_LDADD = $(LDADD)
-test_u16_casefold_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_casefold_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_check_OBJECTS = unistr/test-u16-check.$(OBJEXT)
 test_u16_check_OBJECTS = $(am_test_u16_check_OBJECTS)
-test_u16_check_LDADD = $(LDADD)
-test_u16_check_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_check_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_chr_OBJECTS = unistr/test-u16-chr.$(OBJEXT)
 test_u16_chr_OBJECTS = $(am_test_u16_chr_OBJECTS)
-test_u16_chr_LDADD = $(LDADD)
-test_u16_chr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_chr_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_cmp_OBJECTS = unistr/test-u16-cmp.$(OBJEXT)
 test_u16_cmp_OBJECTS = $(am_test_u16_cmp_OBJECTS)
-test_u16_cmp_LDADD = $(LDADD)
-test_u16_cmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_cmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_cmp2_OBJECTS = unistr/test-u16-cmp2.$(OBJEXT)
 test_u16_cmp2_OBJECTS = $(am_test_u16_cmp2_OBJECTS)
-test_u16_cmp2_LDADD = $(LDADD)
-test_u16_cmp2_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_cmp2_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_conv_from_enc_OBJECTS =  \
 	uniconv/test-u16-conv-from-enc.$(OBJEXT)
 test_u16_conv_from_enc_OBJECTS = $(am_test_u16_conv_from_enc_OBJECTS)
@@ -1800,84 +1834,67 @@ test_u16_conv_to_enc_OBJECTS = $(am_test_u16_conv_to_enc_OBJECTS)
 test_u16_conv_to_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_cpy_OBJECTS = unistr/test-u16-cpy.$(OBJEXT)
 test_u16_cpy_OBJECTS = $(am_test_u16_cpy_OBJECTS)
-test_u16_cpy_LDADD = $(LDADD)
-test_u16_cpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_cpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_cpy_alloc_OBJECTS = unistr/test-u16-cpy-alloc.$(OBJEXT)
 test_u16_cpy_alloc_OBJECTS = $(am_test_u16_cpy_alloc_OBJECTS)
-test_u16_cpy_alloc_LDADD = $(LDADD)
-test_u16_cpy_alloc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_cpy_alloc_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u16_grapheme_breaks_OBJECTS =  \
+	unigbrk/test-u16-grapheme-breaks.$(OBJEXT)
+test_u16_grapheme_breaks_OBJECTS =  \
+	$(am_test_u16_grapheme_breaks_OBJECTS)
+test_u16_grapheme_breaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u16_grapheme_next_OBJECTS =  \
+	unigbrk/test-u16-grapheme-next.$(OBJEXT)
+test_u16_grapheme_next_OBJECTS = $(am_test_u16_grapheme_next_OBJECTS)
+test_u16_grapheme_next_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u16_grapheme_prev_OBJECTS =  \
+	unigbrk/test-u16-grapheme-prev.$(OBJEXT)
+test_u16_grapheme_prev_OBJECTS = $(am_test_u16_grapheme_prev_OBJECTS)
+test_u16_grapheme_prev_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_is_cased_OBJECTS = unicase/test-u16-is-cased.$(OBJEXT)
 test_u16_is_cased_OBJECTS = $(am_test_u16_is_cased_OBJECTS)
-test_u16_is_cased_LDADD = $(LDADD)
-test_u16_is_cased_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_is_cased_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_is_casefolded_OBJECTS =  \
 	unicase/test-u16-is-casefolded.$(OBJEXT)
 test_u16_is_casefolded_OBJECTS = $(am_test_u16_is_casefolded_OBJECTS)
-test_u16_is_casefolded_LDADD = $(LDADD)
-test_u16_is_casefolded_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_u16_is_casefolded_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_is_lowercase_OBJECTS =  \
 	unicase/test-u16-is-lowercase.$(OBJEXT)
 test_u16_is_lowercase_OBJECTS = $(am_test_u16_is_lowercase_OBJECTS)
-test_u16_is_lowercase_LDADD = $(LDADD)
-test_u16_is_lowercase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_is_lowercase_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_is_titlecase_OBJECTS =  \
 	unicase/test-u16-is-titlecase.$(OBJEXT)
 test_u16_is_titlecase_OBJECTS = $(am_test_u16_is_titlecase_OBJECTS)
-test_u16_is_titlecase_LDADD = $(LDADD)
-test_u16_is_titlecase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_is_titlecase_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_is_uppercase_OBJECTS =  \
 	unicase/test-u16-is-uppercase.$(OBJEXT)
 test_u16_is_uppercase_OBJECTS = $(am_test_u16_is_uppercase_OBJECTS)
-test_u16_is_uppercase_LDADD = $(LDADD)
-test_u16_is_uppercase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_is_uppercase_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_mblen_OBJECTS = unistr/test-u16-mblen.$(OBJEXT)
 test_u16_mblen_OBJECTS = $(am_test_u16_mblen_OBJECTS)
-test_u16_mblen_LDADD = $(LDADD)
-test_u16_mblen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_mblen_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_mbsnlen_OBJECTS = unistr/test-u16-mbsnlen.$(OBJEXT)
 test_u16_mbsnlen_OBJECTS = $(am_test_u16_mbsnlen_OBJECTS)
-test_u16_mbsnlen_LDADD = $(LDADD)
-test_u16_mbsnlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_mbsnlen_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_mbtouc_OBJECTS = unistr/test-u16-mbtouc.$(OBJEXT)
 test_u16_mbtouc_OBJECTS = $(am_test_u16_mbtouc_OBJECTS)
-test_u16_mbtouc_LDADD = $(LDADD)
-test_u16_mbtouc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_mbtouc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_mbtouc_unsafe_OBJECTS =  \
 	unistr/test-u16-mbtouc-unsafe.$(OBJEXT)
 test_u16_mbtouc_unsafe_OBJECTS = $(am_test_u16_mbtouc_unsafe_OBJECTS)
-test_u16_mbtouc_unsafe_LDADD = $(LDADD)
-test_u16_mbtouc_unsafe_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_u16_mbtouc_unsafe_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_mbtoucr_OBJECTS = unistr/test-u16-mbtoucr.$(OBJEXT)
 test_u16_mbtoucr_OBJECTS = $(am_test_u16_mbtoucr_OBJECTS)
-test_u16_mbtoucr_LDADD = $(LDADD)
-test_u16_mbtoucr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_mbtoucr_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_move_OBJECTS = unistr/test-u16-move.$(OBJEXT)
 test_u16_move_OBJECTS = $(am_test_u16_move_OBJECTS)
-test_u16_move_LDADD = $(LDADD)
-test_u16_move_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_move_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_next_OBJECTS = unistr/test-u16-next.$(OBJEXT)
 test_u16_next_OBJECTS = $(am_test_u16_next_OBJECTS)
-test_u16_next_LDADD = $(LDADD)
-test_u16_next_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_next_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_normcmp_OBJECTS = uninorm/test-u16-normcmp.$(OBJEXT)
 test_u16_normcmp_OBJECTS = $(am_test_u16_normcmp_OBJECTS)
-test_u16_normcmp_LDADD = $(LDADD)
-test_u16_normcmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_normcmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_normcoll_OBJECTS = uninorm/test-u16-normcoll.$(OBJEXT)
 test_u16_normcoll_OBJECTS = $(am_test_u16_normcoll_OBJECTS)
 test_u16_normcoll_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -1885,39 +1902,28 @@ am_test_u16_possible_linebreaks_OBJECTS =  \
 	unilbrk/test-u16-possible-linebreaks.$(OBJEXT)
 test_u16_possible_linebreaks_OBJECTS =  \
 	$(am_test_u16_possible_linebreaks_OBJECTS)
-test_u16_possible_linebreaks_LDADD = $(LDADD)
-test_u16_possible_linebreaks_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_u16_possible_linebreaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_prev_OBJECTS = unistr/test-u16-prev.$(OBJEXT)
 test_u16_prev_OBJECTS = $(am_test_u16_prev_OBJECTS)
-test_u16_prev_LDADD = $(LDADD)
-test_u16_prev_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_prev_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_set_OBJECTS = unistr/test-u16-set.$(OBJEXT)
 test_u16_set_OBJECTS = $(am_test_u16_set_OBJECTS)
-test_u16_set_LDADD = $(LDADD)
-test_u16_set_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_set_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_stpcpy_OBJECTS = unistr/test-u16-stpcpy.$(OBJEXT)
 test_u16_stpcpy_OBJECTS = $(am_test_u16_stpcpy_OBJECTS)
-test_u16_stpcpy_LDADD = $(LDADD)
-test_u16_stpcpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_stpcpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_stpncpy_OBJECTS = unistr/test-u16-stpncpy.$(OBJEXT)
 test_u16_stpncpy_OBJECTS = $(am_test_u16_stpncpy_OBJECTS)
-test_u16_stpncpy_LDADD = $(LDADD)
-test_u16_stpncpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_stpncpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_strcat_OBJECTS = unistr/test-u16-strcat.$(OBJEXT)
 test_u16_strcat_OBJECTS = $(am_test_u16_strcat_OBJECTS)
-test_u16_strcat_LDADD = $(LDADD)
-test_u16_strcat_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_strcat_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u16_strchr_OBJECTS = unistr/test-u16-strchr.$(OBJEXT)
+test_u16_strchr_OBJECTS = $(am_test_u16_strchr_OBJECTS)
+test_u16_strchr_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_strcmp_OBJECTS = unistr/test-u16-strcmp.$(OBJEXT)
 test_u16_strcmp_OBJECTS = $(am_test_u16_strcmp_OBJECTS)
-test_u16_strcmp_LDADD = $(LDADD)
-test_u16_strcmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_strcmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_strcoll_OBJECTS = unistr/test-u16-strcoll.$(OBJEXT)
 test_u16_strcoll_OBJECTS = $(am_test_u16_strcoll_OBJECTS)
 test_u16_strcoll_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -1933,84 +1939,58 @@ test_u16_strconv_to_enc_OBJECTS =  \
 test_u16_strconv_to_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_strcpy_OBJECTS = unistr/test-u16-strcpy.$(OBJEXT)
 test_u16_strcpy_OBJECTS = $(am_test_u16_strcpy_OBJECTS)
-test_u16_strcpy_LDADD = $(LDADD)
-test_u16_strcpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_strcpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_strdup_OBJECTS = unistr/test-u16-strdup.$(OBJEXT)
 test_u16_strdup_OBJECTS = $(am_test_u16_strdup_OBJECTS)
-test_u16_strdup_LDADD = $(LDADD)
-test_u16_strdup_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_strdup_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_strlen_OBJECTS = unistr/test-u16-strlen.$(OBJEXT)
 test_u16_strlen_OBJECTS = $(am_test_u16_strlen_OBJECTS)
-test_u16_strlen_LDADD = $(LDADD)
-test_u16_strlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_strlen_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_strmblen_OBJECTS = unistr/test-u16-strmblen.$(OBJEXT)
 test_u16_strmblen_OBJECTS = $(am_test_u16_strmblen_OBJECTS)
-test_u16_strmblen_LDADD = $(LDADD)
-test_u16_strmblen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_strmblen_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_strmbtouc_OBJECTS = unistr/test-u16-strmbtouc.$(OBJEXT)
 test_u16_strmbtouc_OBJECTS = $(am_test_u16_strmbtouc_OBJECTS)
-test_u16_strmbtouc_LDADD = $(LDADD)
-test_u16_strmbtouc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_strmbtouc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_strncat_OBJECTS = unistr/test-u16-strncat.$(OBJEXT)
 test_u16_strncat_OBJECTS = $(am_test_u16_strncat_OBJECTS)
-test_u16_strncat_LDADD = $(LDADD)
-test_u16_strncat_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_strncat_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_strncmp_OBJECTS = unistr/test-u16-strncmp.$(OBJEXT)
 test_u16_strncmp_OBJECTS = $(am_test_u16_strncmp_OBJECTS)
-test_u16_strncmp_LDADD = $(LDADD)
-test_u16_strncmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_strncmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_strncpy_OBJECTS = unistr/test-u16-strncpy.$(OBJEXT)
 test_u16_strncpy_OBJECTS = $(am_test_u16_strncpy_OBJECTS)
-test_u16_strncpy_LDADD = $(LDADD)
-test_u16_strncpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_strncpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_strnlen_OBJECTS = unistr/test-u16-strnlen.$(OBJEXT)
 test_u16_strnlen_OBJECTS = $(am_test_u16_strnlen_OBJECTS)
-test_u16_strnlen_LDADD = $(LDADD)
-test_u16_strnlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_strnlen_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u16_strstr_OBJECTS = unistr/test-u16-strstr.$(OBJEXT)
+test_u16_strstr_OBJECTS = $(am_test_u16_strstr_OBJECTS)
+test_u16_strstr_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u16_strtok_OBJECTS = unistr/test-u16-strtok.$(OBJEXT)
+test_u16_strtok_OBJECTS = $(am_test_u16_strtok_OBJECTS)
+test_u16_strtok_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_strwidth_OBJECTS = uniwidth/test-u16-strwidth.$(OBJEXT)
 test_u16_strwidth_OBJECTS = $(am_test_u16_strwidth_OBJECTS)
-test_u16_strwidth_LDADD = $(LDADD)
-test_u16_strwidth_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_strwidth_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_to_u32_OBJECTS = unistr/test-u16-to-u32.$(OBJEXT)
 test_u16_to_u32_OBJECTS = $(am_test_u16_to_u32_OBJECTS)
-test_u16_to_u32_LDADD = $(LDADD)
-test_u16_to_u32_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_to_u32_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_to_u8_OBJECTS = unistr/test-u16-to-u8.$(OBJEXT)
 test_u16_to_u8_OBJECTS = $(am_test_u16_to_u8_OBJECTS)
-test_u16_to_u8_LDADD = $(LDADD)
-test_u16_to_u8_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_to_u8_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_tolower_OBJECTS = unicase/test-u16-tolower.$(OBJEXT)
 test_u16_tolower_OBJECTS = $(am_test_u16_tolower_OBJECTS)
-test_u16_tolower_LDADD = $(LDADD)
-test_u16_tolower_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_tolower_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_totitle_OBJECTS = unicase/test-u16-totitle.$(OBJEXT)
 test_u16_totitle_OBJECTS = $(am_test_u16_totitle_OBJECTS)
-test_u16_totitle_LDADD = $(LDADD)
-test_u16_totitle_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_totitle_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_toupper_OBJECTS = unicase/test-u16-toupper.$(OBJEXT)
 test_u16_toupper_OBJECTS = $(am_test_u16_toupper_OBJECTS)
-test_u16_toupper_LDADD = $(LDADD)
-test_u16_toupper_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_toupper_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_uctomb_OBJECTS = unistr/test-u16-uctomb.$(OBJEXT)
 test_u16_uctomb_OBJECTS = $(am_test_u16_uctomb_OBJECTS)
-test_u16_uctomb_LDADD = $(LDADD)
-test_u16_uctomb_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_uctomb_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_vasnprintf1_OBJECTS =  \
 	unistdio/test-u16-vasnprintf1.$(OBJEXT)
 test_u16_vasnprintf1_OBJECTS = $(am_test_u16_vasnprintf1_OBJECTS)
@@ -2036,59 +2016,41 @@ test_u16_vsprintf1_OBJECTS = $(am_test_u16_vsprintf1_OBJECTS)
 test_u16_vsprintf1_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_width_OBJECTS = uniwidth/test-u16-width.$(OBJEXT)
 test_u16_width_OBJECTS = $(am_test_u16_width_OBJECTS)
-test_u16_width_LDADD = $(LDADD)
-test_u16_width_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_width_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_width_linebreaks_OBJECTS =  \
 	unilbrk/test-u16-width-linebreaks.$(OBJEXT)
 test_u16_width_linebreaks_OBJECTS =  \
 	$(am_test_u16_width_linebreaks_OBJECTS)
-test_u16_width_linebreaks_LDADD = $(LDADD)
-test_u16_width_linebreaks_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_u16_width_linebreaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_wordbreaks_OBJECTS =  \
 	uniwbrk/test-u16-wordbreaks.$(OBJEXT)
 test_u16_wordbreaks_OBJECTS = $(am_test_u16_wordbreaks_OBJECTS)
-test_u16_wordbreaks_LDADD = $(LDADD)
-test_u16_wordbreaks_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u16_wordbreaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_asnprintf1_OBJECTS =  \
 	unistdio/test-u32-asnprintf1.$(OBJEXT)
 test_u32_asnprintf1_OBJECTS = $(am_test_u32_asnprintf1_OBJECTS)
 test_u32_asnprintf1_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_casecmp_OBJECTS = unicase/test-u32-casecmp.$(OBJEXT)
 test_u32_casecmp_OBJECTS = $(am_test_u32_casecmp_OBJECTS)
-test_u32_casecmp_LDADD = $(LDADD)
-test_u32_casecmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_casecmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_casecoll_OBJECTS = unicase/test-u32-casecoll.$(OBJEXT)
 test_u32_casecoll_OBJECTS = $(am_test_u32_casecoll_OBJECTS)
 test_u32_casecoll_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_casefold_OBJECTS = unicase/test-u32-casefold.$(OBJEXT)
 test_u32_casefold_OBJECTS = $(am_test_u32_casefold_OBJECTS)
-test_u32_casefold_LDADD = $(LDADD)
-test_u32_casefold_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_casefold_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_check_OBJECTS = unistr/test-u32-check.$(OBJEXT)
 test_u32_check_OBJECTS = $(am_test_u32_check_OBJECTS)
-test_u32_check_LDADD = $(LDADD)
-test_u32_check_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_check_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_chr_OBJECTS = unistr/test-u32-chr.$(OBJEXT)
 test_u32_chr_OBJECTS = $(am_test_u32_chr_OBJECTS)
-test_u32_chr_LDADD = $(LDADD)
-test_u32_chr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_chr_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_cmp_OBJECTS = unistr/test-u32-cmp.$(OBJEXT)
 test_u32_cmp_OBJECTS = $(am_test_u32_cmp_OBJECTS)
-test_u32_cmp_LDADD = $(LDADD)
-test_u32_cmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_cmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_cmp2_OBJECTS = unistr/test-u32-cmp2.$(OBJEXT)
 test_u32_cmp2_OBJECTS = $(am_test_u32_cmp2_OBJECTS)
-test_u32_cmp2_LDADD = $(LDADD)
-test_u32_cmp2_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_cmp2_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_conv_from_enc_OBJECTS =  \
 	uniconv/test-u32-conv-from-enc.$(OBJEXT)
 test_u32_conv_from_enc_OBJECTS = $(am_test_u32_conv_from_enc_OBJECTS)
@@ -2099,79 +2061,64 @@ test_u32_conv_to_enc_OBJECTS = $(am_test_u32_conv_to_enc_OBJECTS)
 test_u32_conv_to_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_cpy_OBJECTS = unistr/test-u32-cpy.$(OBJEXT)
 test_u32_cpy_OBJECTS = $(am_test_u32_cpy_OBJECTS)
-test_u32_cpy_LDADD = $(LDADD)
-test_u32_cpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_cpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_cpy_alloc_OBJECTS = unistr/test-u32-cpy-alloc.$(OBJEXT)
 test_u32_cpy_alloc_OBJECTS = $(am_test_u32_cpy_alloc_OBJECTS)
-test_u32_cpy_alloc_LDADD = $(LDADD)
-test_u32_cpy_alloc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_cpy_alloc_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u32_grapheme_breaks_OBJECTS =  \
+	unigbrk/test-u32-grapheme-breaks.$(OBJEXT)
+test_u32_grapheme_breaks_OBJECTS =  \
+	$(am_test_u32_grapheme_breaks_OBJECTS)
+test_u32_grapheme_breaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u32_grapheme_next_OBJECTS =  \
+	unigbrk/test-u32-grapheme-next.$(OBJEXT)
+test_u32_grapheme_next_OBJECTS = $(am_test_u32_grapheme_next_OBJECTS)
+test_u32_grapheme_next_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u32_grapheme_prev_OBJECTS =  \
+	unigbrk/test-u32-grapheme-prev.$(OBJEXT)
+test_u32_grapheme_prev_OBJECTS = $(am_test_u32_grapheme_prev_OBJECTS)
+test_u32_grapheme_prev_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_is_cased_OBJECTS = unicase/test-u32-is-cased.$(OBJEXT)
 test_u32_is_cased_OBJECTS = $(am_test_u32_is_cased_OBJECTS)
-test_u32_is_cased_LDADD = $(LDADD)
-test_u32_is_cased_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_is_cased_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_is_casefolded_OBJECTS =  \
 	unicase/test-u32-is-casefolded.$(OBJEXT)
 test_u32_is_casefolded_OBJECTS = $(am_test_u32_is_casefolded_OBJECTS)
-test_u32_is_casefolded_LDADD = $(LDADD)
-test_u32_is_casefolded_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_u32_is_casefolded_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_is_lowercase_OBJECTS =  \
 	unicase/test-u32-is-lowercase.$(OBJEXT)
 test_u32_is_lowercase_OBJECTS = $(am_test_u32_is_lowercase_OBJECTS)
-test_u32_is_lowercase_LDADD = $(LDADD)
-test_u32_is_lowercase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_is_lowercase_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_is_titlecase_OBJECTS =  \
 	unicase/test-u32-is-titlecase.$(OBJEXT)
 test_u32_is_titlecase_OBJECTS = $(am_test_u32_is_titlecase_OBJECTS)
-test_u32_is_titlecase_LDADD = $(LDADD)
-test_u32_is_titlecase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_is_titlecase_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_is_uppercase_OBJECTS =  \
 	unicase/test-u32-is-uppercase.$(OBJEXT)
 test_u32_is_uppercase_OBJECTS = $(am_test_u32_is_uppercase_OBJECTS)
-test_u32_is_uppercase_LDADD = $(LDADD)
-test_u32_is_uppercase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_is_uppercase_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_mblen_OBJECTS = unistr/test-u32-mblen.$(OBJEXT)
 test_u32_mblen_OBJECTS = $(am_test_u32_mblen_OBJECTS)
-test_u32_mblen_LDADD = $(LDADD)
-test_u32_mblen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_mblen_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_mbsnlen_OBJECTS = unistr/test-u32-mbsnlen.$(OBJEXT)
 test_u32_mbsnlen_OBJECTS = $(am_test_u32_mbsnlen_OBJECTS)
-test_u32_mbsnlen_LDADD = $(LDADD)
-test_u32_mbsnlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_mbsnlen_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_mbtouc_OBJECTS = unistr/test-u32-mbtouc.$(OBJEXT)
 test_u32_mbtouc_OBJECTS = $(am_test_u32_mbtouc_OBJECTS)
-test_u32_mbtouc_LDADD = $(LDADD)
-test_u32_mbtouc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_mbtouc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_mbtouc_unsafe_OBJECTS =  \
 	unistr/test-u32-mbtouc-unsafe.$(OBJEXT)
 test_u32_mbtouc_unsafe_OBJECTS = $(am_test_u32_mbtouc_unsafe_OBJECTS)
-test_u32_mbtouc_unsafe_LDADD = $(LDADD)
-test_u32_mbtouc_unsafe_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_u32_mbtouc_unsafe_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_mbtoucr_OBJECTS = unistr/test-u32-mbtoucr.$(OBJEXT)
 test_u32_mbtoucr_OBJECTS = $(am_test_u32_mbtoucr_OBJECTS)
-test_u32_mbtoucr_LDADD = $(LDADD)
-test_u32_mbtoucr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_mbtoucr_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_move_OBJECTS = unistr/test-u32-move.$(OBJEXT)
 test_u32_move_OBJECTS = $(am_test_u32_move_OBJECTS)
-test_u32_move_LDADD = $(LDADD)
-test_u32_move_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_move_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_next_OBJECTS = unistr/test-u32-next.$(OBJEXT)
 test_u32_next_OBJECTS = $(am_test_u32_next_OBJECTS)
-test_u32_next_LDADD = $(LDADD)
-test_u32_next_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_next_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_nfc_big_OBJECTS = uninorm/test-u32-nfc-big.$(OBJEXT) \
 	uninorm/test-u32-normalize-big.$(OBJEXT)
 test_u32_nfc_big_OBJECTS = $(am_test_u32_nfc_big_OBJECTS)
@@ -2190,9 +2137,7 @@ test_u32_nfkd_big_OBJECTS = $(am_test_u32_nfkd_big_OBJECTS)
 test_u32_nfkd_big_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_normcmp_OBJECTS = uninorm/test-u32-normcmp.$(OBJEXT)
 test_u32_normcmp_OBJECTS = $(am_test_u32_normcmp_OBJECTS)
-test_u32_normcmp_LDADD = $(LDADD)
-test_u32_normcmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_normcmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_normcoll_OBJECTS = uninorm/test-u32-normcoll.$(OBJEXT)
 test_u32_normcoll_OBJECTS = $(am_test_u32_normcoll_OBJECTS)
 test_u32_normcoll_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -2200,39 +2145,28 @@ am_test_u32_possible_linebreaks_OBJECTS =  \
 	unilbrk/test-u32-possible-linebreaks.$(OBJEXT)
 test_u32_possible_linebreaks_OBJECTS =  \
 	$(am_test_u32_possible_linebreaks_OBJECTS)
-test_u32_possible_linebreaks_LDADD = $(LDADD)
-test_u32_possible_linebreaks_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_u32_possible_linebreaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_prev_OBJECTS = unistr/test-u32-prev.$(OBJEXT)
 test_u32_prev_OBJECTS = $(am_test_u32_prev_OBJECTS)
-test_u32_prev_LDADD = $(LDADD)
-test_u32_prev_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_prev_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_set_OBJECTS = unistr/test-u32-set.$(OBJEXT)
 test_u32_set_OBJECTS = $(am_test_u32_set_OBJECTS)
-test_u32_set_LDADD = $(LDADD)
-test_u32_set_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_set_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_stpcpy_OBJECTS = unistr/test-u32-stpcpy.$(OBJEXT)
 test_u32_stpcpy_OBJECTS = $(am_test_u32_stpcpy_OBJECTS)
-test_u32_stpcpy_LDADD = $(LDADD)
-test_u32_stpcpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_stpcpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_stpncpy_OBJECTS = unistr/test-u32-stpncpy.$(OBJEXT)
 test_u32_stpncpy_OBJECTS = $(am_test_u32_stpncpy_OBJECTS)
-test_u32_stpncpy_LDADD = $(LDADD)
-test_u32_stpncpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_stpncpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_strcat_OBJECTS = unistr/test-u32-strcat.$(OBJEXT)
 test_u32_strcat_OBJECTS = $(am_test_u32_strcat_OBJECTS)
-test_u32_strcat_LDADD = $(LDADD)
-test_u32_strcat_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_strcat_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u32_strchr_OBJECTS = unistr/test-u32-strchr.$(OBJEXT)
+test_u32_strchr_OBJECTS = $(am_test_u32_strchr_OBJECTS)
+test_u32_strchr_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_strcmp_OBJECTS = unistr/test-u32-strcmp.$(OBJEXT)
 test_u32_strcmp_OBJECTS = $(am_test_u32_strcmp_OBJECTS)
-test_u32_strcmp_LDADD = $(LDADD)
-test_u32_strcmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_strcmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_strcoll_OBJECTS = unistr/test-u32-strcoll.$(OBJEXT)
 test_u32_strcoll_OBJECTS = $(am_test_u32_strcoll_OBJECTS)
 test_u32_strcoll_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -2248,84 +2182,58 @@ test_u32_strconv_to_enc_OBJECTS =  \
 test_u32_strconv_to_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_strcpy_OBJECTS = unistr/test-u32-strcpy.$(OBJEXT)
 test_u32_strcpy_OBJECTS = $(am_test_u32_strcpy_OBJECTS)
-test_u32_strcpy_LDADD = $(LDADD)
-test_u32_strcpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_strcpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_strdup_OBJECTS = unistr/test-u32-strdup.$(OBJEXT)
 test_u32_strdup_OBJECTS = $(am_test_u32_strdup_OBJECTS)
-test_u32_strdup_LDADD = $(LDADD)
-test_u32_strdup_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_strdup_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_strlen_OBJECTS = unistr/test-u32-strlen.$(OBJEXT)
 test_u32_strlen_OBJECTS = $(am_test_u32_strlen_OBJECTS)
-test_u32_strlen_LDADD = $(LDADD)
-test_u32_strlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_strlen_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_strmblen_OBJECTS = unistr/test-u32-strmblen.$(OBJEXT)
 test_u32_strmblen_OBJECTS = $(am_test_u32_strmblen_OBJECTS)
-test_u32_strmblen_LDADD = $(LDADD)
-test_u32_strmblen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_strmblen_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_strmbtouc_OBJECTS = unistr/test-u32-strmbtouc.$(OBJEXT)
 test_u32_strmbtouc_OBJECTS = $(am_test_u32_strmbtouc_OBJECTS)
-test_u32_strmbtouc_LDADD = $(LDADD)
-test_u32_strmbtouc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_strmbtouc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_strncat_OBJECTS = unistr/test-u32-strncat.$(OBJEXT)
 test_u32_strncat_OBJECTS = $(am_test_u32_strncat_OBJECTS)
-test_u32_strncat_LDADD = $(LDADD)
-test_u32_strncat_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_strncat_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_strncmp_OBJECTS = unistr/test-u32-strncmp.$(OBJEXT)
 test_u32_strncmp_OBJECTS = $(am_test_u32_strncmp_OBJECTS)
-test_u32_strncmp_LDADD = $(LDADD)
-test_u32_strncmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_strncmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_strncpy_OBJECTS = unistr/test-u32-strncpy.$(OBJEXT)
 test_u32_strncpy_OBJECTS = $(am_test_u32_strncpy_OBJECTS)
-test_u32_strncpy_LDADD = $(LDADD)
-test_u32_strncpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_strncpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_strnlen_OBJECTS = unistr/test-u32-strnlen.$(OBJEXT)
 test_u32_strnlen_OBJECTS = $(am_test_u32_strnlen_OBJECTS)
-test_u32_strnlen_LDADD = $(LDADD)
-test_u32_strnlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_strnlen_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u32_strstr_OBJECTS = unistr/test-u32-strstr.$(OBJEXT)
+test_u32_strstr_OBJECTS = $(am_test_u32_strstr_OBJECTS)
+test_u32_strstr_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u32_strtok_OBJECTS = unistr/test-u32-strtok.$(OBJEXT)
+test_u32_strtok_OBJECTS = $(am_test_u32_strtok_OBJECTS)
+test_u32_strtok_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_strwidth_OBJECTS = uniwidth/test-u32-strwidth.$(OBJEXT)
 test_u32_strwidth_OBJECTS = $(am_test_u32_strwidth_OBJECTS)
-test_u32_strwidth_LDADD = $(LDADD)
-test_u32_strwidth_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_strwidth_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_to_u16_OBJECTS = unistr/test-u32-to-u16.$(OBJEXT)
 test_u32_to_u16_OBJECTS = $(am_test_u32_to_u16_OBJECTS)
-test_u32_to_u16_LDADD = $(LDADD)
-test_u32_to_u16_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_to_u16_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_to_u8_OBJECTS = unistr/test-u32-to-u8.$(OBJEXT)
 test_u32_to_u8_OBJECTS = $(am_test_u32_to_u8_OBJECTS)
-test_u32_to_u8_LDADD = $(LDADD)
-test_u32_to_u8_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_to_u8_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_tolower_OBJECTS = unicase/test-u32-tolower.$(OBJEXT)
 test_u32_tolower_OBJECTS = $(am_test_u32_tolower_OBJECTS)
-test_u32_tolower_LDADD = $(LDADD)
-test_u32_tolower_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_tolower_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_totitle_OBJECTS = unicase/test-u32-totitle.$(OBJEXT)
 test_u32_totitle_OBJECTS = $(am_test_u32_totitle_OBJECTS)
-test_u32_totitle_LDADD = $(LDADD)
-test_u32_totitle_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_totitle_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_toupper_OBJECTS = unicase/test-u32-toupper.$(OBJEXT)
 test_u32_toupper_OBJECTS = $(am_test_u32_toupper_OBJECTS)
-test_u32_toupper_LDADD = $(LDADD)
-test_u32_toupper_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_toupper_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_uctomb_OBJECTS = unistr/test-u32-uctomb.$(OBJEXT)
 test_u32_uctomb_OBJECTS = $(am_test_u32_uctomb_OBJECTS)
-test_u32_uctomb_LDADD = $(LDADD)
-test_u32_uctomb_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_uctomb_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_vasnprintf1_OBJECTS =  \
 	unistdio/test-u32-vasnprintf1.$(OBJEXT)
 test_u32_vasnprintf1_OBJECTS = $(am_test_u32_vasnprintf1_OBJECTS)
@@ -2351,58 +2259,40 @@ test_u32_vsprintf1_OBJECTS = $(am_test_u32_vsprintf1_OBJECTS)
 test_u32_vsprintf1_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_width_OBJECTS = uniwidth/test-u32-width.$(OBJEXT)
 test_u32_width_OBJECTS = $(am_test_u32_width_OBJECTS)
-test_u32_width_LDADD = $(LDADD)
-test_u32_width_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_width_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_width_linebreaks_OBJECTS =  \
 	unilbrk/test-u32-width-linebreaks.$(OBJEXT)
 test_u32_width_linebreaks_OBJECTS =  \
 	$(am_test_u32_width_linebreaks_OBJECTS)
-test_u32_width_linebreaks_LDADD = $(LDADD)
-test_u32_width_linebreaks_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_u32_width_linebreaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_wordbreaks_OBJECTS =  \
 	uniwbrk/test-u32-wordbreaks.$(OBJEXT)
 test_u32_wordbreaks_OBJECTS = $(am_test_u32_wordbreaks_OBJECTS)
-test_u32_wordbreaks_LDADD = $(LDADD)
-test_u32_wordbreaks_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u32_wordbreaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_asnprintf1_OBJECTS = unistdio/test-u8-asnprintf1.$(OBJEXT)
 test_u8_asnprintf1_OBJECTS = $(am_test_u8_asnprintf1_OBJECTS)
 test_u8_asnprintf1_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_casecmp_OBJECTS = unicase/test-u8-casecmp.$(OBJEXT)
 test_u8_casecmp_OBJECTS = $(am_test_u8_casecmp_OBJECTS)
-test_u8_casecmp_LDADD = $(LDADD)
-test_u8_casecmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_casecmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_casecoll_OBJECTS = unicase/test-u8-casecoll.$(OBJEXT)
 test_u8_casecoll_OBJECTS = $(am_test_u8_casecoll_OBJECTS)
 test_u8_casecoll_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_casefold_OBJECTS = unicase/test-u8-casefold.$(OBJEXT)
 test_u8_casefold_OBJECTS = $(am_test_u8_casefold_OBJECTS)
-test_u8_casefold_LDADD = $(LDADD)
-test_u8_casefold_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_casefold_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_check_OBJECTS = unistr/test-u8-check.$(OBJEXT)
 test_u8_check_OBJECTS = $(am_test_u8_check_OBJECTS)
-test_u8_check_LDADD = $(LDADD)
-test_u8_check_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_check_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_chr_OBJECTS = unistr/test-u8-chr.$(OBJEXT)
 test_u8_chr_OBJECTS = $(am_test_u8_chr_OBJECTS)
-test_u8_chr_LDADD = $(LDADD)
-test_u8_chr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_chr_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_cmp_OBJECTS = unistr/test-u8-cmp.$(OBJEXT)
 test_u8_cmp_OBJECTS = $(am_test_u8_cmp_OBJECTS)
-test_u8_cmp_LDADD = $(LDADD)
-test_u8_cmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_cmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_cmp2_OBJECTS = unistr/test-u8-cmp2.$(OBJEXT)
 test_u8_cmp2_OBJECTS = $(am_test_u8_cmp2_OBJECTS)
-test_u8_cmp2_LDADD = $(LDADD)
-test_u8_cmp2_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_cmp2_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_conv_from_enc_OBJECTS =  \
 	uniconv/test-u8-conv-from-enc.$(OBJEXT)
 test_u8_conv_from_enc_OBJECTS = $(am_test_u8_conv_from_enc_OBJECTS)
@@ -2413,84 +2303,67 @@ test_u8_conv_to_enc_OBJECTS = $(am_test_u8_conv_to_enc_OBJECTS)
 test_u8_conv_to_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_cpy_OBJECTS = unistr/test-u8-cpy.$(OBJEXT)
 test_u8_cpy_OBJECTS = $(am_test_u8_cpy_OBJECTS)
-test_u8_cpy_LDADD = $(LDADD)
-test_u8_cpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_cpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_cpy_alloc_OBJECTS = unistr/test-u8-cpy-alloc.$(OBJEXT)
 test_u8_cpy_alloc_OBJECTS = $(am_test_u8_cpy_alloc_OBJECTS)
-test_u8_cpy_alloc_LDADD = $(LDADD)
-test_u8_cpy_alloc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_cpy_alloc_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u8_grapheme_breaks_OBJECTS =  \
+	unigbrk/test-u8-grapheme-breaks.$(OBJEXT)
+test_u8_grapheme_breaks_OBJECTS =  \
+	$(am_test_u8_grapheme_breaks_OBJECTS)
+test_u8_grapheme_breaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u8_grapheme_next_OBJECTS =  \
+	unigbrk/test-u8-grapheme-next.$(OBJEXT)
+test_u8_grapheme_next_OBJECTS = $(am_test_u8_grapheme_next_OBJECTS)
+test_u8_grapheme_next_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u8_grapheme_prev_OBJECTS =  \
+	unigbrk/test-u8-grapheme-prev.$(OBJEXT)
+test_u8_grapheme_prev_OBJECTS = $(am_test_u8_grapheme_prev_OBJECTS)
+test_u8_grapheme_prev_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_is_cased_OBJECTS = unicase/test-u8-is-cased.$(OBJEXT)
 test_u8_is_cased_OBJECTS = $(am_test_u8_is_cased_OBJECTS)
-test_u8_is_cased_LDADD = $(LDADD)
-test_u8_is_cased_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_is_cased_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_is_casefolded_OBJECTS =  \
 	unicase/test-u8-is-casefolded.$(OBJEXT)
 test_u8_is_casefolded_OBJECTS = $(am_test_u8_is_casefolded_OBJECTS)
-test_u8_is_casefolded_LDADD = $(LDADD)
-test_u8_is_casefolded_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_is_casefolded_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_is_lowercase_OBJECTS =  \
 	unicase/test-u8-is-lowercase.$(OBJEXT)
 test_u8_is_lowercase_OBJECTS = $(am_test_u8_is_lowercase_OBJECTS)
-test_u8_is_lowercase_LDADD = $(LDADD)
-test_u8_is_lowercase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_is_lowercase_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_is_titlecase_OBJECTS =  \
 	unicase/test-u8-is-titlecase.$(OBJEXT)
 test_u8_is_titlecase_OBJECTS = $(am_test_u8_is_titlecase_OBJECTS)
-test_u8_is_titlecase_LDADD = $(LDADD)
-test_u8_is_titlecase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_is_titlecase_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_is_uppercase_OBJECTS =  \
 	unicase/test-u8-is-uppercase.$(OBJEXT)
 test_u8_is_uppercase_OBJECTS = $(am_test_u8_is_uppercase_OBJECTS)
-test_u8_is_uppercase_LDADD = $(LDADD)
-test_u8_is_uppercase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_is_uppercase_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_mblen_OBJECTS = unistr/test-u8-mblen.$(OBJEXT)
 test_u8_mblen_OBJECTS = $(am_test_u8_mblen_OBJECTS)
-test_u8_mblen_LDADD = $(LDADD)
-test_u8_mblen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_mblen_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_mbsnlen_OBJECTS = unistr/test-u8-mbsnlen.$(OBJEXT)
 test_u8_mbsnlen_OBJECTS = $(am_test_u8_mbsnlen_OBJECTS)
-test_u8_mbsnlen_LDADD = $(LDADD)
-test_u8_mbsnlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_mbsnlen_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_mbtouc_OBJECTS = unistr/test-u8-mbtouc.$(OBJEXT)
 test_u8_mbtouc_OBJECTS = $(am_test_u8_mbtouc_OBJECTS)
-test_u8_mbtouc_LDADD = $(LDADD)
-test_u8_mbtouc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_mbtouc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_mbtouc_unsafe_OBJECTS =  \
 	unistr/test-u8-mbtouc-unsafe.$(OBJEXT)
 test_u8_mbtouc_unsafe_OBJECTS = $(am_test_u8_mbtouc_unsafe_OBJECTS)
-test_u8_mbtouc_unsafe_LDADD = $(LDADD)
-test_u8_mbtouc_unsafe_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_mbtouc_unsafe_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_mbtoucr_OBJECTS = unistr/test-u8-mbtoucr.$(OBJEXT)
 test_u8_mbtoucr_OBJECTS = $(am_test_u8_mbtoucr_OBJECTS)
-test_u8_mbtoucr_LDADD = $(LDADD)
-test_u8_mbtoucr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_mbtoucr_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_move_OBJECTS = unistr/test-u8-move.$(OBJEXT)
 test_u8_move_OBJECTS = $(am_test_u8_move_OBJECTS)
-test_u8_move_LDADD = $(LDADD)
-test_u8_move_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_move_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_next_OBJECTS = unistr/test-u8-next.$(OBJEXT)
 test_u8_next_OBJECTS = $(am_test_u8_next_OBJECTS)
-test_u8_next_LDADD = $(LDADD)
-test_u8_next_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_next_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_normcmp_OBJECTS = uninorm/test-u8-normcmp.$(OBJEXT)
 test_u8_normcmp_OBJECTS = $(am_test_u8_normcmp_OBJECTS)
-test_u8_normcmp_LDADD = $(LDADD)
-test_u8_normcmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_normcmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_normcoll_OBJECTS = uninorm/test-u8-normcoll.$(OBJEXT)
 test_u8_normcoll_OBJECTS = $(am_test_u8_normcoll_OBJECTS)
 test_u8_normcoll_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -2498,39 +2371,28 @@ am_test_u8_possible_linebreaks_OBJECTS =  \
 	unilbrk/test-u8-possible-linebreaks.$(OBJEXT)
 test_u8_possible_linebreaks_OBJECTS =  \
 	$(am_test_u8_possible_linebreaks_OBJECTS)
-test_u8_possible_linebreaks_LDADD = $(LDADD)
-test_u8_possible_linebreaks_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_u8_possible_linebreaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_prev_OBJECTS = unistr/test-u8-prev.$(OBJEXT)
 test_u8_prev_OBJECTS = $(am_test_u8_prev_OBJECTS)
-test_u8_prev_LDADD = $(LDADD)
-test_u8_prev_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_prev_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_set_OBJECTS = unistr/test-u8-set.$(OBJEXT)
 test_u8_set_OBJECTS = $(am_test_u8_set_OBJECTS)
-test_u8_set_LDADD = $(LDADD)
-test_u8_set_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_set_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_stpcpy_OBJECTS = unistr/test-u8-stpcpy.$(OBJEXT)
 test_u8_stpcpy_OBJECTS = $(am_test_u8_stpcpy_OBJECTS)
-test_u8_stpcpy_LDADD = $(LDADD)
-test_u8_stpcpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_stpcpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_stpncpy_OBJECTS = unistr/test-u8-stpncpy.$(OBJEXT)
 test_u8_stpncpy_OBJECTS = $(am_test_u8_stpncpy_OBJECTS)
-test_u8_stpncpy_LDADD = $(LDADD)
-test_u8_stpncpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_stpncpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_strcat_OBJECTS = unistr/test-u8-strcat.$(OBJEXT)
 test_u8_strcat_OBJECTS = $(am_test_u8_strcat_OBJECTS)
-test_u8_strcat_LDADD = $(LDADD)
-test_u8_strcat_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_strcat_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u8_strchr_OBJECTS = unistr/test-u8-strchr.$(OBJEXT)
+test_u8_strchr_OBJECTS = $(am_test_u8_strchr_OBJECTS)
+test_u8_strchr_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_strcmp_OBJECTS = unistr/test-u8-strcmp.$(OBJEXT)
 test_u8_strcmp_OBJECTS = $(am_test_u8_strcmp_OBJECTS)
-test_u8_strcmp_LDADD = $(LDADD)
-test_u8_strcmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_strcmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_strcoll_OBJECTS = unistr/test-u8-strcoll.$(OBJEXT)
 test_u8_strcoll_OBJECTS = $(am_test_u8_strcoll_OBJECTS)
 test_u8_strcoll_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -2545,84 +2407,58 @@ test_u8_strconv_to_enc_OBJECTS = $(am_test_u8_strconv_to_enc_OBJECTS)
 test_u8_strconv_to_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_strcpy_OBJECTS = unistr/test-u8-strcpy.$(OBJEXT)
 test_u8_strcpy_OBJECTS = $(am_test_u8_strcpy_OBJECTS)
-test_u8_strcpy_LDADD = $(LDADD)
-test_u8_strcpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_strcpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_strdup_OBJECTS = unistr/test-u8-strdup.$(OBJEXT)
 test_u8_strdup_OBJECTS = $(am_test_u8_strdup_OBJECTS)
-test_u8_strdup_LDADD = $(LDADD)
-test_u8_strdup_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_strdup_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_strlen_OBJECTS = unistr/test-u8-strlen.$(OBJEXT)
 test_u8_strlen_OBJECTS = $(am_test_u8_strlen_OBJECTS)
-test_u8_strlen_LDADD = $(LDADD)
-test_u8_strlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_strlen_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_strmblen_OBJECTS = unistr/test-u8-strmblen.$(OBJEXT)
 test_u8_strmblen_OBJECTS = $(am_test_u8_strmblen_OBJECTS)
-test_u8_strmblen_LDADD = $(LDADD)
-test_u8_strmblen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_strmblen_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_strmbtouc_OBJECTS = unistr/test-u8-strmbtouc.$(OBJEXT)
 test_u8_strmbtouc_OBJECTS = $(am_test_u8_strmbtouc_OBJECTS)
-test_u8_strmbtouc_LDADD = $(LDADD)
-test_u8_strmbtouc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_strmbtouc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_strncat_OBJECTS = unistr/test-u8-strncat.$(OBJEXT)
 test_u8_strncat_OBJECTS = $(am_test_u8_strncat_OBJECTS)
-test_u8_strncat_LDADD = $(LDADD)
-test_u8_strncat_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_strncat_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_strncmp_OBJECTS = unistr/test-u8-strncmp.$(OBJEXT)
 test_u8_strncmp_OBJECTS = $(am_test_u8_strncmp_OBJECTS)
-test_u8_strncmp_LDADD = $(LDADD)
-test_u8_strncmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_strncmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_strncpy_OBJECTS = unistr/test-u8-strncpy.$(OBJEXT)
 test_u8_strncpy_OBJECTS = $(am_test_u8_strncpy_OBJECTS)
-test_u8_strncpy_LDADD = $(LDADD)
-test_u8_strncpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_strncpy_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_strnlen_OBJECTS = unistr/test-u8-strnlen.$(OBJEXT)
 test_u8_strnlen_OBJECTS = $(am_test_u8_strnlen_OBJECTS)
-test_u8_strnlen_LDADD = $(LDADD)
-test_u8_strnlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_strnlen_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u8_strstr_OBJECTS = unistr/test-u8-strstr.$(OBJEXT)
+test_u8_strstr_OBJECTS = $(am_test_u8_strstr_OBJECTS)
+test_u8_strstr_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u8_strtok_OBJECTS = unistr/test-u8-strtok.$(OBJEXT)
+test_u8_strtok_OBJECTS = $(am_test_u8_strtok_OBJECTS)
+test_u8_strtok_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_strwidth_OBJECTS = uniwidth/test-u8-strwidth.$(OBJEXT)
 test_u8_strwidth_OBJECTS = $(am_test_u8_strwidth_OBJECTS)
-test_u8_strwidth_LDADD = $(LDADD)
-test_u8_strwidth_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_strwidth_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_to_u16_OBJECTS = unistr/test-u8-to-u16.$(OBJEXT)
 test_u8_to_u16_OBJECTS = $(am_test_u8_to_u16_OBJECTS)
-test_u8_to_u16_LDADD = $(LDADD)
-test_u8_to_u16_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_to_u16_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_to_u32_OBJECTS = unistr/test-u8-to-u32.$(OBJEXT)
 test_u8_to_u32_OBJECTS = $(am_test_u8_to_u32_OBJECTS)
-test_u8_to_u32_LDADD = $(LDADD)
-test_u8_to_u32_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_to_u32_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_tolower_OBJECTS = unicase/test-u8-tolower.$(OBJEXT)
 test_u8_tolower_OBJECTS = $(am_test_u8_tolower_OBJECTS)
-test_u8_tolower_LDADD = $(LDADD)
-test_u8_tolower_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_tolower_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_totitle_OBJECTS = unicase/test-u8-totitle.$(OBJEXT)
 test_u8_totitle_OBJECTS = $(am_test_u8_totitle_OBJECTS)
-test_u8_totitle_LDADD = $(LDADD)
-test_u8_totitle_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_totitle_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_toupper_OBJECTS = unicase/test-u8-toupper.$(OBJEXT)
 test_u8_toupper_OBJECTS = $(am_test_u8_toupper_OBJECTS)
-test_u8_toupper_LDADD = $(LDADD)
-test_u8_toupper_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_toupper_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_uctomb_OBJECTS = unistr/test-u8-uctomb.$(OBJEXT)
 test_u8_uctomb_OBJECTS = $(am_test_u8_uctomb_OBJECTS)
-test_u8_uctomb_LDADD = $(LDADD)
-test_u8_uctomb_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_uctomb_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_vasnprintf1_OBJECTS =  \
 	unistdio/test-u8-vasnprintf1.$(OBJEXT)
 test_u8_vasnprintf1_OBJECTS = $(am_test_u8_vasnprintf1_OBJECTS)
@@ -2646,46 +2482,41 @@ test_u8_vsprintf1_OBJECTS = $(am_test_u8_vsprintf1_OBJECTS)
 test_u8_vsprintf1_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_width_OBJECTS = uniwidth/test-u8-width.$(OBJEXT)
 test_u8_width_OBJECTS = $(am_test_u8_width_OBJECTS)
-test_u8_width_LDADD = $(LDADD)
-test_u8_width_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_width_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_width_linebreaks_OBJECTS =  \
 	unilbrk/test-u8-width-linebreaks.$(OBJEXT)
 test_u8_width_linebreaks_OBJECTS =  \
 	$(am_test_u8_width_linebreaks_OBJECTS)
-test_u8_width_linebreaks_LDADD = $(LDADD)
-test_u8_width_linebreaks_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_u8_width_linebreaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_wordbreaks_OBJECTS = uniwbrk/test-u8-wordbreaks.$(OBJEXT)
 test_u8_wordbreaks_OBJECTS = $(am_test_u8_wordbreaks_OBJECTS)
-test_u8_wordbreaks_LDADD = $(LDADD)
-test_u8_wordbreaks_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_u8_wordbreaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_uc_gbrk_prop_OBJECTS = unigbrk/test-uc-gbrk-prop.$(OBJEXT)
+test_uc_gbrk_prop_OBJECTS = $(am_test_uc_gbrk_prop_OBJECTS)
+test_uc_gbrk_prop_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_uc_is_grapheme_break_OBJECTS =  \
+	unigbrk/test-uc-is-grapheme-break.$(OBJEXT)
+test_uc_is_grapheme_break_OBJECTS =  \
+	$(am_test_uc_is_grapheme_break_OBJECTS)
+test_uc_is_grapheme_break_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_uc_wordbreaks_OBJECTS = uniwbrk/test-uc-wordbreaks.$(OBJEXT)
+test_uc_wordbreaks_OBJECTS = $(am_test_uc_wordbreaks_OBJECTS)
+test_uc_wordbreaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_uc_tolower_OBJECTS = unicase/test-uc_tolower.$(OBJEXT)
 test_uc_tolower_OBJECTS = $(am_test_uc_tolower_OBJECTS)
-test_uc_tolower_LDADD = $(LDADD)
-test_uc_tolower_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_uc_tolower_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_uc_totitle_OBJECTS = unicase/test-uc_totitle.$(OBJEXT)
 test_uc_totitle_OBJECTS = $(am_test_uc_totitle_OBJECTS)
-test_uc_totitle_LDADD = $(LDADD)
-test_uc_totitle_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_uc_totitle_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_uc_toupper_OBJECTS = unicase/test-uc_toupper.$(OBJEXT)
 test_uc_toupper_OBJECTS = $(am_test_uc_toupper_OBJECTS)
-test_uc_toupper_LDADD = $(LDADD)
-test_uc_toupper_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_uc_toupper_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_uc_width_OBJECTS = uniwidth/test-uc_width.$(OBJEXT)
 test_uc_width_OBJECTS = $(am_test_uc_width_OBJECTS)
-test_uc_width_LDADD = $(LDADD)
-test_uc_width_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_uc_width_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_uc_width2_OBJECTS = uniwidth/test-uc_width2.$(OBJEXT)
 test_uc_width2_OBJECTS = $(am_test_uc_width2_OBJECTS)
-test_uc_width2_LDADD = $(LDADD)
-test_uc_width2_DEPENDENCIES = libtests.a ../lib/libunistring.la \
-	libtests.a $(am__DEPENDENCIES_1)
+test_uc_width2_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ulc_asnprintf1_OBJECTS =  \
 	unistdio/test-ulc-asnprintf1.$(OBJEXT)
 test_ulc_asnprintf1_OBJECTS = $(am_test_ulc_asnprintf1_OBJECTS)
@@ -2696,6 +2527,11 @@ test_ulc_casecmp_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ulc_casecoll_OBJECTS = unicase/test-ulc-casecoll.$(OBJEXT)
 test_ulc_casecoll_OBJECTS = $(am_test_ulc_casecoll_OBJECTS)
 test_ulc_casecoll_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_ulc_grapheme_breaks_OBJECTS =  \
+	unigbrk/test-ulc-grapheme-breaks.$(OBJEXT)
+test_ulc_grapheme_breaks_OBJECTS =  \
+	$(am_test_ulc_grapheme_breaks_OBJECTS)
+test_ulc_grapheme_breaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_ulc_possible_linebreaks_OBJECTS =  \
 	unilbrk/test-ulc-possible-linebreaks.$(OBJEXT)
 test_ulc_possible_linebreaks_OBJECTS =  \
@@ -2733,16 +2569,15 @@ am_test_ulc_wordbreaks_OBJECTS =  \
 	uniwbrk/test-ulc-wordbreaks.$(OBJEXT)
 test_ulc_wordbreaks_OBJECTS = $(am_test_ulc_wordbreaks_OBJECTS)
 test_ulc_wordbreaks_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_test_uninames_OBJECTS = uniname/test-uninames.$(OBJEXT)
+am__test_uninames_SOURCES_DIST = uniname/test-uninames.c
+@LIBUNISTRING_COMPILE_UNINAME_UNINAME_TRUE@am_test_uninames_OBJECTS = uniname/test-uninames.$(OBJEXT)
 test_uninames_OBJECTS = $(am_test_uninames_OBJECTS)
-test_uninames_DEPENDENCIES = $(am__DEPENDENCIES_2)
+@LIBUNISTRING_COMPILE_UNINAME_UNINAME_TRUE@test_uninames_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_uninorm_filter_nfc_OBJECTS =  \
 	uninorm/test-uninorm-filter-nfc.$(OBJEXT)
 test_uninorm_filter_nfc_OBJECTS =  \
 	$(am_test_uninorm_filter_nfc_OBJECTS)
-test_uninorm_filter_nfc_LDADD = $(LDADD)
-test_uninorm_filter_nfc_DEPENDENCIES = libtests.a \
-	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+test_uninorm_filter_nfc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_unistd_SOURCES = test-unistd.c
 test_unistd_OBJECTS = test-unistd.$(OBJEXT)
 test_unistd_LDADD = $(LDADD)
@@ -2753,15 +2588,30 @@ test_unsetenv_OBJECTS = test-unsetenv.$(OBJEXT)
 test_unsetenv_LDADD = $(LDADD)
 test_unsetenv_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_verify_SOURCES = test-verify.c
+test_verify_OBJECTS = test-verify.$(OBJEXT)
+test_verify_LDADD = $(LDADD)
+test_verify_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 test_wchar_SOURCES = test-wchar.c
 test_wchar_OBJECTS = test-wchar.$(OBJEXT)
 test_wchar_LDADD = $(LDADD)
 test_wchar_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
 	$(am__DEPENDENCIES_1)
-test_wctype_SOURCES = test-wctype.c
-test_wctype_OBJECTS = test-wctype.$(OBJEXT)
-test_wctype_LDADD = $(LDADD)
-test_wctype_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+test_wcrtomb_SOURCES = test-wcrtomb.c
+test_wcrtomb_OBJECTS = test-wcrtomb.$(OBJEXT)
+test_wcrtomb_LDADD = $(LDADD)
+test_wcrtomb_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+test_wcrtomb_w32_SOURCES = test-wcrtomb-w32.c
+test_wcrtomb_w32_OBJECTS = test-wcrtomb-w32.$(OBJEXT)
+test_wcrtomb_w32_LDADD = $(LDADD)
+test_wcrtomb_w32_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+test_wctype_h_SOURCES = test-wctype-h.c
+test_wctype_h_OBJECTS = test-wctype-h.$(OBJEXT)
+test_wctype_h_LDADD = $(LDADD)
+test_wctype_h_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
 test_wcwidth_SOURCES = test-wcwidth.c
 test_wcwidth_OBJECTS = test-wcwidth.$(OBJEXT)
@@ -2771,6 +2621,18 @@ test_wcwidth_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 test_xalloc_die_SOURCES = test-xalloc-die.c
 test_xalloc_die_OBJECTS = test-xalloc-die.$(OBJEXT)
 test_xalloc_die_DEPENDENCIES = $(am__DEPENDENCIES_2)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -2780,50 +2642,55 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	test-alloca-opt.c test-array-mergesort.c \
-	$(test_bidi_byname_SOURCES) $(test_bidi_name_SOURCES) \
-	$(test_bidi_of_SOURCES) $(test_bidi_test_SOURCES) \
-	$(test_block_list_SOURCES) $(test_block_of_SOURCES) \
-	$(test_block_test_SOURCES) test-c-ctype.c test-c-strcasecmp.c \
+	$(test_bidi_byname_SOURCES) $(test_bidi_longname_SOURCES) \
+	$(test_bidi_name_SOURCES) $(test_bidi_of_SOURCES) \
+	$(test_bidi_test_SOURCES) $(test_block_list_SOURCES) \
+	$(test_block_of_SOURCES) $(test_block_test_SOURCES) \
+	test-btowc.c test-c-ctype.c test-c-strcasecmp.c \
 	test-c-strncasecmp.c $(test_canonical_decomposition_SOURCES) \
 	$(test_cased_SOURCES) $(test_categ_C_SOURCES) \
 	$(test_categ_Cc_SOURCES) $(test_categ_Cf_SOURCES) \
 	$(test_categ_Cn_SOURCES) $(test_categ_Co_SOURCES) \
 	$(test_categ_Cs_SOURCES) $(test_categ_L_SOURCES) \
-	$(test_categ_Ll_SOURCES) $(test_categ_Lm_SOURCES) \
-	$(test_categ_Lo_SOURCES) $(test_categ_Lt_SOURCES) \
-	$(test_categ_Lu_SOURCES) $(test_categ_M_SOURCES) \
-	$(test_categ_Mc_SOURCES) $(test_categ_Me_SOURCES) \
-	$(test_categ_Mn_SOURCES) $(test_categ_N_SOURCES) \
-	$(test_categ_Nd_SOURCES) $(test_categ_Nl_SOURCES) \
-	$(test_categ_No_SOURCES) $(test_categ_P_SOURCES) \
-	$(test_categ_Pc_SOURCES) $(test_categ_Pd_SOURCES) \
-	$(test_categ_Pe_SOURCES) $(test_categ_Pf_SOURCES) \
-	$(test_categ_Pi_SOURCES) $(test_categ_Po_SOURCES) \
-	$(test_categ_Ps_SOURCES) $(test_categ_S_SOURCES) \
-	$(test_categ_Sc_SOURCES) $(test_categ_Sk_SOURCES) \
-	$(test_categ_Sm_SOURCES) $(test_categ_So_SOURCES) \
-	$(test_categ_Z_SOURCES) $(test_categ_Zl_SOURCES) \
-	$(test_categ_Zp_SOURCES) $(test_categ_Zs_SOURCES) \
-	$(test_categ_and_SOURCES) $(test_categ_and_not_SOURCES) \
-	$(test_categ_byname_SOURCES) $(test_categ_name_SOURCES) \
+	$(test_categ_LC_SOURCES) $(test_categ_Ll_SOURCES) \
+	$(test_categ_Lm_SOURCES) $(test_categ_Lo_SOURCES) \
+	$(test_categ_Lt_SOURCES) $(test_categ_Lu_SOURCES) \
+	$(test_categ_M_SOURCES) $(test_categ_Mc_SOURCES) \
+	$(test_categ_Me_SOURCES) $(test_categ_Mn_SOURCES) \
+	$(test_categ_N_SOURCES) $(test_categ_Nd_SOURCES) \
+	$(test_categ_Nl_SOURCES) $(test_categ_No_SOURCES) \
+	$(test_categ_P_SOURCES) $(test_categ_Pc_SOURCES) \
+	$(test_categ_Pd_SOURCES) $(test_categ_Pe_SOURCES) \
+	$(test_categ_Pf_SOURCES) $(test_categ_Pi_SOURCES) \
+	$(test_categ_Po_SOURCES) $(test_categ_Ps_SOURCES) \
+	$(test_categ_S_SOURCES) $(test_categ_Sc_SOURCES) \
+	$(test_categ_Sk_SOURCES) $(test_categ_Sm_SOURCES) \
+	$(test_categ_So_SOURCES) $(test_categ_Z_SOURCES) \
+	$(test_categ_Zl_SOURCES) $(test_categ_Zp_SOURCES) \
+	$(test_categ_Zs_SOURCES) $(test_categ_and_SOURCES) \
+	$(test_categ_and_not_SOURCES) $(test_categ_byname_SOURCES) \
+	$(test_categ_longname_SOURCES) $(test_categ_name_SOURCES) \
 	$(test_categ_none_SOURCES) $(test_categ_of_SOURCES) \
 	$(test_categ_or_SOURCES) $(test_categ_test_withtable_SOURCES) \
-	$(test_combining_SOURCES) $(test_compat_decomposition_SOURCES) \
+	$(test_combiningclass_SOURCES) \
+	$(test_combiningclass_byname_SOURCES) \
+	$(test_combiningclass_longname_SOURCES) \
+	$(test_combiningclass_name_SOURCES) \
+	$(test_compat_decomposition_SOURCES) \
 	$(test_composition_SOURCES) $(test_ctype_alnum_SOURCES) \
 	$(test_ctype_alpha_SOURCES) $(test_ctype_blank_SOURCES) \
 	$(test_ctype_cntrl_SOURCES) $(test_ctype_digit_SOURCES) \
@@ -2833,14 +2700,25 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_ctype_xdigit_SOURCES) $(test_decdigit_SOURCES) \
 	$(test_decomposing_form_SOURCES) $(test_decomposition_SOURCES) \
 	$(test_digit_SOURCES) test-environ.c test-errno.c \
-	$(test_frexpl_nolibm_SOURCES) test-fseterr.c test-iconv.c \
-	test-iconv-h.c $(test_ignorable_SOURCES) test-isnand-nolibm.c \
-	test-isnanf-nolibm.c test-isnanl-nolibm.c test-locale.c \
+	test-fdopen.c test-fgetc.c test-float.c test-fputc.c \
+	test-fread.c $(test_frexp_nolibm_SOURCES) \
+	$(test_frexpl_nolibm_SOURCES) test-fseterr.c test-fwrite.c \
+	test-iconv.c test-iconv-h.c $(test_ignorable_SOURCES) \
+	test-intprops.c test-inttypes.c test-isnand-nolibm.c \
+	test-isnanf-nolibm.c test-isnanl-nolibm.c test-iswblank.c \
+	$(test_joininggroup_byname_SOURCES) \
+	$(test_joininggroup_name_SOURCES) \
+	$(test_joininggroup_of_SOURCES) \
+	$(test_joiningtype_byname_SOURCES) \
+	$(test_joiningtype_longname_SOURCES) \
+	$(test_joiningtype_name_SOURCES) \
+	$(test_joiningtype_of_SOURCES) test-langinfo.c test-locale.c \
 	$(test_locale_language_SOURCES) test-localename.c test-lock.c \
-	test-malloca.c test-math.c test-mbrtowc.c test-mbsinit.c \
-	test-memchr.c $(test_mirror_SOURCES) $(test_nfc_SOURCES) \
-	$(test_nfd_SOURCES) $(test_nfkc_SOURCES) $(test_nfkd_SOURCES) \
-	$(test_numeric_SOURCES) $(test_pr_alphabetic_SOURCES) \
+	test-malloca.c test-math.c test-mbrtowc.c test-mbrtowc-w32.c \
+	test-mbsinit.c test-memchr.c $(test_mirror_SOURCES) \
+	$(test_nfc_SOURCES) $(test_nfd_SOURCES) $(test_nfkc_SOURCES) \
+	$(test_nfkd_SOURCES) $(test_numeric_SOURCES) \
+	$(test_pr_alphabetic_SOURCES) \
 	$(test_pr_ascii_hex_digit_SOURCES) \
 	$(test_pr_bidi_arabic_digit_SOURCES) \
 	$(test_pr_bidi_arabic_right_to_left_SOURCES) \
@@ -2859,6 +2737,12 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_pr_bidi_pdf_SOURCES) \
 	$(test_pr_bidi_segment_separator_SOURCES) \
 	$(test_pr_bidi_whitespace_SOURCES) $(test_pr_byname_SOURCES) \
+	$(test_pr_case_ignorable_SOURCES) $(test_pr_cased_SOURCES) \
+	$(test_pr_changes_when_casefolded_SOURCES) \
+	$(test_pr_changes_when_casemapped_SOURCES) \
+	$(test_pr_changes_when_lowercased_SOURCES) \
+	$(test_pr_changes_when_titlecased_SOURCES) \
+	$(test_pr_changes_when_uppercased_SOURCES) \
 	$(test_pr_combining_SOURCES) $(test_pr_composite_SOURCES) \
 	$(test_pr_currency_symbol_SOURCES) $(test_pr_dash_SOURCES) \
 	$(test_pr_decimal_digit_SOURCES) \
@@ -2905,19 +2789,25 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_pr_white_space_SOURCES) $(test_pr_xid_continue_SOURCES) \
 	$(test_pr_xid_start_SOURCES) $(test_pr_zero_width_SOURCES) \
 	test-printf-frexp.c test-printf-frexpl.c \
-	$(test_scripts_SOURCES) test-setenv.c test-signbit.c \
-	test-stdbool.c test-stddef.c test-stdint.c test-stdlib.c \
-	test-strerror.c test-striconveh.c test-striconveha.c \
-	test-string.c test-strncat.c $(test_sy_c_ident_SOURCES) \
-	$(test_sy_c_whitespace_SOURCES) $(test_sy_java_ident_SOURCES) \
-	$(test_sy_java_whitespace_SOURCES) \
+	$(test_scripts_SOURCES) test-setenv.c test-setlocale1.c \
+	test-setlocale2.c test-signbit.c test-stdalign.c \
+	test-stdbool.c test-stddef.c test-stdint.c test-stdio.c \
+	test-stdlib.c test-strerror.c test-striconveh.c \
+	test-striconveha.c test-string.c test-strncat.c test-strstr.c \
+	$(test_sy_c_ident_SOURCES) $(test_sy_c_whitespace_SOURCES) \
+	$(test_sy_java_ident_SOURCES) \
+	$(test_sy_java_whitespace_SOURCES) test-sys_types.c \
+	test-thread_create.c test-thread_self.c \
 	$(test_u16_asnprintf1_SOURCES) $(test_u16_casecmp_SOURCES) \
 	$(test_u16_casecoll_SOURCES) $(test_u16_casefold_SOURCES) \
 	$(test_u16_check_SOURCES) $(test_u16_chr_SOURCES) \
 	$(test_u16_cmp_SOURCES) $(test_u16_cmp2_SOURCES) \
 	$(test_u16_conv_from_enc_SOURCES) \
 	$(test_u16_conv_to_enc_SOURCES) $(test_u16_cpy_SOURCES) \
-	$(test_u16_cpy_alloc_SOURCES) $(test_u16_is_cased_SOURCES) \
+	$(test_u16_cpy_alloc_SOURCES) \
+	$(test_u16_grapheme_breaks_SOURCES) \
+	$(test_u16_grapheme_next_SOURCES) \
+	$(test_u16_grapheme_prev_SOURCES) $(test_u16_is_cased_SOURCES) \
 	$(test_u16_is_casefolded_SOURCES) \
 	$(test_u16_is_lowercase_SOURCES) \
 	$(test_u16_is_titlecase_SOURCES) \
@@ -2929,14 +2819,15 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_u16_possible_linebreaks_SOURCES) \
 	$(test_u16_prev_SOURCES) $(test_u16_set_SOURCES) \
 	$(test_u16_stpcpy_SOURCES) $(test_u16_stpncpy_SOURCES) \
-	$(test_u16_strcat_SOURCES) $(test_u16_strcmp_SOURCES) \
-	$(test_u16_strcoll_SOURCES) \
+	$(test_u16_strcat_SOURCES) $(test_u16_strchr_SOURCES) \
+	$(test_u16_strcmp_SOURCES) $(test_u16_strcoll_SOURCES) \
 	$(test_u16_strconv_from_enc_SOURCES) \
 	$(test_u16_strconv_to_enc_SOURCES) $(test_u16_strcpy_SOURCES) \
 	$(test_u16_strdup_SOURCES) $(test_u16_strlen_SOURCES) \
 	$(test_u16_strmblen_SOURCES) $(test_u16_strmbtouc_SOURCES) \
 	$(test_u16_strncat_SOURCES) $(test_u16_strncmp_SOURCES) \
 	$(test_u16_strncpy_SOURCES) $(test_u16_strnlen_SOURCES) \
+	$(test_u16_strstr_SOURCES) $(test_u16_strtok_SOURCES) \
 	$(test_u16_strwidth_SOURCES) $(test_u16_to_u32_SOURCES) \
 	$(test_u16_to_u8_SOURCES) $(test_u16_tolower_SOURCES) \
 	$(test_u16_totitle_SOURCES) $(test_u16_toupper_SOURCES) \
@@ -2951,7 +2842,10 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_u32_chr_SOURCES) $(test_u32_cmp_SOURCES) \
 	$(test_u32_cmp2_SOURCES) $(test_u32_conv_from_enc_SOURCES) \
 	$(test_u32_conv_to_enc_SOURCES) $(test_u32_cpy_SOURCES) \
-	$(test_u32_cpy_alloc_SOURCES) $(test_u32_is_cased_SOURCES) \
+	$(test_u32_cpy_alloc_SOURCES) \
+	$(test_u32_grapheme_breaks_SOURCES) \
+	$(test_u32_grapheme_next_SOURCES) \
+	$(test_u32_grapheme_prev_SOURCES) $(test_u32_is_cased_SOURCES) \
 	$(test_u32_is_casefolded_SOURCES) \
 	$(test_u32_is_lowercase_SOURCES) \
 	$(test_u32_is_titlecase_SOURCES) \
@@ -2965,14 +2859,15 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_u32_possible_linebreaks_SOURCES) \
 	$(test_u32_prev_SOURCES) $(test_u32_set_SOURCES) \
 	$(test_u32_stpcpy_SOURCES) $(test_u32_stpncpy_SOURCES) \
-	$(test_u32_strcat_SOURCES) $(test_u32_strcmp_SOURCES) \
-	$(test_u32_strcoll_SOURCES) \
+	$(test_u32_strcat_SOURCES) $(test_u32_strchr_SOURCES) \
+	$(test_u32_strcmp_SOURCES) $(test_u32_strcoll_SOURCES) \
 	$(test_u32_strconv_from_enc_SOURCES) \
 	$(test_u32_strconv_to_enc_SOURCES) $(test_u32_strcpy_SOURCES) \
 	$(test_u32_strdup_SOURCES) $(test_u32_strlen_SOURCES) \
 	$(test_u32_strmblen_SOURCES) $(test_u32_strmbtouc_SOURCES) \
 	$(test_u32_strncat_SOURCES) $(test_u32_strncmp_SOURCES) \
 	$(test_u32_strncpy_SOURCES) $(test_u32_strnlen_SOURCES) \
+	$(test_u32_strstr_SOURCES) $(test_u32_strtok_SOURCES) \
 	$(test_u32_strwidth_SOURCES) $(test_u32_to_u16_SOURCES) \
 	$(test_u32_to_u8_SOURCES) $(test_u32_tolower_SOURCES) \
 	$(test_u32_totitle_SOURCES) $(test_u32_toupper_SOURCES) \
@@ -2987,7 +2882,10 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_u8_chr_SOURCES) $(test_u8_cmp_SOURCES) \
 	$(test_u8_cmp2_SOURCES) $(test_u8_conv_from_enc_SOURCES) \
 	$(test_u8_conv_to_enc_SOURCES) $(test_u8_cpy_SOURCES) \
-	$(test_u8_cpy_alloc_SOURCES) $(test_u8_is_cased_SOURCES) \
+	$(test_u8_cpy_alloc_SOURCES) \
+	$(test_u8_grapheme_breaks_SOURCES) \
+	$(test_u8_grapheme_next_SOURCES) \
+	$(test_u8_grapheme_prev_SOURCES) $(test_u8_is_cased_SOURCES) \
 	$(test_u8_is_casefolded_SOURCES) \
 	$(test_u8_is_lowercase_SOURCES) \
 	$(test_u8_is_titlecase_SOURCES) \
@@ -2999,13 +2897,14 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_u8_possible_linebreaks_SOURCES) $(test_u8_prev_SOURCES) \
 	$(test_u8_set_SOURCES) $(test_u8_stpcpy_SOURCES) \
 	$(test_u8_stpncpy_SOURCES) $(test_u8_strcat_SOURCES) \
-	$(test_u8_strcmp_SOURCES) $(test_u8_strcoll_SOURCES) \
-	$(test_u8_strconv_from_enc_SOURCES) \
+	$(test_u8_strchr_SOURCES) $(test_u8_strcmp_SOURCES) \
+	$(test_u8_strcoll_SOURCES) $(test_u8_strconv_from_enc_SOURCES) \
 	$(test_u8_strconv_to_enc_SOURCES) $(test_u8_strcpy_SOURCES) \
 	$(test_u8_strdup_SOURCES) $(test_u8_strlen_SOURCES) \
 	$(test_u8_strmblen_SOURCES) $(test_u8_strmbtouc_SOURCES) \
 	$(test_u8_strncat_SOURCES) $(test_u8_strncmp_SOURCES) \
 	$(test_u8_strncpy_SOURCES) $(test_u8_strnlen_SOURCES) \
+	$(test_u8_strstr_SOURCES) $(test_u8_strtok_SOURCES) \
 	$(test_u8_strwidth_SOURCES) $(test_u8_to_u16_SOURCES) \
 	$(test_u8_to_u32_SOURCES) $(test_u8_tolower_SOURCES) \
 	$(test_u8_totitle_SOURCES) $(test_u8_toupper_SOURCES) \
@@ -3014,11 +2913,14 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_u8_vasprintf1_SOURCES) $(test_u8_vsnprintf1_SOURCES) \
 	$(test_u8_vsprintf1_SOURCES) $(test_u8_width_SOURCES) \
 	$(test_u8_width_linebreaks_SOURCES) \
-	$(test_u8_wordbreaks_SOURCES) $(test_uc_tolower_SOURCES) \
+	$(test_u8_wordbreaks_SOURCES) $(test_uc_gbrk_prop_SOURCES) \
+	$(test_uc_is_grapheme_break_SOURCES) \
+	$(test_uc_wordbreaks_SOURCES) $(test_uc_tolower_SOURCES) \
 	$(test_uc_totitle_SOURCES) $(test_uc_toupper_SOURCES) \
 	$(test_uc_width_SOURCES) $(test_uc_width2_SOURCES) \
 	$(test_ulc_asnprintf1_SOURCES) $(test_ulc_casecmp_SOURCES) \
 	$(test_ulc_casecoll_SOURCES) \
+	$(test_ulc_grapheme_breaks_SOURCES) \
 	$(test_ulc_possible_linebreaks_SOURCES) \
 	$(test_ulc_vasnprintf1_SOURCES) \
 	$(test_ulc_vasnprintf2_SOURCES) \
@@ -3027,39 +2929,46 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_ulc_width_linebreaks_SOURCES) \
 	$(test_ulc_wordbreaks_SOURCES) $(test_uninames_SOURCES) \
 	$(test_uninorm_filter_nfc_SOURCES) test-unistd.c \
-	test-unsetenv.c test-wchar.c test-wctype.c test-wcwidth.c \
+	test-unsetenv.c test-verify.c test-wchar.c test-wcrtomb.c \
+	test-wcrtomb-w32.c test-wctype-h.c test-wcwidth.c \
 	test-xalloc-die.c
 DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	test-alloca-opt.c test-array-mergesort.c \
-	$(test_bidi_byname_SOURCES) $(test_bidi_name_SOURCES) \
-	$(test_bidi_of_SOURCES) $(test_bidi_test_SOURCES) \
-	$(test_block_list_SOURCES) $(test_block_of_SOURCES) \
-	$(test_block_test_SOURCES) test-c-ctype.c test-c-strcasecmp.c \
+	$(test_bidi_byname_SOURCES) $(test_bidi_longname_SOURCES) \
+	$(test_bidi_name_SOURCES) $(test_bidi_of_SOURCES) \
+	$(test_bidi_test_SOURCES) $(test_block_list_SOURCES) \
+	$(test_block_of_SOURCES) $(test_block_test_SOURCES) \
+	test-btowc.c test-c-ctype.c test-c-strcasecmp.c \
 	test-c-strncasecmp.c $(test_canonical_decomposition_SOURCES) \
 	$(test_cased_SOURCES) $(test_categ_C_SOURCES) \
 	$(test_categ_Cc_SOURCES) $(test_categ_Cf_SOURCES) \
 	$(test_categ_Cn_SOURCES) $(test_categ_Co_SOURCES) \
 	$(test_categ_Cs_SOURCES) $(test_categ_L_SOURCES) \
-	$(test_categ_Ll_SOURCES) $(test_categ_Lm_SOURCES) \
-	$(test_categ_Lo_SOURCES) $(test_categ_Lt_SOURCES) \
-	$(test_categ_Lu_SOURCES) $(test_categ_M_SOURCES) \
-	$(test_categ_Mc_SOURCES) $(test_categ_Me_SOURCES) \
-	$(test_categ_Mn_SOURCES) $(test_categ_N_SOURCES) \
-	$(test_categ_Nd_SOURCES) $(test_categ_Nl_SOURCES) \
-	$(test_categ_No_SOURCES) $(test_categ_P_SOURCES) \
-	$(test_categ_Pc_SOURCES) $(test_categ_Pd_SOURCES) \
-	$(test_categ_Pe_SOURCES) $(test_categ_Pf_SOURCES) \
-	$(test_categ_Pi_SOURCES) $(test_categ_Po_SOURCES) \
-	$(test_categ_Ps_SOURCES) $(test_categ_S_SOURCES) \
-	$(test_categ_Sc_SOURCES) $(test_categ_Sk_SOURCES) \
-	$(test_categ_Sm_SOURCES) $(test_categ_So_SOURCES) \
-	$(test_categ_Z_SOURCES) $(test_categ_Zl_SOURCES) \
-	$(test_categ_Zp_SOURCES) $(test_categ_Zs_SOURCES) \
-	$(test_categ_and_SOURCES) $(test_categ_and_not_SOURCES) \
-	$(test_categ_byname_SOURCES) $(test_categ_name_SOURCES) \
+	$(test_categ_LC_SOURCES) $(test_categ_Ll_SOURCES) \
+	$(test_categ_Lm_SOURCES) $(test_categ_Lo_SOURCES) \
+	$(test_categ_Lt_SOURCES) $(test_categ_Lu_SOURCES) \
+	$(test_categ_M_SOURCES) $(test_categ_Mc_SOURCES) \
+	$(test_categ_Me_SOURCES) $(test_categ_Mn_SOURCES) \
+	$(test_categ_N_SOURCES) $(test_categ_Nd_SOURCES) \
+	$(test_categ_Nl_SOURCES) $(test_categ_No_SOURCES) \
+	$(test_categ_P_SOURCES) $(test_categ_Pc_SOURCES) \
+	$(test_categ_Pd_SOURCES) $(test_categ_Pe_SOURCES) \
+	$(test_categ_Pf_SOURCES) $(test_categ_Pi_SOURCES) \
+	$(test_categ_Po_SOURCES) $(test_categ_Ps_SOURCES) \
+	$(test_categ_S_SOURCES) $(test_categ_Sc_SOURCES) \
+	$(test_categ_Sk_SOURCES) $(test_categ_Sm_SOURCES) \
+	$(test_categ_So_SOURCES) $(test_categ_Z_SOURCES) \
+	$(test_categ_Zl_SOURCES) $(test_categ_Zp_SOURCES) \
+	$(test_categ_Zs_SOURCES) $(test_categ_and_SOURCES) \
+	$(test_categ_and_not_SOURCES) $(test_categ_byname_SOURCES) \
+	$(test_categ_longname_SOURCES) $(test_categ_name_SOURCES) \
 	$(am__test_categ_none_SOURCES_DIST) $(test_categ_of_SOURCES) \
 	$(test_categ_or_SOURCES) $(test_categ_test_withtable_SOURCES) \
-	$(test_combining_SOURCES) $(test_compat_decomposition_SOURCES) \
+	$(test_combiningclass_SOURCES) \
+	$(test_combiningclass_byname_SOURCES) \
+	$(test_combiningclass_longname_SOURCES) \
+	$(test_combiningclass_name_SOURCES) \
+	$(test_compat_decomposition_SOURCES) \
 	$(test_composition_SOURCES) $(test_ctype_alnum_SOURCES) \
 	$(test_ctype_alpha_SOURCES) $(test_ctype_blank_SOURCES) \
 	$(test_ctype_cntrl_SOURCES) $(test_ctype_digit_SOURCES) \
@@ -3069,14 +2978,25 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_ctype_xdigit_SOURCES) $(test_decdigit_SOURCES) \
 	$(test_decomposing_form_SOURCES) $(test_decomposition_SOURCES) \
 	$(test_digit_SOURCES) test-environ.c test-errno.c \
-	$(test_frexpl_nolibm_SOURCES) test-fseterr.c test-iconv.c \
-	test-iconv-h.c $(test_ignorable_SOURCES) test-isnand-nolibm.c \
-	test-isnanf-nolibm.c test-isnanl-nolibm.c test-locale.c \
+	test-fdopen.c test-fgetc.c test-float.c test-fputc.c \
+	test-fread.c $(test_frexp_nolibm_SOURCES) \
+	$(test_frexpl_nolibm_SOURCES) test-fseterr.c test-fwrite.c \
+	test-iconv.c test-iconv-h.c $(test_ignorable_SOURCES) \
+	test-intprops.c test-inttypes.c test-isnand-nolibm.c \
+	test-isnanf-nolibm.c test-isnanl-nolibm.c test-iswblank.c \
+	$(test_joininggroup_byname_SOURCES) \
+	$(test_joininggroup_name_SOURCES) \
+	$(test_joininggroup_of_SOURCES) \
+	$(test_joiningtype_byname_SOURCES) \
+	$(test_joiningtype_longname_SOURCES) \
+	$(test_joiningtype_name_SOURCES) \
+	$(test_joiningtype_of_SOURCES) test-langinfo.c test-locale.c \
 	$(test_locale_language_SOURCES) test-localename.c test-lock.c \
-	test-malloca.c test-math.c test-mbrtowc.c test-mbsinit.c \
-	test-memchr.c $(test_mirror_SOURCES) $(test_nfc_SOURCES) \
-	$(test_nfd_SOURCES) $(test_nfkc_SOURCES) $(test_nfkd_SOURCES) \
-	$(test_numeric_SOURCES) $(test_pr_alphabetic_SOURCES) \
+	test-malloca.c test-math.c test-mbrtowc.c test-mbrtowc-w32.c \
+	test-mbsinit.c test-memchr.c $(test_mirror_SOURCES) \
+	$(test_nfc_SOURCES) $(test_nfd_SOURCES) $(test_nfkc_SOURCES) \
+	$(test_nfkd_SOURCES) $(test_numeric_SOURCES) \
+	$(test_pr_alphabetic_SOURCES) \
 	$(test_pr_ascii_hex_digit_SOURCES) \
 	$(test_pr_bidi_arabic_digit_SOURCES) \
 	$(test_pr_bidi_arabic_right_to_left_SOURCES) \
@@ -3095,6 +3015,12 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_pr_bidi_pdf_SOURCES) \
 	$(test_pr_bidi_segment_separator_SOURCES) \
 	$(test_pr_bidi_whitespace_SOURCES) $(test_pr_byname_SOURCES) \
+	$(test_pr_case_ignorable_SOURCES) $(test_pr_cased_SOURCES) \
+	$(test_pr_changes_when_casefolded_SOURCES) \
+	$(test_pr_changes_when_casemapped_SOURCES) \
+	$(test_pr_changes_when_lowercased_SOURCES) \
+	$(test_pr_changes_when_titlecased_SOURCES) \
+	$(test_pr_changes_when_uppercased_SOURCES) \
 	$(test_pr_combining_SOURCES) $(test_pr_composite_SOURCES) \
 	$(test_pr_currency_symbol_SOURCES) $(test_pr_dash_SOURCES) \
 	$(test_pr_decimal_digit_SOURCES) \
@@ -3141,19 +3067,25 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_pr_white_space_SOURCES) $(test_pr_xid_continue_SOURCES) \
 	$(test_pr_xid_start_SOURCES) $(test_pr_zero_width_SOURCES) \
 	test-printf-frexp.c test-printf-frexpl.c \
-	$(test_scripts_SOURCES) test-setenv.c test-signbit.c \
-	test-stdbool.c test-stddef.c test-stdint.c test-stdlib.c \
-	test-strerror.c test-striconveh.c test-striconveha.c \
-	test-string.c test-strncat.c $(test_sy_c_ident_SOURCES) \
-	$(test_sy_c_whitespace_SOURCES) $(test_sy_java_ident_SOURCES) \
-	$(test_sy_java_whitespace_SOURCES) \
+	$(test_scripts_SOURCES) test-setenv.c test-setlocale1.c \
+	test-setlocale2.c test-signbit.c test-stdalign.c \
+	test-stdbool.c test-stddef.c test-stdint.c test-stdio.c \
+	test-stdlib.c test-strerror.c test-striconveh.c \
+	test-striconveha.c test-string.c test-strncat.c test-strstr.c \
+	$(test_sy_c_ident_SOURCES) $(test_sy_c_whitespace_SOURCES) \
+	$(test_sy_java_ident_SOURCES) \
+	$(test_sy_java_whitespace_SOURCES) test-sys_types.c \
+	test-thread_create.c test-thread_self.c \
 	$(test_u16_asnprintf1_SOURCES) $(test_u16_casecmp_SOURCES) \
 	$(test_u16_casecoll_SOURCES) $(test_u16_casefold_SOURCES) \
 	$(test_u16_check_SOURCES) $(test_u16_chr_SOURCES) \
 	$(test_u16_cmp_SOURCES) $(test_u16_cmp2_SOURCES) \
 	$(test_u16_conv_from_enc_SOURCES) \
 	$(test_u16_conv_to_enc_SOURCES) $(test_u16_cpy_SOURCES) \
-	$(test_u16_cpy_alloc_SOURCES) $(test_u16_is_cased_SOURCES) \
+	$(test_u16_cpy_alloc_SOURCES) \
+	$(test_u16_grapheme_breaks_SOURCES) \
+	$(test_u16_grapheme_next_SOURCES) \
+	$(test_u16_grapheme_prev_SOURCES) $(test_u16_is_cased_SOURCES) \
 	$(test_u16_is_casefolded_SOURCES) \
 	$(test_u16_is_lowercase_SOURCES) \
 	$(test_u16_is_titlecase_SOURCES) \
@@ -3165,14 +3097,15 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_u16_possible_linebreaks_SOURCES) \
 	$(test_u16_prev_SOURCES) $(test_u16_set_SOURCES) \
 	$(test_u16_stpcpy_SOURCES) $(test_u16_stpncpy_SOURCES) \
-	$(test_u16_strcat_SOURCES) $(test_u16_strcmp_SOURCES) \
-	$(test_u16_strcoll_SOURCES) \
+	$(test_u16_strcat_SOURCES) $(test_u16_strchr_SOURCES) \
+	$(test_u16_strcmp_SOURCES) $(test_u16_strcoll_SOURCES) \
 	$(test_u16_strconv_from_enc_SOURCES) \
 	$(test_u16_strconv_to_enc_SOURCES) $(test_u16_strcpy_SOURCES) \
 	$(test_u16_strdup_SOURCES) $(test_u16_strlen_SOURCES) \
 	$(test_u16_strmblen_SOURCES) $(test_u16_strmbtouc_SOURCES) \
 	$(test_u16_strncat_SOURCES) $(test_u16_strncmp_SOURCES) \
 	$(test_u16_strncpy_SOURCES) $(test_u16_strnlen_SOURCES) \
+	$(test_u16_strstr_SOURCES) $(test_u16_strtok_SOURCES) \
 	$(test_u16_strwidth_SOURCES) $(test_u16_to_u32_SOURCES) \
 	$(test_u16_to_u8_SOURCES) $(test_u16_tolower_SOURCES) \
 	$(test_u16_totitle_SOURCES) $(test_u16_toupper_SOURCES) \
@@ -3187,7 +3120,10 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_u32_chr_SOURCES) $(test_u32_cmp_SOURCES) \
 	$(test_u32_cmp2_SOURCES) $(test_u32_conv_from_enc_SOURCES) \
 	$(test_u32_conv_to_enc_SOURCES) $(test_u32_cpy_SOURCES) \
-	$(test_u32_cpy_alloc_SOURCES) $(test_u32_is_cased_SOURCES) \
+	$(test_u32_cpy_alloc_SOURCES) \
+	$(test_u32_grapheme_breaks_SOURCES) \
+	$(test_u32_grapheme_next_SOURCES) \
+	$(test_u32_grapheme_prev_SOURCES) $(test_u32_is_cased_SOURCES) \
 	$(test_u32_is_casefolded_SOURCES) \
 	$(test_u32_is_lowercase_SOURCES) \
 	$(test_u32_is_titlecase_SOURCES) \
@@ -3201,14 +3137,15 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_u32_possible_linebreaks_SOURCES) \
 	$(test_u32_prev_SOURCES) $(test_u32_set_SOURCES) \
 	$(test_u32_stpcpy_SOURCES) $(test_u32_stpncpy_SOURCES) \
-	$(test_u32_strcat_SOURCES) $(test_u32_strcmp_SOURCES) \
-	$(test_u32_strcoll_SOURCES) \
+	$(test_u32_strcat_SOURCES) $(test_u32_strchr_SOURCES) \
+	$(test_u32_strcmp_SOURCES) $(test_u32_strcoll_SOURCES) \
 	$(test_u32_strconv_from_enc_SOURCES) \
 	$(test_u32_strconv_to_enc_SOURCES) $(test_u32_strcpy_SOURCES) \
 	$(test_u32_strdup_SOURCES) $(test_u32_strlen_SOURCES) \
 	$(test_u32_strmblen_SOURCES) $(test_u32_strmbtouc_SOURCES) \
 	$(test_u32_strncat_SOURCES) $(test_u32_strncmp_SOURCES) \
 	$(test_u32_strncpy_SOURCES) $(test_u32_strnlen_SOURCES) \
+	$(test_u32_strstr_SOURCES) $(test_u32_strtok_SOURCES) \
 	$(test_u32_strwidth_SOURCES) $(test_u32_to_u16_SOURCES) \
 	$(test_u32_to_u8_SOURCES) $(test_u32_tolower_SOURCES) \
 	$(test_u32_totitle_SOURCES) $(test_u32_toupper_SOURCES) \
@@ -3223,7 +3160,10 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_u8_chr_SOURCES) $(test_u8_cmp_SOURCES) \
 	$(test_u8_cmp2_SOURCES) $(test_u8_conv_from_enc_SOURCES) \
 	$(test_u8_conv_to_enc_SOURCES) $(test_u8_cpy_SOURCES) \
-	$(test_u8_cpy_alloc_SOURCES) $(test_u8_is_cased_SOURCES) \
+	$(test_u8_cpy_alloc_SOURCES) \
+	$(test_u8_grapheme_breaks_SOURCES) \
+	$(test_u8_grapheme_next_SOURCES) \
+	$(test_u8_grapheme_prev_SOURCES) $(test_u8_is_cased_SOURCES) \
 	$(test_u8_is_casefolded_SOURCES) \
 	$(test_u8_is_lowercase_SOURCES) \
 	$(test_u8_is_titlecase_SOURCES) \
@@ -3235,13 +3175,14 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_u8_possible_linebreaks_SOURCES) $(test_u8_prev_SOURCES) \
 	$(test_u8_set_SOURCES) $(test_u8_stpcpy_SOURCES) \
 	$(test_u8_stpncpy_SOURCES) $(test_u8_strcat_SOURCES) \
-	$(test_u8_strcmp_SOURCES) $(test_u8_strcoll_SOURCES) \
-	$(test_u8_strconv_from_enc_SOURCES) \
+	$(test_u8_strchr_SOURCES) $(test_u8_strcmp_SOURCES) \
+	$(test_u8_strcoll_SOURCES) $(test_u8_strconv_from_enc_SOURCES) \
 	$(test_u8_strconv_to_enc_SOURCES) $(test_u8_strcpy_SOURCES) \
 	$(test_u8_strdup_SOURCES) $(test_u8_strlen_SOURCES) \
 	$(test_u8_strmblen_SOURCES) $(test_u8_strmbtouc_SOURCES) \
 	$(test_u8_strncat_SOURCES) $(test_u8_strncmp_SOURCES) \
 	$(test_u8_strncpy_SOURCES) $(test_u8_strnlen_SOURCES) \
+	$(test_u8_strstr_SOURCES) $(test_u8_strtok_SOURCES) \
 	$(test_u8_strwidth_SOURCES) $(test_u8_to_u16_SOURCES) \
 	$(test_u8_to_u32_SOURCES) $(test_u8_tolower_SOURCES) \
 	$(test_u8_totitle_SOURCES) $(test_u8_toupper_SOURCES) \
@@ -3250,52 +3191,274 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_u8_vasprintf1_SOURCES) $(test_u8_vsnprintf1_SOURCES) \
 	$(test_u8_vsprintf1_SOURCES) $(test_u8_width_SOURCES) \
 	$(test_u8_width_linebreaks_SOURCES) \
-	$(test_u8_wordbreaks_SOURCES) $(test_uc_tolower_SOURCES) \
+	$(test_u8_wordbreaks_SOURCES) $(test_uc_gbrk_prop_SOURCES) \
+	$(test_uc_is_grapheme_break_SOURCES) \
+	$(test_uc_wordbreaks_SOURCES) $(test_uc_tolower_SOURCES) \
 	$(test_uc_totitle_SOURCES) $(test_uc_toupper_SOURCES) \
 	$(test_uc_width_SOURCES) $(test_uc_width2_SOURCES) \
 	$(test_ulc_asnprintf1_SOURCES) $(test_ulc_casecmp_SOURCES) \
 	$(test_ulc_casecoll_SOURCES) \
+	$(test_ulc_grapheme_breaks_SOURCES) \
 	$(test_ulc_possible_linebreaks_SOURCES) \
 	$(test_ulc_vasnprintf1_SOURCES) \
 	$(test_ulc_vasnprintf2_SOURCES) \
 	$(test_ulc_vasnprintf3_SOURCES) $(test_ulc_vasprintf1_SOURCES) \
 	$(test_ulc_vsnprintf1_SOURCES) $(test_ulc_vsprintf1_SOURCES) \
 	$(test_ulc_width_linebreaks_SOURCES) \
-	$(test_ulc_wordbreaks_SOURCES) $(test_uninames_SOURCES) \
+	$(test_ulc_wordbreaks_SOURCES) \
+	$(am__test_uninames_SOURCES_DIST) \
 	$(test_uninorm_filter_nfc_SOURCES) test-unistd.c \
-	test-unsetenv.c test-wchar.c test-wctype.c test-wcwidth.c \
+	test-unsetenv.c test-verify.c test-wchar.c test-wcrtomb.c \
+	test-wcrtomb-w32.c test-wctype-h.c test-wcwidth.c \
 	test-xalloc-die.c
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	check recheck distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-# If stdout is a non-dumb tty, use colors.  If test -t is not supported,
-# then this fails; a conservative approach.  Of course do not redirect
-# stdout here, just stderr.
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=; \
-test "X$(AM_COLOR_TESTS)" != Xno \
-&& test "X$$TERM" != Xdumb \
-&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
-&& { \
-  red=''; \
-  grn=''; \
-  lgn=''; \
-  blu=''; \
-  std=''; \
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
 }
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.gnulib $(srcdir)/Makefile.in \
+	$(top_srcdir)/build-aux/depcomp \
+	$(top_srcdir)/build-aux/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -3322,6 +3485,7 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
+pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
@@ -3329,6 +3493,7 @@ AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
+ARFLAGS = @ARFLAGS@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -3368,38 +3533,97 @@ FGREP = @FGREP@
 FLOAT_H = @FLOAT_H@
 GLIBC21 = @GLIBC21@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
+GNULIB_ACOSF = @GNULIB_ACOSF@
 GNULIB_ACOSL = @GNULIB_ACOSL@
+GNULIB_ASINF = @GNULIB_ASINF@
 GNULIB_ASINL = @GNULIB_ASINL@
+GNULIB_ATAN2F = @GNULIB_ATAN2F@
+GNULIB_ATANF = @GNULIB_ATANF@
 GNULIB_ATANL = @GNULIB_ATANL@
 GNULIB_ATOLL = @GNULIB_ATOLL@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
+GNULIB_CBRT = @GNULIB_CBRT@
+GNULIB_CBRTF = @GNULIB_CBRTF@
+GNULIB_CBRTL = @GNULIB_CBRTL@
+GNULIB_CEIL = @GNULIB_CEIL@
 GNULIB_CEILF = @GNULIB_CEILF@
 GNULIB_CEILL = @GNULIB_CEILL@
+GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPYSIGN = @GNULIB_COPYSIGN@
+GNULIB_COPYSIGNF = @GNULIB_COPYSIGNF@
+GNULIB_COPYSIGNL = @GNULIB_COPYSIGNL@
+GNULIB_COSF = @GNULIB_COSF@
+GNULIB_COSHF = @GNULIB_COSHF@
 GNULIB_COSL = @GNULIB_COSL@
+GNULIB_DPRINTF = @GNULIB_DPRINTF@
+GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
 GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
+GNULIB_EXP2 = @GNULIB_EXP2@
+GNULIB_EXP2F = @GNULIB_EXP2F@
+GNULIB_EXP2L = @GNULIB_EXP2L@
+GNULIB_EXPF = @GNULIB_EXPF@
 GNULIB_EXPL = @GNULIB_EXPL@
+GNULIB_EXPM1 = @GNULIB_EXPM1@
+GNULIB_EXPM1F = @GNULIB_EXPM1F@
+GNULIB_EXPM1L = @GNULIB_EXPM1L@
+GNULIB_FABSF = @GNULIB_FABSF@
+GNULIB_FABSL = @GNULIB_FABSL@
 GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
 GNULIB_FCHDIR = @GNULIB_FCHDIR@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
+GNULIB_FCLOSE = @GNULIB_FCLOSE@
+GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
+GNULIB_FDOPEN = @GNULIB_FDOPEN@
+GNULIB_FFLUSH = @GNULIB_FFLUSH@
+GNULIB_FFSL = @GNULIB_FFSL@
+GNULIB_FFSLL = @GNULIB_FFSLL@
+GNULIB_FGETC = @GNULIB_FGETC@
+GNULIB_FGETS = @GNULIB_FGETS@
+GNULIB_FLOOR = @GNULIB_FLOOR@
 GNULIB_FLOORF = @GNULIB_FLOORF@
 GNULIB_FLOORL = @GNULIB_FLOORL@
+GNULIB_FMA = @GNULIB_FMA@
+GNULIB_FMAF = @GNULIB_FMAF@
+GNULIB_FMAL = @GNULIB_FMAL@
+GNULIB_FMOD = @GNULIB_FMOD@
+GNULIB_FMODF = @GNULIB_FMODF@
+GNULIB_FMODL = @GNULIB_FMODL@
+GNULIB_FOPEN = @GNULIB_FOPEN@
+GNULIB_FPRINTF = @GNULIB_FPRINTF@
+GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
+GNULIB_FPURGE = @GNULIB_FPURGE@
+GNULIB_FPUTC = @GNULIB_FPUTC@
+GNULIB_FPUTS = @GNULIB_FPUTS@
+GNULIB_FREAD = @GNULIB_FREAD@
+GNULIB_FREOPEN = @GNULIB_FREOPEN@
 GNULIB_FREXP = @GNULIB_FREXP@
+GNULIB_FREXPF = @GNULIB_FREXPF@
 GNULIB_FREXPL = @GNULIB_FREXPL@
+GNULIB_FSCANF = @GNULIB_FSCANF@
+GNULIB_FSEEK = @GNULIB_FSEEK@
+GNULIB_FSEEKO = @GNULIB_FSEEKO@
 GNULIB_FSYNC = @GNULIB_FSYNC@
+GNULIB_FTELL = @GNULIB_FTELL@
+GNULIB_FTELLO = @GNULIB_FTELLO@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
+GNULIB_FWRITE = @GNULIB_FWRITE@
+GNULIB_GETC = @GNULIB_GETC@
+GNULIB_GETCHAR = @GNULIB_GETCHAR@
 GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
 GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
 GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
 GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
+GNULIB_GETLINE = @GNULIB_GETLINE@
 GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
@@ -3407,17 +3631,45 @@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
+GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
+GNULIB_HYPOT = @GNULIB_HYPOT@
+GNULIB_HYPOTF = @GNULIB_HYPOTF@
+GNULIB_HYPOTL = @GNULIB_HYPOTL@
+GNULIB_ICONV = @GNULIB_ICONV@
+GNULIB_ILOGB = @GNULIB_ILOGB@
+GNULIB_ILOGBF = @GNULIB_ILOGBF@
+GNULIB_ILOGBL = @GNULIB_ILOGBL@
+GNULIB_IMAXABS = @GNULIB_IMAXABS@
+GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
+GNULIB_ISATTY = @GNULIB_ISATTY@
 GNULIB_ISFINITE = @GNULIB_ISFINITE@
 GNULIB_ISINF = @GNULIB_ISINF@
 GNULIB_ISNAN = @GNULIB_ISNAN@
 GNULIB_ISNAND = @GNULIB_ISNAND@
 GNULIB_ISNANF = @GNULIB_ISNANF@
 GNULIB_ISNANL = @GNULIB_ISNANL@
+GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
+GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LDEXPF = @GNULIB_LDEXPF@
 GNULIB_LDEXPL = @GNULIB_LDEXPL@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
+GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOG = @GNULIB_LOG@
+GNULIB_LOG10 = @GNULIB_LOG10@
+GNULIB_LOG10F = @GNULIB_LOG10F@
+GNULIB_LOG10L = @GNULIB_LOG10L@
+GNULIB_LOG1P = @GNULIB_LOG1P@
+GNULIB_LOG1PF = @GNULIB_LOG1PF@
+GNULIB_LOG1PL = @GNULIB_LOG1PL@
+GNULIB_LOG2 = @GNULIB_LOG2@
+GNULIB_LOG2F = @GNULIB_LOG2F@
+GNULIB_LOG2L = @GNULIB_LOG2L@
 GNULIB_LOGB = @GNULIB_LOGB@
+GNULIB_LOGBF = @GNULIB_LOGBF@
+GNULIB_LOGBL = @GNULIB_LOGBL@
+GNULIB_LOGF = @GNULIB_LOGF@
 GNULIB_LOGL = @GNULIB_LOGL@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -3440,6 +3692,7 @@ GNULIB_MBSSEP = @GNULIB_MBSSEP@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
 GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
+GNULIB_MBTOWC = @GNULIB_MBTOWC@
 GNULIB_MEMCHR = @GNULIB_MEMCHR@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
@@ -3449,32 +3702,75 @@ GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@
 GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
 GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
 GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
+GNULIB_MODF = @GNULIB_MODF@
+GNULIB_MODFF = @GNULIB_MODFF@
+GNULIB_MODFL = @GNULIB_MODFL@
+GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
+GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
+GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
+GNULIB_PCLOSE = @GNULIB_PCLOSE@
+GNULIB_PERROR = @GNULIB_PERROR@
+GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
+GNULIB_POPEN = @GNULIB_POPEN@
+GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
+GNULIB_POWF = @GNULIB_POWF@
 GNULIB_PREAD = @GNULIB_PREAD@
+GNULIB_PRINTF = @GNULIB_PRINTF@
+GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
 GNULIB_PTSNAME = @GNULIB_PTSNAME@
+GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
+GNULIB_PUTC = @GNULIB_PUTC@
+GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
+GNULIB_PUTS = @GNULIB_PUTS@
+GNULIB_PWRITE = @GNULIB_PWRITE@
+GNULIB_QSORT_R = @GNULIB_QSORT_R@
+GNULIB_RANDOM = @GNULIB_RANDOM@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
+GNULIB_READ = @GNULIB_READ@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_REMAINDER = @GNULIB_REMAINDER@
+GNULIB_REMAINDERF = @GNULIB_REMAINDERF@
+GNULIB_REMAINDERL = @GNULIB_REMAINDERL@
+GNULIB_REMOVE = @GNULIB_REMOVE@
+GNULIB_RENAME = @GNULIB_RENAME@
+GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
+GNULIB_RINT = @GNULIB_RINT@
+GNULIB_RINTF = @GNULIB_RINTF@
+GNULIB_RINTL = @GNULIB_RINTL@
 GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_ROUND = @GNULIB_ROUND@
 GNULIB_ROUNDF = @GNULIB_ROUNDF@
 GNULIB_ROUNDL = @GNULIB_ROUNDL@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
+GNULIB_SCANF = @GNULIB_SCANF@
+GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
 GNULIB_SETENV = @GNULIB_SETENV@
+GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
+GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
 GNULIB_SIGNBIT = @GNULIB_SIGNBIT@
+GNULIB_SINF = @GNULIB_SINF@
+GNULIB_SINHF = @GNULIB_SINHF@
 GNULIB_SINL = @GNULIB_SINL@
 GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
+GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
+GNULIB_SQRTF = @GNULIB_SQRTF@
 GNULIB_SQRTL = @GNULIB_SQRTL@
+GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
+GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
 GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
+GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
 GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
@@ -3483,87 +3779,197 @@ GNULIB_STRSEP = @GNULIB_STRSEP@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
+GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
+GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
+GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
+GNULIB_TANF = @GNULIB_TANF@
+GNULIB_TANHF = @GNULIB_TANHF@
 GNULIB_TANL = @GNULIB_TANL@
+GNULIB_TMPFILE = @GNULIB_TMPFILE@
+GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
 GNULIB_TRUNC = @GNULIB_TRUNC@
 GNULIB_TRUNCF = @GNULIB_TRUNCF@
 GNULIB_TRUNCL = @GNULIB_TRUNCL@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
-GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
+GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNLINK = @GNULIB_UNLINK@
 GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
 GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
 GNULIB_UNSETENV = @GNULIB_UNSETENV@
 GNULIB_USLEEP = @GNULIB_USLEEP@
+GNULIB_VASPRINTF = @GNULIB_VASPRINTF@
+GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
+GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
+GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
+GNULIB_VFSCANF = @GNULIB_VFSCANF@
+GNULIB_VPRINTF = @GNULIB_VPRINTF@
+GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
+GNULIB_VSCANF = @GNULIB_VSCANF@
+GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
+GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
+GNULIB_WCPCPY = @GNULIB_WCPCPY@
+GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
+GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
+GNULIB_WCSCAT = @GNULIB_WCSCAT@
+GNULIB_WCSCHR = @GNULIB_WCSCHR@
+GNULIB_WCSCMP = @GNULIB_WCSCMP@
+GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
+GNULIB_WCSCPY = @GNULIB_WCSCPY@
+GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
+GNULIB_WCSDUP = @GNULIB_WCSDUP@
+GNULIB_WCSLEN = @GNULIB_WCSLEN@
+GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
+GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
+GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
+GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
+GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
+GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
+GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
+GNULIB_WCSSPN = @GNULIB_WCSSPN@
+GNULIB_WCSSTR = @GNULIB_WCSSTR@
+GNULIB_WCSTOK = @GNULIB_WCSTOK@
+GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
+GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
 GNULIB_WCTOB = @GNULIB_WCTOB@
+GNULIB_WCTOMB = @GNULIB_WCTOMB@
+GNULIB_WCTRANS = @GNULIB_WCTRANS@
+GNULIB_WCTYPE = @GNULIB_WCTYPE@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
+GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
+GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
+GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
+GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
+GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
+GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
+HAVE_ACOSF = @HAVE_ACOSF@
 HAVE_ACOSL = @HAVE_ACOSL@
+HAVE_ASINF = @HAVE_ASINF@
 HAVE_ASINL = @HAVE_ASINL@
+HAVE_ATAN2F = @HAVE_ATAN2F@
+HAVE_ATANF = @HAVE_ATANF@
 HAVE_ATANL = @HAVE_ATANL@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
-HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
+HAVE_CBRT = @HAVE_CBRT@
+HAVE_CBRTF = @HAVE_CBRTF@
+HAVE_CBRTL = @HAVE_CBRTL@
 HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPYSIGN = @HAVE_COPYSIGN@
+HAVE_COPYSIGNL = @HAVE_COPYSIGNL@
+HAVE_COSF = @HAVE_COSF@
+HAVE_COSHF = @HAVE_COSHF@
 HAVE_COSL = @HAVE_COSL@
 HAVE_DECL_ACOSL = @HAVE_DECL_ACOSL@
 HAVE_DECL_ASINL = @HAVE_DECL_ASINL@
 HAVE_DECL_ATANL = @HAVE_DECL_ATANL@
+HAVE_DECL_CBRTF = @HAVE_DECL_CBRTF@
+HAVE_DECL_CBRTL = @HAVE_DECL_CBRTL@
 HAVE_DECL_CEILF = @HAVE_DECL_CEILF@
 HAVE_DECL_CEILL = @HAVE_DECL_CEILL@
+HAVE_DECL_COPYSIGNF = @HAVE_DECL_COPYSIGNF@
 HAVE_DECL_COSL = @HAVE_DECL_COSL@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_EXP2 = @HAVE_DECL_EXP2@
+HAVE_DECL_EXP2F = @HAVE_DECL_EXP2F@
+HAVE_DECL_EXP2L = @HAVE_DECL_EXP2L@
 HAVE_DECL_EXPL = @HAVE_DECL_EXPL@
+HAVE_DECL_EXPM1L = @HAVE_DECL_EXPM1L@
+HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
+HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
 HAVE_DECL_FLOORF = @HAVE_DECL_FLOORF@
 HAVE_DECL_FLOORL = @HAVE_DECL_FLOORL@
+HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
 HAVE_DECL_FREXPL = @HAVE_DECL_FREXPL@
+HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
+HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
+HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
+HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
+HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
+HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
 HAVE_DECL_LDEXPL = @HAVE_DECL_LDEXPL@
+HAVE_DECL_LOG10L = @HAVE_DECL_LOG10L@
+HAVE_DECL_LOG2 = @HAVE_DECL_LOG2@
+HAVE_DECL_LOG2F = @HAVE_DECL_LOG2F@
+HAVE_DECL_LOG2L = @HAVE_DECL_LOG2L@
 HAVE_DECL_LOGB = @HAVE_DECL_LOGB@
 HAVE_DECL_LOGL = @HAVE_DECL_LOGL@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
+HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
+HAVE_DECL_REMAINDER = @HAVE_DECL_REMAINDER@
+HAVE_DECL_REMAINDERL = @HAVE_DECL_REMAINDERL@
+HAVE_DECL_RINTF = @HAVE_DECL_RINTF@
 HAVE_DECL_ROUND = @HAVE_DECL_ROUND@
 HAVE_DECL_ROUNDF = @HAVE_DECL_ROUNDF@
 HAVE_DECL_ROUNDL = @HAVE_DECL_ROUNDL@
+HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
+HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SINL = @HAVE_DECL_SINL@
+HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
+HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
+HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
+HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
 HAVE_DECL_TANL = @HAVE_DECL_TANL@
 HAVE_DECL_TRUNC = @HAVE_DECL_TRUNC@
 HAVE_DECL_TRUNCF = @HAVE_DECL_TRUNCF@
 HAVE_DECL_TRUNCL = @HAVE_DECL_TRUNCL@
+HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
+HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
+HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
+HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
 HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
+HAVE_EXPF = @HAVE_EXPF@
 HAVE_EXPL = @HAVE_EXPL@
+HAVE_EXPM1 = @HAVE_EXPM1@
+HAVE_EXPM1F = @HAVE_EXPM1F@
+HAVE_FABSF = @HAVE_FABSF@
+HAVE_FABSL = @HAVE_FABSL@
 HAVE_FACCESSAT = @HAVE_FACCESSAT@
 HAVE_FCHDIR = @HAVE_FCHDIR@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
+HAVE_FDATASYNC = @HAVE_FDATASYNC@
+HAVE_FEATURES_H = @HAVE_FEATURES_H@
+HAVE_FFSL = @HAVE_FFSL@
+HAVE_FFSLL = @HAVE_FFSLL@
+HAVE_FMA = @HAVE_FMA@
+HAVE_FMAF = @HAVE_FMAF@
+HAVE_FMAL = @HAVE_FMAL@
+HAVE_FMODF = @HAVE_FMODF@
+HAVE_FMODL = @HAVE_FMODL@
+HAVE_FREXPF = @HAVE_FREXPF@
+HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSYNC = @HAVE_FSYNC@
+HAVE_FTELLO = @HAVE_FTELLO@
 HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
-HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
@@ -3572,18 +3978,38 @@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
+HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_HYPOTF = @HAVE_HYPOTF@
+HAVE_HYPOTL = @HAVE_HYPOTL@
+HAVE_ILOGB = @HAVE_ILOGB@
+HAVE_ILOGBF = @HAVE_ILOGBF@
+HAVE_ILOGBL = @HAVE_ILOGBL@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISNAND = @HAVE_ISNAND@
 HAVE_ISNANF = @HAVE_ISNANF@
 HAVE_ISNANL = @HAVE_ISNANL@
 HAVE_ISWBLANK = @HAVE_ISWBLANK@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
+HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
+HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
+HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
+HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHOWN = @HAVE_LCHOWN@
+HAVE_LDEXPF = @HAVE_LDEXPF@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOG10F = @HAVE_LOG10F@
+HAVE_LOG10L = @HAVE_LOG10L@
+HAVE_LOG1P = @HAVE_LOG1P@
+HAVE_LOG1PF = @HAVE_LOG1PF@
+HAVE_LOG1PL = @HAVE_LOG1PL@
+HAVE_LOGBF = @HAVE_LOGBF@
+HAVE_LOGBL = @HAVE_LOGBL@
+HAVE_LOGF = @HAVE_LOGF@
 HAVE_LOGL = @HAVE_LOGL@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
-HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -3597,24 +4023,46 @@ HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
 HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
 HAVE_MKSTEMP = @HAVE_MKSTEMP@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
+HAVE_MODFF = @HAVE_MODFF@
+HAVE_MODFL = @HAVE_MODFL@
+HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
+HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
 HAVE_OS_H = @HAVE_OS_H@
+HAVE_PCLOSE = @HAVE_PCLOSE@
+HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
+HAVE_POPEN = @HAVE_POPEN@
+HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
+HAVE_POWF = @HAVE_POWF@
 HAVE_PREAD = @HAVE_PREAD@
 HAVE_PTSNAME = @HAVE_PTSNAME@
+HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
+HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_RANDOM = @HAVE_RANDOM@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
-HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_REALPATH = @HAVE_REALPATH@
+HAVE_REMAINDER = @HAVE_REMAINDER@
+HAVE_REMAINDERF = @HAVE_REMAINDERF@
+HAVE_RENAMEAT = @HAVE_RENAMEAT@
+HAVE_RINT = @HAVE_RINT@
+HAVE_RINTL = @HAVE_RINTL@
 HAVE_RPMATCH = @HAVE_RPMATCH@
+HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = @HAVE_SAME_LONG_DOUBLE_AS_DOUBLE@
+HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
 HAVE_SETENV = @HAVE_SETENV@
+HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
 HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SINF = @HAVE_SINF@
+HAVE_SINHF = @HAVE_SINHF@
 HAVE_SINL = @HAVE_SINL@
 HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_SQRTF = @HAVE_SQRTF@
 HAVE_SQRTL = @HAVE_SQRTL@
 HAVE_STDINT_H = @HAVE_STDINT_H@
 HAVE_STPCPY = @HAVE_STPCPY@
@@ -3635,24 +4083,59 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_TANF = @HAVE_TANF@
+HAVE_TANHF = @HAVE_TANHF@
 HAVE_TANL = @HAVE_TANL@
-HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
-HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_USLEEP = @HAVE_USLEEP@
+HAVE_VASPRINTF = @HAVE_VASPRINTF@
+HAVE_VDPRINTF = @HAVE_VDPRINTF@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
+HAVE_WCPCPY = @HAVE_WCPCPY@
+HAVE_WCPNCPY = @HAVE_WCPNCPY@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
+HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
+HAVE_WCSCAT = @HAVE_WCSCAT@
+HAVE_WCSCHR = @HAVE_WCSCHR@
+HAVE_WCSCMP = @HAVE_WCSCMP@
+HAVE_WCSCOLL = @HAVE_WCSCOLL@
+HAVE_WCSCPY = @HAVE_WCSCPY@
+HAVE_WCSCSPN = @HAVE_WCSCSPN@
+HAVE_WCSDUP = @HAVE_WCSDUP@
+HAVE_WCSLEN = @HAVE_WCSLEN@
+HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
+HAVE_WCSNCAT = @HAVE_WCSNCAT@
+HAVE_WCSNCMP = @HAVE_WCSNCMP@
+HAVE_WCSNCPY = @HAVE_WCSNCPY@
+HAVE_WCSNLEN = @HAVE_WCSNLEN@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
+HAVE_WCSPBRK = @HAVE_WCSPBRK@
+HAVE_WCSRCHR = @HAVE_WCSRCHR@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
+HAVE_WCSSPN = @HAVE_WCSSPN@
+HAVE_WCSSTR = @HAVE_WCSSTR@
+HAVE_WCSTOK = @HAVE_WCSTOK@
+HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
+HAVE_WCSXFRM = @HAVE_WCSXFRM@
+HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
+HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
+HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
+HAVE_WMEMCHR = @HAVE_WMEMCHR@
+HAVE_WMEMCMP = @HAVE_WMEMCMP@
+HAVE_WMEMCPY = @HAVE_WMEMCPY@
+HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
+HAVE_WMEMSET = @HAVE_WMEMSET@
 HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
+HAVE__EXIT = @HAVE__EXIT@
 HEXVERSION = @HEXVERSION@
+ICONV_CONST = @ICONV_CONST@
 ICONV_H = @ICONV_H@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
@@ -3661,6 +4144,8 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
+INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -3674,9 +4159,22 @@ LIBS = @LIBS@
 LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@
 LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
+LIBUNISTRING_UNICASE_H = @LIBUNISTRING_UNICASE_H@
+LIBUNISTRING_UNICONV_H = @LIBUNISTRING_UNICONV_H@
+LIBUNISTRING_UNICTYPE_H = @LIBUNISTRING_UNICTYPE_H@
+LIBUNISTRING_UNIGBRK_H = @LIBUNISTRING_UNIGBRK_H@
+LIBUNISTRING_UNILBRK_H = @LIBUNISTRING_UNILBRK_H@
+LIBUNISTRING_UNINAME_H = @LIBUNISTRING_UNINAME_H@
+LIBUNISTRING_UNINORM_H = @LIBUNISTRING_UNINORM_H@
+LIBUNISTRING_UNISTDIO_H = @LIBUNISTRING_UNISTDIO_H@
+LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
+LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
+LIBUNISTRING_UNIWBRK_H = @LIBUNISTRING_UNIWBRK_H@
+LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_AR = @LOCALE_AR@
 LOCALE_FR = @LOCALE_FR@
 LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
 LOCALE_JA = @LOCALE_JA@
@@ -3689,29 +4187,38 @@ LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NAMESPACING = @NAMESPACING@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
+NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
+NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_MATH_H = @NEXT_AS_FIRST_DIRECTIVE_MATH_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
+NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
+NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
+NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
+NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_MATH_H = @NEXT_MATH_H@
 NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
+NEXT_STDIO_H = @NEXT_STDIO_H@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
+NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
 NEXT_WCHAR_H = @NEXT_WCHAR_H@
 NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
@@ -3730,86 +4237,196 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
+PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+PRIPTR_PREFIX = @PRIPTR_PREFIX@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
 RANLIB = @RANLIB@
 RC = @RC@
 RELOCATABLE = @RELOCATABLE@
 REPLACE_BTOWC = @REPLACE_BTOWC@
+REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
+REPLACE_CBRTF = @REPLACE_CBRTF@
+REPLACE_CBRTL = @REPLACE_CBRTL@
+REPLACE_CEIL = @REPLACE_CEIL@
 REPLACE_CEILF = @REPLACE_CEILF@
 REPLACE_CEILL = @REPLACE_CEILL@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
 REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
+REPLACE_EXP2 = @REPLACE_EXP2@
+REPLACE_EXP2L = @REPLACE_EXP2L@
+REPLACE_EXPM1 = @REPLACE_EXPM1@
+REPLACE_EXPM1F = @REPLACE_EXPM1F@
+REPLACE_FABSL = @REPLACE_FABSL@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
+REPLACE_FCLOSE = @REPLACE_FCLOSE@
+REPLACE_FDOPEN = @REPLACE_FDOPEN@
+REPLACE_FFLUSH = @REPLACE_FFLUSH@
+REPLACE_FLOOR = @REPLACE_FLOOR@
 REPLACE_FLOORF = @REPLACE_FLOORF@
 REPLACE_FLOORL = @REPLACE_FLOORL@
+REPLACE_FMA = @REPLACE_FMA@
+REPLACE_FMAF = @REPLACE_FMAF@
+REPLACE_FMAL = @REPLACE_FMAL@
+REPLACE_FMOD = @REPLACE_FMOD@
+REPLACE_FMODF = @REPLACE_FMODF@
+REPLACE_FMODL = @REPLACE_FMODL@
+REPLACE_FOPEN = @REPLACE_FOPEN@
+REPLACE_FPRINTF = @REPLACE_FPRINTF@
+REPLACE_FPURGE = @REPLACE_FPURGE@
+REPLACE_FREOPEN = @REPLACE_FREOPEN@
 REPLACE_FREXP = @REPLACE_FREXP@
+REPLACE_FREXPF = @REPLACE_FREXPF@
 REPLACE_FREXPL = @REPLACE_FREXPL@
+REPLACE_FSEEK = @REPLACE_FSEEK@
+REPLACE_FSEEKO = @REPLACE_FSEEKO@
+REPLACE_FTELL = @REPLACE_FTELL@
+REPLACE_FTELLO = @REPLACE_FTELLO@
+REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
 REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETDELIM = @REPLACE_GETDELIM@
+REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
+REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
+REPLACE_GETLINE = @REPLACE_GETLINE@
+REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@
+REPLACE_HYPOT = @REPLACE_HYPOT@
+REPLACE_HYPOTF = @REPLACE_HYPOTF@
+REPLACE_HYPOTL = @REPLACE_HYPOTL@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
+REPLACE_ILOGB = @REPLACE_ILOGB@
+REPLACE_ILOGBF = @REPLACE_ILOGBF@
+REPLACE_ISATTY = @REPLACE_ISATTY@
 REPLACE_ISFINITE = @REPLACE_ISFINITE@
 REPLACE_ISINF = @REPLACE_ISINF@
 REPLACE_ISNAN = @REPLACE_ISNAN@
+REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
+REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LDEXPL = @REPLACE_LDEXPL@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
+REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
+REPLACE_LOG = @REPLACE_LOG@
+REPLACE_LOG10 = @REPLACE_LOG10@
+REPLACE_LOG10F = @REPLACE_LOG10F@
+REPLACE_LOG10L = @REPLACE_LOG10L@
+REPLACE_LOG1P = @REPLACE_LOG1P@
+REPLACE_LOG1PF = @REPLACE_LOG1PF@
+REPLACE_LOG1PL = @REPLACE_LOG1PL@
+REPLACE_LOG2 = @REPLACE_LOG2@
+REPLACE_LOG2F = @REPLACE_LOG2F@
+REPLACE_LOG2L = @REPLACE_LOG2L@
+REPLACE_LOGB = @REPLACE_LOGB@
+REPLACE_LOGBF = @REPLACE_LOGBF@
+REPLACE_LOGBL = @REPLACE_LOGBL@
+REPLACE_LOGF = @REPLACE_LOGF@
+REPLACE_LOGL = @REPLACE_LOGL@
 REPLACE_LSEEK = @REPLACE_LSEEK@
+REPLACE_MALLOC = @REPLACE_MALLOC@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBTOWC = @REPLACE_MBTOWC@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
+REPLACE_MODF = @REPLACE_MODF@
+REPLACE_MODFF = @REPLACE_MODFF@
+REPLACE_MODFL = @REPLACE_MODFL@
 REPLACE_NAN = @REPLACE_NAN@
+REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
 REPLACE_NULL = @REPLACE_NULL@
+REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
+REPLACE_PERROR = @REPLACE_PERROR@
+REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_PREAD = @REPLACE_PREAD@
+REPLACE_PRINTF = @REPLACE_PRINTF@
+REPLACE_PTSNAME = @REPLACE_PTSNAME@
+REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
 REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_PWRITE = @REPLACE_PWRITE@
+REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
+REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
+REPLACE_READLINKAT = @REPLACE_READLINKAT@
+REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
+REPLACE_REMAINDER = @REPLACE_REMAINDER@
+REPLACE_REMAINDERF = @REPLACE_REMAINDERF@
+REPLACE_REMAINDERL = @REPLACE_REMAINDERL@
+REPLACE_REMOVE = @REPLACE_REMOVE@
+REPLACE_RENAME = @REPLACE_RENAME@
+REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_ROUND = @REPLACE_ROUND@
 REPLACE_ROUNDF = @REPLACE_ROUNDF@
 REPLACE_ROUNDL = @REPLACE_ROUNDL@
 REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
 REPLACE_SIGNBIT = @REPLACE_SIGNBIT@
 REPLACE_SIGNBIT_USING_GCC = @REPLACE_SIGNBIT_USING_GCC@
 REPLACE_SLEEP = @REPLACE_SLEEP@
+REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
+REPLACE_SPRINTF = @REPLACE_SPRINTF@
+REPLACE_SQRTL = @REPLACE_SQRTL@
+REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
+REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
+REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
+REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
 REPLACE_STRNCAT = @REPLACE_STRNCAT@
 REPLACE_STRNDUP = @REPLACE_STRNDUP@
 REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
+REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
+REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TMPFILE = @REPLACE_TMPFILE@
+REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNC = @REPLACE_TRUNC@
+REPLACE_TRUNCF = @REPLACE_TRUNCF@
 REPLACE_TRUNCL = @REPLACE_TRUNCL@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
 REPLACE_UNSETENV = @REPLACE_UNSETENV@
 REPLACE_USLEEP = @REPLACE_USLEEP@
+REPLACE_VASPRINTF = @REPLACE_VASPRINTF@
+REPLACE_VDPRINTF = @REPLACE_VDPRINTF@
+REPLACE_VFPRINTF = @REPLACE_VFPRINTF@
+REPLACE_VPRINTF = @REPLACE_VPRINTF@
+REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
+REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
+REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 SED = @SED@
@@ -3817,22 +4434,27 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDALIGN_H = @STDALIGN_H@
 STDBOOL_H = @STDBOOL_H@
 STDDEF_H = @STDDEF_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
 TEXI2DVI = @TEXI2DVI@
+UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
+UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
 VERSION = @VERSION@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 YIELD_LIB = @YIELD_LIB@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -3868,9 +4490,9 @@ infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+lispdir = @lispdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -3878,6 +4500,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -3888,7 +4511,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # Rules generated and collected by gnulib-tool.
-AUTOMAKE_OPTIONS = 1.5 foreign subdir-objects 1.11 subdir-objects \
+AUTOMAKE_OPTIONS = 1.9.6 foreign subdir-objects 1.11 subdir-objects \
 	color-tests
 SUBDIRS = .
 
@@ -3896,46 +4519,76 @@ SUBDIRS = .
 
 # This must be the last thing that gets added to TESTS_ENVIRONMENT.
 TESTS_ENVIRONMENT = EXEEXT='@EXEEXT@' srcdir='$(srcdir)' \
+	LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
 	LOCALE_FR='@LOCALE_FR@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' \
 	LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
 	LOCALE_JA='@LOCALE_JA@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' \
 	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
 	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' \
+	LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_FR='@LOCALE_FR@' \
+	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' \
 	LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' \
 	LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_FR='@LOCALE_FR@' \
 	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
-	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
-	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
-	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
-	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
-	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
-	@LOCALCHARSET_TESTS_ENVIRONMENT@ $(SHELL) \
-	$(top_srcdir)/build-aux/run-test '$(CHECKER)'
+	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_AR='@LOCALE_AR@' \
+	LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
+	LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
+	LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
+	LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
+	LOCALE_FR='@LOCALE_FR@' MAKE='$(MAKE)' LOCALE_FR='@LOCALE_FR@' \
+	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' \
+	LOCALE_ZH_CN='@LOCALE_ZH_CN@' @LOCALCHARSET_TESTS_ENVIRONMENT@ \
+	$(SHELL) $(top_srcdir)/build-aux/run-test '$(CHECKER)'
 noinst_HEADERS = 
 noinst_LIBRARIES = 
 check_LIBRARIES = libtests.a
-EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
-	test-array-mergesort.c macros.h \
-	$(top_srcdir)/build-aux/c++defs.h test-c-ctype.c macros.h \
-	test-c-strcase.sh test-c-strcasecmp.c test-c-strncasecmp.c \
-	macros.h test-environ.c test-errno.c error.c error.h \
-	exitfail.h test-frexpl.c signature.h macros.h test-fseterr.c \
+EXTRA_DIST = test-alloca-opt.c test-array-mergesort.c macros.h btowc.c \
+	test-btowc1.sh test-btowc2.sh test-btowc.c signature.h \
+	macros.h test-c-ctype.c macros.h test-c-strcase.sh \
+	test-c-strcasecmp.c test-c-strncasecmp.c macros.h \
+	test-environ.c test-errno.c error.c error.h exitfail.h \
+	fdopen.c test-fdopen.c signature.h macros.h test-fgetc.c \
+	signature.h macros.h test-float.c macros.h test-fputc.c \
+	signature.h macros.h test-fread.c signature.h macros.h \
+	test-frexp.c test-frexp.h minus-zero.h infinity.h nan.h \
+	signature.h macros.h randomd.c test-frexpl.c test-frexp.h \
+	minus-zero.h infinity.h nan.h signature.h macros.h randoml.c \
+	test-fseterr.c test-fwrite.c signature.h macros.h \
 	getpagesize.c test-iconv-h.c test-iconv.c signature.h macros.h \
-	intprops.h test-isnand-nolibm.c test-isnand.h nan.h macros.h \
-	test-isnanf-nolibm.c test-isnanf.h nan.h macros.h \
-	test-isnanl-nolibm.c test-isnanl.h nan.h macros.h locale.in.h \
-	test-locale.c test-localename.c macros.h test-lock.c \
-	test-malloca.c test-math.c test-mbrtowc1.sh test-mbrtowc2.sh \
-	test-mbrtowc3.sh test-mbrtowc4.sh test-mbrtowc.c signature.h \
-	macros.h test-mbsinit.sh test-mbsinit.c signature.h macros.h \
-	test-memchr.c zerosize-ptr.h signature.h macros.h \
-	test-printf-frexp.c macros.h test-printf-frexpl.c macros.h \
-	putenv.c setenv.c test-setenv.c signature.h macros.h \
-	test-signbit.c macros.h test-stdbool.c test-stddef.c \
-	test-stdint.c test-stdlib.c strerror.c test-strerror.c \
-	signature.h macros.h test-striconveh.c macros.h \
-	test-striconveha.c macros.h test-string.c test-strncat.c \
-	unistr/test-strncat.h zerosize-ptr.h signature.h macros.h \
+	intprops.h test-intprops.c macros.h inttypes.in.h \
+	test-inttypes.c test-isnand-nolibm.c test-isnand.h \
+	minus-zero.h infinity.h nan.h macros.h test-isnanf-nolibm.c \
+	test-isnanf.h minus-zero.h infinity.h nan.h macros.h \
+	test-isnanl-nolibm.c test-isnanl.h minus-zero.h infinity.h \
+	nan.h macros.h test-iswblank.c macros.h test-langinfo.c \
+	locale.in.h test-locale.c test-localename.c macros.h \
+	test-lock.c test-malloca.c test-math.c macros.h \
+	test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
+	test-mbrtowc4.sh test-mbrtowc.c test-mbrtowc-w32-1.sh \
+	test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh \
+	test-mbrtowc-w32-4.sh test-mbrtowc-w32-5.sh test-mbrtowc-w32.c \
+	signature.h macros.h test-mbsinit.sh test-mbsinit.c \
+	signature.h macros.h mbtowc-impl.h mbtowc.c test-memchr.c \
+	zerosize-ptr.h signature.h macros.h msvc-inval.c msvc-inval.h \
+	msvc-nothrow.c msvc-nothrow.h test-printf-frexp.c macros.h \
+	test-printf-frexpl.c macros.h putenv.c setenv.c test-setenv.c \
+	signature.h macros.h setlocale.c test-setlocale1.sh \
+	test-setlocale1.c test-setlocale2.sh test-setlocale2.c \
+	signature.h macros.h test-signbit.c minus-zero.h infinity.h \
+	macros.h $(top_srcdir)/build-aux/snippet/_Noreturn.h \
+	$(top_srcdir)/build-aux/snippet/arg-nonnull.h \
+	$(top_srcdir)/build-aux/snippet/c++defs.h \
+	$(top_srcdir)/build-aux/snippet/unused-parameter.h \
+	$(top_srcdir)/build-aux/snippet/warn-on-use.h stdalign.in.h \
+	test-stdalign.c macros.h test-stdbool.c test-stddef.c \
+	test-stdint.c stdio.in.h test-stdio.c test-stdlib.c \
+	test-sys_wait.h strerror.c strerror-override.c \
+	strerror-override.h test-strerror.c signature.h macros.h \
+	test-striconveh.c macros.h test-striconveha.c macros.h \
+	test-string.c test-strncat.c unistr/test-strncat.h \
+	zerosize-ptr.h signature.h macros.h test-strstr.c \
+	zerosize-ptr.h signature.h macros.h test-sys_types.c init.sh \
+	test-init.sh test-thread_self.c test-thread_create.c macros.h \
 	unicase/test-cased.c unicase/test-predicate-part1.h \
 	unicase/test-predicate-part2.h macros.h \
 	unicase/test-ignorable.c unicase/test-predicate-part1.h \
@@ -3999,12 +4652,13 @@ EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
 	uniconv/test-u8-conv-to-enc.c macros.h \
 	uniconv/test-u8-strconv-from-enc.c macros.h \
 	uniconv/test-u8-strconv-to-enc.c macros.h \
-	unictype/test-bidi_byname.c macros.h unictype/test-bidi_name.c \
-	macros.h unictype/test-bidi_of.c macros.h \
-	unictype/test-bidi_test.c macros.h unictype/test-block_list.c \
-	macros.h unictype/test-block_of.c macros.h \
-	unictype/test-block_test.c macros.h unictype/test-categ_C.c \
-	unictype/test-predicate-part1.h \
+	unictype/test-bidi_byname.c macros.h \
+	unictype/test-bidi_longname.c macros.h \
+	unictype/test-bidi_name.c macros.h unictype/test-bidi_of.c \
+	macros.h unictype/test-bidi_test.c macros.h \
+	unictype/test-block_list.c macros.h unictype/test-block_of.c \
+	macros.h unictype/test-block_test.c macros.h \
+	unictype/test-categ_C.c unictype/test-predicate-part1.h \
 	unictype/test-predicate-part2.h macros.h \
 	unictype/test-categ_Cc.c unictype/test-predicate-part1.h \
 	unictype/test-predicate-part2.h macros.h \
@@ -4018,6 +4672,8 @@ EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
 	unictype/test-predicate-part2.h macros.h \
 	unictype/test-categ_L.c unictype/test-predicate-part1.h \
 	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_LC.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-categ_Ll.c unictype/test-predicate-part1.h \
 	unictype/test-predicate-part2.h macros.h \
 	unictype/test-categ_Lm.c unictype/test-predicate-part1.h \
@@ -4081,12 +4737,16 @@ EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
 	unictype/test-categ_and_not.c macros.h \
 	unictype/test-categ_and.c macros.h \
 	unictype/test-categ_byname.c macros.h \
+	unictype/test-categ_longname.c macros.h \
 	unictype/test-categ_name.c macros.h unictype/test-categ_none.c \
 	macros.h unictype/test-categ_of.c macros.h \
 	unictype/test-categ_or.c macros.h \
 	unictype/test-categ_test_withtable.c macros.h \
-	unictype/test-combining.c macros.h unictype/test-ctype_alnum.c \
-	unictype/test-predicate-part1.h \
+	unictype/test-combiningclass_byname.c macros.h \
+	unictype/test-combiningclass_longname.c macros.h \
+	unictype/test-combiningclass_name.c macros.h \
+	unictype/test-combiningclass.c macros.h \
+	unictype/test-ctype_alnum.c unictype/test-predicate-part1.h \
 	unictype/test-predicate-part2.h macros.h \
 	unictype/test-ctype_alpha.c unictype/test-predicate-part1.h \
 	unictype/test-predicate-part2.h macros.h \
@@ -4112,9 +4772,17 @@ EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
 	unictype/test-predicate-part2.h macros.h \
 	unictype/test-decdigit.c unictype/test-decdigit.h macros.h \
 	unictype/test-digit.c unictype/test-digit.h macros.h \
-	unictype/test-mirror.c macros.h unictype/test-numeric.c \
-	unictype/test-numeric.h macros.h unictype/test-pr_alphabetic.c \
-	unictype/test-predicate-part1.h \
+	unictype/test-joininggroup_byname.c macros.h \
+	unictype/test-joininggroup_name.c macros.h \
+	unictype/test-joininggroup_of.c \
+	unictype/test-joininggroup_of.h macros.h \
+	unictype/test-joiningtype_byname.c macros.h \
+	unictype/test-joiningtype_longname.c macros.h \
+	unictype/test-joiningtype_name.c macros.h \
+	unictype/test-joiningtype_of.c unictype/test-joiningtype_of.h \
+	macros.h unictype/test-mirror.c macros.h \
+	unictype/test-numeric.c unictype/test-numeric.h macros.h \
+	unictype/test-pr_alphabetic.c unictype/test-predicate-part1.h \
 	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_ascii_hex_digit.c \
 	unictype/test-predicate-part1.h \
@@ -4170,6 +4838,26 @@ EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
 	unictype/test-predicate-part1.h \
 	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_byname.c macros.h \
+	unictype/test-pr_case_ignorable.c \
+	unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_cased.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_changes_when_casefolded.c \
+	unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_changes_when_casemapped.c \
+	unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_changes_when_lowercased.c \
+	unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_changes_when_titlecased.c \
+	unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_changes_when_uppercased.c \
+	unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_combining.c unictype/test-predicate-part1.h \
 	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_composite.c unictype/test-predicate-part1.h \
@@ -4332,6 +5020,21 @@ EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
 	unictype/test-sy_java_whitespace.c \
 	unictype/test-predicate-part1.h \
 	unictype/test-predicate-part2.h macros.h \
+	unigbrk/test-u16-grapheme-breaks.c \
+	unigbrk/test-u16-grapheme-next.c \
+	unigbrk/test-u16-grapheme-prev.c \
+	unigbrk/test-u32-grapheme-breaks.c \
+	unigbrk/test-u32-grapheme-next.c \
+	unigbrk/test-u32-grapheme-prev.c \
+	unigbrk/test-u8-grapheme-breaks.c \
+	unigbrk/test-u8-grapheme-next.c \
+	unigbrk/test-u8-grapheme-prev.c unigbrk/test-uc-gbrk-prop.c \
+	unigbrk/test-uc-gbrk-prop.h macros.h \
+	unigbrk/test-uc-is-grapheme-break.c \
+	unigbrk/test-uc-is-grapheme-break.sh \
+	unigbrk/GraphemeBreakTest.txt \
+	unigbrk/test-ulc-grapheme-breaks.sh \
+	unigbrk/test-ulc-grapheme-breaks.c macros.h \
 	unilbrk/test-u16-possible-linebreaks.c macros.h \
 	unilbrk/test-u16-width-linebreaks.c macros.h \
 	unilbrk/test-u32-possible-linebreaks.c macros.h \
@@ -4341,9 +5044,9 @@ EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
 	unilbrk/test-ulc-possible-linebreaks.c macros.h \
 	unilbrk/test-ulc-width-linebreaks.c macros.h \
 	uniname/test-uninames.sh uniname/test-uninames.c \
-	uniname/UnicodeDataNames.txt \
-	uninorm/test-canonical-decomposition.c macros.h \
-	uninorm/test-compat-decomposition.c macros.h \
+	uniname/UnicodeData.txt uniname/HangulSyllableNames.txt \
+	uniname/NameAliases.txt uninorm/test-canonical-decomposition.c \
+	macros.h uninorm/test-compat-decomposition.c macros.h \
 	uninorm/test-composition.c macros.h \
 	uninorm/test-decomposing-form.c macros.h \
 	uninorm/test-decomposition.c macros.h \
@@ -4437,24 +5140,28 @@ EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
 	unistr/test-u16-stpcpy.c unistr/test-stpcpy.h macros.h \
 	unistr/test-u16-stpncpy.c unistr/test-stpncpy.h zerosize-ptr.h \
 	macros.h unistr/test-u16-strcat.c unistr/test-strcat.h \
-	macros.h unistr/test-u16-strcmp.c unistr/test-u16-strcmp.h \
-	unistr/test-strcmp.h macros.h unistr/test-u16-strcoll.c \
+	macros.h unistr/test-u16-strchr.c unistr/test-strchr.h \
+	zerosize-ptr.h macros.h unistr/test-u16-strcmp.c \
 	unistr/test-u16-strcmp.h unistr/test-strcmp.h macros.h \
-	unistr/test-u16-strcpy.c unistr/test-strcpy.h macros.h \
-	unistr/test-u16-strdup.c unistr/test-strdup.h macros.h \
-	unistr/test-u16-strlen.c macros.h unistr/test-u16-strmblen.c \
-	macros.h unistr/test-u16-strmbtouc.c macros.h \
-	unistr/test-u16-strncat.c unistr/test-strncat.h zerosize-ptr.h \
-	macros.h unistr/test-u16-strncmp.c unistr/test-strncmp.h \
-	macros.h unistr/test-u16-strncpy.c unistr/test-strncpy.h \
-	zerosize-ptr.h macros.h unistr/test-u16-strnlen.c \
-	unistr/test-strnlen.h zerosize-ptr.h macros.h \
-	unistr/test-u16-to-u32.c macros.h unistr/test-u16-to-u8.c \
-	macros.h unistr/test-u16-uctomb.c macros.h \
-	unistr/test-u32-check.c macros.h unistr/test-u32-chr.c \
-	unistr/test-chr.h zerosize-ptr.h macros.h \
-	unistr/test-u32-cmp.c unistr/test-cmp.h zerosize-ptr.h \
-	macros.h unistr/test-u32-cmp2.c unistr/test-cmp2.h macros.h \
+	unistr/test-u16-strcoll.c unistr/test-u16-strcmp.h \
+	unistr/test-strcmp.h macros.h unistr/test-u16-strcpy.c \
+	unistr/test-strcpy.h macros.h unistr/test-u16-strdup.c \
+	unistr/test-strdup.h macros.h unistr/test-u16-strlen.c \
+	macros.h unistr/test-u16-strmblen.c macros.h \
+	unistr/test-u16-strmbtouc.c macros.h unistr/test-u16-strncat.c \
+	unistr/test-strncat.h zerosize-ptr.h macros.h \
+	unistr/test-u16-strncmp.c unistr/test-strncmp.h macros.h \
+	unistr/test-u16-strncpy.c unistr/test-strncpy.h zerosize-ptr.h \
+	macros.h unistr/test-u16-strnlen.c unistr/test-strnlen.h \
+	zerosize-ptr.h macros.h unistr/test-u16-strstr.c \
+	unistr/test-u-strstr.h macros.h unistr/test-u16-strtok.c \
+	unistr/test-u-strtok.h macros.h unistr/test-u16-to-u32.c \
+	macros.h unistr/test-u16-to-u8.c macros.h \
+	unistr/test-u16-uctomb.c macros.h unistr/test-u32-check.c \
+	macros.h unistr/test-u32-chr.c unistr/test-chr.h \
+	zerosize-ptr.h macros.h unistr/test-u32-cmp.c \
+	unistr/test-cmp.h zerosize-ptr.h macros.h \
+	unistr/test-u32-cmp2.c unistr/test-cmp2.h macros.h \
 	unistr/test-u32-cpy-alloc.c unistr/test-cpy-alloc.h macros.h \
 	unistr/test-u32-cpy.c unistr/test-cpy.h macros.h \
 	unistr/test-u32-mblen.c macros.h unistr/test-u32-mbsnlen.c \
@@ -4467,24 +5174,27 @@ EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
 	unistr/test-u32-stpcpy.c unistr/test-stpcpy.h macros.h \
 	unistr/test-u32-stpncpy.c unistr/test-stpncpy.h zerosize-ptr.h \
 	macros.h unistr/test-u32-strcat.c unistr/test-strcat.h \
-	macros.h unistr/test-u32-strcmp.c unistr/test-u32-strcmp.h \
-	unistr/test-strcmp.h macros.h unistr/test-u32-strcoll.c \
+	macros.h unistr/test-u32-strchr.c unistr/test-strchr.h \
+	zerosize-ptr.h macros.h unistr/test-u32-strcmp.c \
 	unistr/test-u32-strcmp.h unistr/test-strcmp.h macros.h \
-	unistr/test-u32-strcpy.c unistr/test-strcpy.h macros.h \
-	unistr/test-u32-strdup.c unistr/test-strdup.h macros.h \
-	unistr/test-u32-strlen.c macros.h unistr/test-u32-strmblen.c \
-	macros.h unistr/test-u32-strmbtouc.c macros.h \
-	unistr/test-u32-strncat.c unistr/test-strncat.h zerosize-ptr.h \
-	macros.h unistr/test-u32-strncmp.c unistr/test-strncmp.h \
-	macros.h unistr/test-u32-strncpy.c unistr/test-strncpy.h \
-	zerosize-ptr.h macros.h unistr/test-u32-strnlen.c \
-	unistr/test-strnlen.h zerosize-ptr.h macros.h \
-	unistr/test-u32-to-u16.c macros.h unistr/test-u32-to-u8.c \
-	macros.h unistr/test-u32-uctomb.c macros.h \
-	unistr/test-u8-check.c macros.h unistr/test-u8-chr.c \
-	unistr/test-chr.h zerosize-ptr.h macros.h unistr/test-u8-cmp.c \
-	unistr/test-cmp.h zerosize-ptr.h macros.h \
-	unistr/test-u8-cmp2.c unistr/test-cmp2.h macros.h \
+	unistr/test-u32-strcoll.c unistr/test-u32-strcmp.h \
+	unistr/test-strcmp.h macros.h unistr/test-u32-strcpy.c \
+	unistr/test-strcpy.h macros.h unistr/test-u32-strdup.c \
+	unistr/test-strdup.h macros.h unistr/test-u32-strlen.c \
+	macros.h unistr/test-u32-strmblen.c macros.h \
+	unistr/test-u32-strmbtouc.c macros.h unistr/test-u32-strncat.c \
+	unistr/test-strncat.h zerosize-ptr.h macros.h \
+	unistr/test-u32-strncmp.c unistr/test-strncmp.h macros.h \
+	unistr/test-u32-strncpy.c unistr/test-strncpy.h zerosize-ptr.h \
+	macros.h unistr/test-u32-strnlen.c unistr/test-strnlen.h \
+	zerosize-ptr.h macros.h unistr/test-u32-strstr.c \
+	unistr/test-u-strstr.h macros.h unistr/test-u32-strtok.c \
+	unistr/test-u-strtok.h macros.h unistr/test-u32-to-u16.c \
+	macros.h unistr/test-u32-to-u8.c macros.h \
+	unistr/test-u32-uctomb.c macros.h unistr/test-u8-check.c \
+	macros.h unistr/test-u8-chr.c unistr/test-chr.h zerosize-ptr.h \
+	macros.h unistr/test-u8-cmp.c unistr/test-cmp.h zerosize-ptr.h \
+	macros.h unistr/test-u8-cmp2.c unistr/test-cmp2.h macros.h \
 	unistr/test-u8-cpy-alloc.c unistr/test-cpy-alloc.h macros.h \
 	unistr/test-u8-cpy.c unistr/test-cpy.h macros.h \
 	unistr/test-u8-mblen.c macros.h unistr/test-u8-mbsnlen.c \
@@ -4497,7 +5207,8 @@ EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
 	unistr/test-u8-stpcpy.c unistr/test-stpcpy.h macros.h \
 	unistr/test-u8-stpncpy.c unistr/test-stpncpy.h zerosize-ptr.h \
 	macros.h unistr/test-u8-strcat.c unistr/test-strcat.h macros.h \
-	unistr/test-u8-strcmp.c unistr/test-u8-strcmp.h \
+	unistr/test-u8-strchr.c unistr/test-strchr.h zerosize-ptr.h \
+	macros.h unistr/test-u8-strcmp.c unistr/test-u8-strcmp.h \
 	unistr/test-strcmp.h macros.h unistr/test-u8-strcoll.c \
 	unistr/test-u8-strcmp.h unistr/test-strcmp.h macros.h \
 	unistr/test-u8-strcpy.c unistr/test-strcpy.h macros.h \
@@ -4509,11 +5220,14 @@ EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
 	macros.h unistr/test-u8-strncpy.c unistr/test-strncpy.h \
 	zerosize-ptr.h macros.h unistr/test-u8-strnlen.c \
 	unistr/test-strnlen.h zerosize-ptr.h macros.h \
+	unistr/test-u8-strstr.c unistr/test-u-strstr.h macros.h \
+	unistr/test-u8-strtok.c unistr/test-u-strtok.h macros.h \
 	unistr/test-u8-to-u16.c macros.h unistr/test-u8-to-u32.c \
 	macros.h unistr/test-u8-uctomb.c macros.h \
 	uniwbrk/test-u16-wordbreaks.c macros.h \
-	uniwbrk/test-u32-wordbreaks.c macros.h \
-	uniwbrk/test-u8-wordbreaks.c macros.h \
+	uniwbrk/test-u32-wordbreaks.c uniwbrk/test-uc-wordbreaks.c \
+	uniwbrk/test-uc-wordbreaks.sh uniwbrk/WordBreakTest.txt \
+	macros.h uniwbrk/test-u8-wordbreaks.c macros.h \
 	uniwbrk/test-ulc-wordbreaks.sh uniwbrk/test-ulc-wordbreaks.c \
 	macros.h uniwidth/test-u16-strwidth.c macros.h \
 	uniwidth/test-u16-width.c macros.h \
@@ -4522,12 +5236,14 @@ EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
 	macros.h uniwidth/test-u8-width.c macros.h \
 	uniwidth/test-uc_width.c uniwidth/test-uc_width2.c \
 	uniwidth/test-uc_width2.sh macros.h unsetenv.c test-unsetenv.c \
-	signature.h macros.h \
-	$(top_srcdir)/build-aux/unused-parameter.h \
-	$(top_srcdir)/build-aux/warn-on-use.h test-wchar.c wctob.c \
-	test-wctype.c macros.h test-wcwidth.c signature.h macros.h \
-	xalloc.h xmalloc.c test-xalloc-die.c test-xalloc-die.sh \
-	init.sh
+	signature.h macros.h test-verify.c test-verify.sh test-wchar.c \
+	wcrtomb.c test-wcrtomb.sh test-wcrtomb.c test-wcrtomb-w32-1.sh \
+	test-wcrtomb-w32-2.sh test-wcrtomb-w32-3.sh \
+	test-wcrtomb-w32-4.sh test-wcrtomb-w32-5.sh test-wcrtomb-w32.c \
+	signature.h macros.h wctob.c wctomb-impl.h wctomb.c \
+	test-wctype-h.c macros.h test-wcwidth.c signature.h macros.h \
+	xalloc.h test-xalloc-die.c test-xalloc-die.sh \
+	xalloc-oversized.h
 
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
@@ -4543,12 +5259,13 @@ EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
 # statements but through direct file reference. Therefore this snippet must be
 # present in all Makefile.am that need it. This is ensured by the applicability
 # 'all' defined above.
-BUILT_SOURCES = arg-nonnull.h c++defs.h locale.h unused-parameter.h \
-	warn-on-use.h
+BUILT_SOURCES = inttypes.h locale.h arg-nonnull.h c++defs.h \
+	unused-parameter.h warn-on-use.h $(STDALIGN_H) stdio.h
 SUFFIXES = 
-MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \
-	c++defs.h c++defs.h-t locale.h locale.h-t unused-parameter.h \
-	unused-parameter.h-t warn-on-use.h warn-on-use.h-t
+MOSTLYCLEANFILES = core *.stackdump inttypes.h inttypes.h-t locale.h \
+	locale.h-t arg-nonnull.h arg-nonnull.h-t c++defs.h c++defs.h-t \
+	unused-parameter.h unused-parameter.h-t warn-on-use.h \
+	warn-on-use.h-t stdalign.h stdalign.h-t stdio.h stdio.h-t
 MOSTLYCLEANDIRS = 
 CLEANFILES = 
 DISTCLEANFILES = 
@@ -4561,488 +5278,895 @@ AM_CPPFLAGS = \
 
 LDADD = libtests.a ../lib/libunistring.la libtests.a $(LIBTESTS_LIBDEPS)
 libtests_a_SOURCES = exitfail.c gettext.h progname.h progname.c \
-	glthread/thread.h glthread/thread.c xalloc-die.c \
+	glthread/thread.h glthread/thread.c xmalloc.c xalloc-die.c \
 	glthread/yield.h
 libtests_a_LIBADD = $(gltests_LIBOBJS)
 libtests_a_DEPENDENCIES = $(gltests_LIBOBJS)
-EXTRA_libtests_a_SOURCES = error.c getpagesize.c putenv.c setenv.c \
-	strerror.c unsetenv.c wctob.c xmalloc.c
+EXTRA_libtests_a_SOURCES = btowc.c error.c fdopen.c getpagesize.c \
+	mbtowc.c msvc-inval.c msvc-nothrow.c putenv.c setenv.c \
+	setlocale.c strerror.c strerror-override.c unsetenv.c \
+	wcrtomb.c wctob.c wctomb.c
 AM_LIBTOOLFLAGS = --preserve-dup-deps
-ARG_NONNULL_H = arg-nonnull.h
-CXXDEFS_H = c++defs.h
-test_frexpl_nolibm_SOURCES = test-frexpl.c
+test_frexp_nolibm_SOURCES = test-frexp.c randomd.c
+test_frexpl_nolibm_SOURCES = test-frexpl.c randoml.c
 test_iconv_LDADD = $(LDADD) @LIBICONV@
-test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@
+test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
 test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
-test_striconveh_LDADD = $(LDADD) @LIBICONV@
-test_striconveha_LDADD = $(LDADD) @LIBICONV@
+
+# Because this Makefile snippet defines a variable used by other
+# gnulib Makefile snippets, it must be present in all Makefile.am that
+# need it. This is ensured by the applicability 'all' defined above.
+_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h
+ARG_NONNULL_H = arg-nonnull.h
+CXXDEFS_H = c++defs.h
+UNUSED_PARAMETER_H = unused-parameter.h
+WARN_ON_USE_H = warn-on-use.h
+test_striconveh_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
+test_striconveha_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
+test_thread_self_LDADD = $(LDADD) @LIBTHREAD@
+test_thread_create_LDADD = $(LDADD) @LIBMULTITHREAD@
 test_cased_SOURCES = unicase/test-cased.c
+test_cased_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ignorable_SOURCES = unicase/test-ignorable.c
+test_ignorable_LDADD = $(LDADD) $(LIBUNISTRING)
 test_locale_language_SOURCES = unicase/test-locale-language.c
-test_locale_language_LDADD = $(LDADD) @INTL_MACOSX_LIBS@
+test_locale_language_LDADD = $(LDADD) $(LIBUNISTRING) @INTL_MACOSX_LIBS@
 test_uc_tolower_SOURCES = unicase/test-uc_tolower.c
+test_uc_tolower_LDADD = $(LDADD) $(LIBUNISTRING)
 test_uc_totitle_SOURCES = unicase/test-uc_totitle.c
+test_uc_totitle_LDADD = $(LDADD) $(LIBUNISTRING)
 test_uc_toupper_SOURCES = unicase/test-uc_toupper.c
+test_uc_toupper_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_casecmp_SOURCES = unicase/test-u16-casecmp.c
+test_u16_casecmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_casecoll_SOURCES = unicase/test-u16-casecoll.c
-test_u16_casecoll_LDADD = $(LDADD) @LIBICONV@
+test_u16_casecoll_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_casefold_SOURCES = unicase/test-u16-casefold.c
+test_u16_casefold_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_is_cased_SOURCES = unicase/test-u16-is-cased.c
+test_u16_is_cased_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_is_casefolded_SOURCES = unicase/test-u16-is-casefolded.c
+test_u16_is_casefolded_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_is_lowercase_SOURCES = unicase/test-u16-is-lowercase.c
+test_u16_is_lowercase_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_is_titlecase_SOURCES = unicase/test-u16-is-titlecase.c
+test_u16_is_titlecase_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_is_uppercase_SOURCES = unicase/test-u16-is-uppercase.c
+test_u16_is_uppercase_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_tolower_SOURCES = unicase/test-u16-tolower.c
+test_u16_tolower_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_totitle_SOURCES = unicase/test-u16-totitle.c
+test_u16_totitle_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_toupper_SOURCES = unicase/test-u16-toupper.c
+test_u16_toupper_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_casecmp_SOURCES = unicase/test-u32-casecmp.c
+test_u32_casecmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_casecoll_SOURCES = unicase/test-u32-casecoll.c
-test_u32_casecoll_LDADD = $(LDADD) @LIBICONV@
+test_u32_casecoll_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_casefold_SOURCES = unicase/test-u32-casefold.c
+test_u32_casefold_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_is_cased_SOURCES = unicase/test-u32-is-cased.c
+test_u32_is_cased_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_is_casefolded_SOURCES = unicase/test-u32-is-casefolded.c
+test_u32_is_casefolded_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_is_lowercase_SOURCES = unicase/test-u32-is-lowercase.c
+test_u32_is_lowercase_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_is_titlecase_SOURCES = unicase/test-u32-is-titlecase.c
+test_u32_is_titlecase_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_is_uppercase_SOURCES = unicase/test-u32-is-uppercase.c
+test_u32_is_uppercase_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_tolower_SOURCES = unicase/test-u32-tolower.c
+test_u32_tolower_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_totitle_SOURCES = unicase/test-u32-totitle.c
+test_u32_totitle_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_toupper_SOURCES = unicase/test-u32-toupper.c
+test_u32_toupper_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_casecmp_SOURCES = unicase/test-u8-casecmp.c
+test_u8_casecmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_casecoll_SOURCES = unicase/test-u8-casecoll.c
-test_u8_casecoll_LDADD = $(LDADD) @LIBICONV@
+test_u8_casecoll_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u8_casefold_SOURCES = unicase/test-u8-casefold.c
+test_u8_casefold_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_is_cased_SOURCES = unicase/test-u8-is-cased.c
+test_u8_is_cased_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_is_casefolded_SOURCES = unicase/test-u8-is-casefolded.c
+test_u8_is_casefolded_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_is_lowercase_SOURCES = unicase/test-u8-is-lowercase.c
+test_u8_is_lowercase_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_is_titlecase_SOURCES = unicase/test-u8-is-titlecase.c
+test_u8_is_titlecase_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_is_uppercase_SOURCES = unicase/test-u8-is-uppercase.c
+test_u8_is_uppercase_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_tolower_SOURCES = unicase/test-u8-tolower.c
+test_u8_tolower_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_totitle_SOURCES = unicase/test-u8-totitle.c
+test_u8_totitle_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_toupper_SOURCES = unicase/test-u8-toupper.c
+test_u8_toupper_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ulc_casecmp_SOURCES = unicase/test-ulc-casecmp.c
-test_ulc_casecmp_LDADD = $(LDADD) @LIBICONV@
+test_ulc_casecmp_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_ulc_casecoll_SOURCES = unicase/test-ulc-casecoll.c
-test_ulc_casecoll_LDADD = $(LDADD) @LIBICONV@
+test_ulc_casecoll_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_conv_from_enc_SOURCES = uniconv/test-u16-conv-from-enc.c
-test_u16_conv_from_enc_LDADD = $(LDADD) @LIBICONV@
+test_u16_conv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_conv_to_enc_SOURCES = uniconv/test-u16-conv-to-enc.c
-test_u16_conv_to_enc_LDADD = $(LDADD) @LIBICONV@
+test_u16_conv_to_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_strconv_from_enc_SOURCES = uniconv/test-u16-strconv-from-enc.c
-test_u16_strconv_from_enc_LDADD = $(LDADD) @LIBICONV@
+test_u16_strconv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_strconv_to_enc_SOURCES = uniconv/test-u16-strconv-to-enc.c
-test_u16_strconv_to_enc_LDADD = $(LDADD) @LIBICONV@
+test_u16_strconv_to_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_conv_from_enc_SOURCES = uniconv/test-u32-conv-from-enc.c
-test_u32_conv_from_enc_LDADD = $(LDADD) @LIBICONV@
+test_u32_conv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_conv_to_enc_SOURCES = uniconv/test-u32-conv-to-enc.c
-test_u32_conv_to_enc_LDADD = $(LDADD) @LIBICONV@
+test_u32_conv_to_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_strconv_from_enc_SOURCES = uniconv/test-u32-strconv-from-enc.c
-test_u32_strconv_from_enc_LDADD = $(LDADD) @LIBICONV@
+test_u32_strconv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_strconv_to_enc_SOURCES = uniconv/test-u32-strconv-to-enc.c
-test_u32_strconv_to_enc_LDADD = $(LDADD) @LIBICONV@
+test_u32_strconv_to_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u8_conv_from_enc_SOURCES = uniconv/test-u8-conv-from-enc.c
-test_u8_conv_from_enc_LDADD = $(LDADD) @LIBICONV@
+test_u8_conv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u8_conv_to_enc_SOURCES = uniconv/test-u8-conv-to-enc.c
-test_u8_conv_to_enc_LDADD = $(LDADD) @LIBICONV@
+test_u8_conv_to_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u8_strconv_from_enc_SOURCES = uniconv/test-u8-strconv-from-enc.c
-test_u8_strconv_from_enc_LDADD = $(LDADD) @LIBICONV@
+test_u8_strconv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u8_strconv_to_enc_SOURCES = uniconv/test-u8-strconv-to-enc.c
-test_u8_strconv_to_enc_LDADD = $(LDADD) @LIBICONV@
+test_u8_strconv_to_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_bidi_byname_SOURCES = unictype/test-bidi_byname.c
+test_bidi_byname_LDADD = $(LDADD) $(LIBUNISTRING)
+test_bidi_longname_SOURCES = unictype/test-bidi_longname.c
+test_bidi_longname_LDADD = $(LDADD) $(LIBUNISTRING)
 test_bidi_name_SOURCES = unictype/test-bidi_name.c
+test_bidi_name_LDADD = $(LDADD) $(LIBUNISTRING)
 test_bidi_of_SOURCES = unictype/test-bidi_of.c
+test_bidi_of_LDADD = $(LDADD) $(LIBUNISTRING)
 test_bidi_test_SOURCES = unictype/test-bidi_test.c
+test_bidi_test_LDADD = $(LDADD) $(LIBUNISTRING)
 test_block_list_SOURCES = unictype/test-block_list.c
+test_block_list_LDADD = $(LDADD) $(LIBUNISTRING)
 test_block_of_SOURCES = unictype/test-block_of.c
+test_block_of_LDADD = $(LDADD) $(LIBUNISTRING)
 test_block_test_SOURCES = unictype/test-block_test.c
+test_block_test_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_C_SOURCES = unictype/test-categ_C.c
+test_categ_C_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Cc_SOURCES = unictype/test-categ_Cc.c
+test_categ_Cc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Cf_SOURCES = unictype/test-categ_Cf.c
+test_categ_Cf_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Cn_SOURCES = unictype/test-categ_Cn.c
+test_categ_Cn_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Co_SOURCES = unictype/test-categ_Co.c
+test_categ_Co_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Cs_SOURCES = unictype/test-categ_Cs.c
+test_categ_Cs_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_L_SOURCES = unictype/test-categ_L.c
+test_categ_L_LDADD = $(LDADD) $(LIBUNISTRING)
+test_categ_LC_SOURCES = unictype/test-categ_LC.c
+test_categ_LC_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Ll_SOURCES = unictype/test-categ_Ll.c
+test_categ_Ll_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Lm_SOURCES = unictype/test-categ_Lm.c
+test_categ_Lm_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Lo_SOURCES = unictype/test-categ_Lo.c
+test_categ_Lo_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Lt_SOURCES = unictype/test-categ_Lt.c
+test_categ_Lt_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Lu_SOURCES = unictype/test-categ_Lu.c
+test_categ_Lu_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_M_SOURCES = unictype/test-categ_M.c
+test_categ_M_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Mc_SOURCES = unictype/test-categ_Mc.c
+test_categ_Mc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Me_SOURCES = unictype/test-categ_Me.c
+test_categ_Me_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Mn_SOURCES = unictype/test-categ_Mn.c
+test_categ_Mn_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_N_SOURCES = unictype/test-categ_N.c
+test_categ_N_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Nd_SOURCES = unictype/test-categ_Nd.c
+test_categ_Nd_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Nl_SOURCES = unictype/test-categ_Nl.c
+test_categ_Nl_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_No_SOURCES = unictype/test-categ_No.c
+test_categ_No_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_P_SOURCES = unictype/test-categ_P.c
+test_categ_P_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Pc_SOURCES = unictype/test-categ_Pc.c
+test_categ_Pc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Pd_SOURCES = unictype/test-categ_Pd.c
+test_categ_Pd_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Pe_SOURCES = unictype/test-categ_Pe.c
+test_categ_Pe_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Pf_SOURCES = unictype/test-categ_Pf.c
+test_categ_Pf_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Pi_SOURCES = unictype/test-categ_Pi.c
+test_categ_Pi_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Po_SOURCES = unictype/test-categ_Po.c
+test_categ_Po_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Ps_SOURCES = unictype/test-categ_Ps.c
+test_categ_Ps_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_S_SOURCES = unictype/test-categ_S.c
+test_categ_S_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Sc_SOURCES = unictype/test-categ_Sc.c
+test_categ_Sc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Sk_SOURCES = unictype/test-categ_Sk.c
+test_categ_Sk_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Sm_SOURCES = unictype/test-categ_Sm.c
+test_categ_Sm_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_So_SOURCES = unictype/test-categ_So.c
+test_categ_So_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Z_SOURCES = unictype/test-categ_Z.c
+test_categ_Z_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Zl_SOURCES = unictype/test-categ_Zl.c
+test_categ_Zl_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Zp_SOURCES = unictype/test-categ_Zp.c
+test_categ_Zp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_Zs_SOURCES = unictype/test-categ_Zs.c
+test_categ_Zs_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_and_not_SOURCES = unictype/test-categ_and_not.c
+test_categ_and_not_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_and_SOURCES = unictype/test-categ_and.c
+test_categ_and_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_byname_SOURCES = unictype/test-categ_byname.c
+test_categ_byname_LDADD = $(LDADD) $(LIBUNISTRING)
+test_categ_longname_SOURCES = unictype/test-categ_longname.c
+test_categ_longname_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_name_SOURCES = unictype/test-categ_name.c
+test_categ_name_LDADD = $(LDADD) $(LIBUNISTRING)
 @WOE32DLL_FALSE@test_categ_none_SOURCES = unictype/test-categ_none.c
+@WOE32DLL_FALSE@test_categ_none_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_of_SOURCES = unictype/test-categ_of.c
+test_categ_of_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_or_SOURCES = unictype/test-categ_or.c
+test_categ_or_LDADD = $(LDADD) $(LIBUNISTRING)
 test_categ_test_withtable_SOURCES = unictype/test-categ_test_withtable.c
-test_combining_SOURCES = unictype/test-combining.c
+test_categ_test_withtable_LDADD = $(LDADD) $(LIBUNISTRING)
+test_combiningclass_byname_SOURCES = unictype/test-combiningclass_byname.c
+test_combiningclass_byname_LDADD = $(LDADD) $(LIBUNISTRING)
+test_combiningclass_longname_SOURCES = unictype/test-combiningclass_longname.c
+test_combiningclass_longname_LDADD = $(LDADD) $(LIBUNISTRING)
+test_combiningclass_name_SOURCES = unictype/test-combiningclass_name.c
+test_combiningclass_name_LDADD = $(LDADD) $(LIBUNISTRING)
+test_combiningclass_SOURCES = unictype/test-combiningclass.c
+test_combiningclass_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ctype_alnum_SOURCES = unictype/test-ctype_alnum.c
+test_ctype_alnum_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ctype_alpha_SOURCES = unictype/test-ctype_alpha.c
+test_ctype_alpha_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ctype_blank_SOURCES = unictype/test-ctype_blank.c
+test_ctype_blank_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ctype_cntrl_SOURCES = unictype/test-ctype_cntrl.c
+test_ctype_cntrl_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ctype_digit_SOURCES = unictype/test-ctype_digit.c
+test_ctype_digit_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ctype_graph_SOURCES = unictype/test-ctype_graph.c
+test_ctype_graph_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ctype_lower_SOURCES = unictype/test-ctype_lower.c
+test_ctype_lower_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ctype_print_SOURCES = unictype/test-ctype_print.c
+test_ctype_print_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ctype_punct_SOURCES = unictype/test-ctype_punct.c
+test_ctype_punct_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ctype_space_SOURCES = unictype/test-ctype_space.c
+test_ctype_space_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ctype_upper_SOURCES = unictype/test-ctype_upper.c
+test_ctype_upper_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ctype_xdigit_SOURCES = unictype/test-ctype_xdigit.c
+test_ctype_xdigit_LDADD = $(LDADD) $(LIBUNISTRING)
 test_decdigit_SOURCES = unictype/test-decdigit.c
+test_decdigit_LDADD = $(LDADD) $(LIBUNISTRING)
 test_digit_SOURCES = unictype/test-digit.c
+test_digit_LDADD = $(LDADD) $(LIBUNISTRING)
+test_joininggroup_byname_SOURCES = unictype/test-joininggroup_byname.c
+test_joininggroup_byname_LDADD = $(LDADD) $(LIBUNISTRING)
+test_joininggroup_name_SOURCES = unictype/test-joininggroup_name.c
+test_joininggroup_name_LDADD = $(LDADD) $(LIBUNISTRING)
+test_joininggroup_of_SOURCES = unictype/test-joininggroup_of.c
+test_joininggroup_of_LDADD = $(LDADD) $(LIBUNISTRING)
+test_joiningtype_byname_SOURCES = unictype/test-joiningtype_byname.c
+test_joiningtype_byname_LDADD = $(LDADD) $(LIBUNISTRING)
+test_joiningtype_longname_SOURCES = unictype/test-joiningtype_longname.c
+test_joiningtype_longname_LDADD = $(LDADD) $(LIBUNISTRING)
+test_joiningtype_name_SOURCES = unictype/test-joiningtype_name.c
+test_joiningtype_name_LDADD = $(LDADD) $(LIBUNISTRING)
+test_joiningtype_of_SOURCES = unictype/test-joiningtype_of.c
+test_joiningtype_of_LDADD = $(LDADD) $(LIBUNISTRING)
 test_mirror_SOURCES = unictype/test-mirror.c
+test_mirror_LDADD = $(LDADD) $(LIBUNISTRING)
 test_numeric_SOURCES = unictype/test-numeric.c
+test_numeric_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_alphabetic_SOURCES = unictype/test-pr_alphabetic.c
+test_pr_alphabetic_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_ascii_hex_digit_SOURCES = unictype/test-pr_ascii_hex_digit.c
+test_pr_ascii_hex_digit_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_arabic_digit_SOURCES = unictype/test-pr_bidi_arabic_digit.c
+test_pr_bidi_arabic_digit_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_arabic_right_to_left_SOURCES = unictype/test-pr_bidi_arabic_right_to_left.c
+test_pr_bidi_arabic_right_to_left_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_block_separator_SOURCES = unictype/test-pr_bidi_block_separator.c
+test_pr_bidi_block_separator_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_boundary_neutral_SOURCES = unictype/test-pr_bidi_boundary_neutral.c
+test_pr_bidi_boundary_neutral_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_common_separator_SOURCES = unictype/test-pr_bidi_common_separator.c
+test_pr_bidi_common_separator_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_control_SOURCES = unictype/test-pr_bidi_control.c
+test_pr_bidi_control_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_embedding_or_override_SOURCES = unictype/test-pr_bidi_embedding_or_override.c
+test_pr_bidi_embedding_or_override_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_eur_num_separator_SOURCES = unictype/test-pr_bidi_eur_num_separator.c
+test_pr_bidi_eur_num_separator_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_eur_num_terminator_SOURCES = unictype/test-pr_bidi_eur_num_terminator.c
+test_pr_bidi_eur_num_terminator_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_european_digit_SOURCES = unictype/test-pr_bidi_european_digit.c
+test_pr_bidi_european_digit_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_hebrew_right_to_left_SOURCES = unictype/test-pr_bidi_hebrew_right_to_left.c
+test_pr_bidi_hebrew_right_to_left_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_left_to_right_SOURCES = unictype/test-pr_bidi_left_to_right.c
+test_pr_bidi_left_to_right_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_non_spacing_mark_SOURCES = unictype/test-pr_bidi_non_spacing_mark.c
+test_pr_bidi_non_spacing_mark_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_other_neutral_SOURCES = unictype/test-pr_bidi_other_neutral.c
+test_pr_bidi_other_neutral_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_pdf_SOURCES = unictype/test-pr_bidi_pdf.c
+test_pr_bidi_pdf_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_segment_separator_SOURCES = unictype/test-pr_bidi_segment_separator.c
+test_pr_bidi_segment_separator_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_bidi_whitespace_SOURCES = unictype/test-pr_bidi_whitespace.c
+test_pr_bidi_whitespace_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_byname_SOURCES = unictype/test-pr_byname.c
+test_pr_byname_LDADD = $(LDADD) $(LIBUNISTRING)
+test_pr_case_ignorable_SOURCES = unictype/test-pr_case_ignorable.c
+test_pr_case_ignorable_LDADD = $(LDADD) $(LIBUNISTRING)
+test_pr_cased_SOURCES = unictype/test-pr_cased.c
+test_pr_cased_LDADD = $(LDADD) $(LIBUNISTRING)
+test_pr_changes_when_casefolded_SOURCES = unictype/test-pr_changes_when_casefolded.c
+test_pr_changes_when_casefolded_LDADD = $(LDADD) $(LIBUNISTRING)
+test_pr_changes_when_casemapped_SOURCES = unictype/test-pr_changes_when_casemapped.c
+test_pr_changes_when_casemapped_LDADD = $(LDADD) $(LIBUNISTRING)
+test_pr_changes_when_lowercased_SOURCES = unictype/test-pr_changes_when_lowercased.c
+test_pr_changes_when_lowercased_LDADD = $(LDADD) $(LIBUNISTRING)
+test_pr_changes_when_titlecased_SOURCES = unictype/test-pr_changes_when_titlecased.c
+test_pr_changes_when_titlecased_LDADD = $(LDADD) $(LIBUNISTRING)
+test_pr_changes_when_uppercased_SOURCES = unictype/test-pr_changes_when_uppercased.c
+test_pr_changes_when_uppercased_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_combining_SOURCES = unictype/test-pr_combining.c
+test_pr_combining_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_composite_SOURCES = unictype/test-pr_composite.c
+test_pr_composite_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_currency_symbol_SOURCES = unictype/test-pr_currency_symbol.c
+test_pr_currency_symbol_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_dash_SOURCES = unictype/test-pr_dash.c
+test_pr_dash_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_decimal_digit_SOURCES = unictype/test-pr_decimal_digit.c
+test_pr_decimal_digit_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_default_ignorable_code_point_SOURCES = unictype/test-pr_default_ignorable_code_point.c
+test_pr_default_ignorable_code_point_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_deprecated_SOURCES = unictype/test-pr_deprecated.c
+test_pr_deprecated_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_diacritic_SOURCES = unictype/test-pr_diacritic.c
+test_pr_diacritic_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_extender_SOURCES = unictype/test-pr_extender.c
+test_pr_extender_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_format_control_SOURCES = unictype/test-pr_format_control.c
+test_pr_format_control_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_grapheme_base_SOURCES = unictype/test-pr_grapheme_base.c
+test_pr_grapheme_base_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_grapheme_extend_SOURCES = unictype/test-pr_grapheme_extend.c
+test_pr_grapheme_extend_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_grapheme_link_SOURCES = unictype/test-pr_grapheme_link.c
+test_pr_grapheme_link_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_hex_digit_SOURCES = unictype/test-pr_hex_digit.c
+test_pr_hex_digit_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_hyphen_SOURCES = unictype/test-pr_hyphen.c
+test_pr_hyphen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_id_continue_SOURCES = unictype/test-pr_id_continue.c
+test_pr_id_continue_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_id_start_SOURCES = unictype/test-pr_id_start.c
+test_pr_id_start_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_ideographic_SOURCES = unictype/test-pr_ideographic.c
+test_pr_ideographic_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_ids_binary_operator_SOURCES = unictype/test-pr_ids_binary_operator.c
+test_pr_ids_binary_operator_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_ids_trinary_operator_SOURCES = unictype/test-pr_ids_trinary_operator.c
+test_pr_ids_trinary_operator_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_ignorable_control_SOURCES = unictype/test-pr_ignorable_control.c
+test_pr_ignorable_control_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_iso_control_SOURCES = unictype/test-pr_iso_control.c
+test_pr_iso_control_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_join_control_SOURCES = unictype/test-pr_join_control.c
+test_pr_join_control_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_left_of_pair_SOURCES = unictype/test-pr_left_of_pair.c
+test_pr_left_of_pair_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_line_separator_SOURCES = unictype/test-pr_line_separator.c
+test_pr_line_separator_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_logical_order_exception_SOURCES = unictype/test-pr_logical_order_exception.c
+test_pr_logical_order_exception_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_lowercase_SOURCES = unictype/test-pr_lowercase.c
+test_pr_lowercase_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_math_SOURCES = unictype/test-pr_math.c
+test_pr_math_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_non_break_SOURCES = unictype/test-pr_non_break.c
+test_pr_non_break_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_not_a_character_SOURCES = unictype/test-pr_not_a_character.c
+test_pr_not_a_character_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_numeric_SOURCES = unictype/test-pr_numeric.c
+test_pr_numeric_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_other_alphabetic_SOURCES = unictype/test-pr_other_alphabetic.c
+test_pr_other_alphabetic_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_other_default_ignorable_code_point_SOURCES = unictype/test-pr_other_default_ignorable_code_point.c
+test_pr_other_default_ignorable_code_point_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_other_grapheme_extend_SOURCES = unictype/test-pr_other_grapheme_extend.c
+test_pr_other_grapheme_extend_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_other_id_continue_SOURCES = unictype/test-pr_other_id_continue.c
+test_pr_other_id_continue_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_other_id_start_SOURCES = unictype/test-pr_other_id_start.c
+test_pr_other_id_start_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_other_lowercase_SOURCES = unictype/test-pr_other_lowercase.c
+test_pr_other_lowercase_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_other_math_SOURCES = unictype/test-pr_other_math.c
+test_pr_other_math_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_other_uppercase_SOURCES = unictype/test-pr_other_uppercase.c
+test_pr_other_uppercase_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_paired_punctuation_SOURCES = unictype/test-pr_paired_punctuation.c
+test_pr_paired_punctuation_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_paragraph_separator_SOURCES = unictype/test-pr_paragraph_separator.c
+test_pr_paragraph_separator_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_pattern_syntax_SOURCES = unictype/test-pr_pattern_syntax.c
+test_pr_pattern_syntax_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_pattern_white_space_SOURCES = unictype/test-pr_pattern_white_space.c
+test_pr_pattern_white_space_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_private_use_SOURCES = unictype/test-pr_private_use.c
+test_pr_private_use_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_punctuation_SOURCES = unictype/test-pr_punctuation.c
+test_pr_punctuation_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_quotation_mark_SOURCES = unictype/test-pr_quotation_mark.c
+test_pr_quotation_mark_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_radical_SOURCES = unictype/test-pr_radical.c
+test_pr_radical_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_sentence_terminal_SOURCES = unictype/test-pr_sentence_terminal.c
+test_pr_sentence_terminal_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_soft_dotted_SOURCES = unictype/test-pr_soft_dotted.c
+test_pr_soft_dotted_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_space_SOURCES = unictype/test-pr_space.c
+test_pr_space_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_terminal_punctuation_SOURCES = unictype/test-pr_terminal_punctuation.c
+test_pr_terminal_punctuation_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_test_SOURCES = unictype/test-pr_test.c
+test_pr_test_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_titlecase_SOURCES = unictype/test-pr_titlecase.c
+test_pr_titlecase_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_unassigned_code_value_SOURCES = unictype/test-pr_unassigned_code_value.c
+test_pr_unassigned_code_value_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_unified_ideograph_SOURCES = unictype/test-pr_unified_ideograph.c
+test_pr_unified_ideograph_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_uppercase_SOURCES = unictype/test-pr_uppercase.c
+test_pr_uppercase_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_variation_selector_SOURCES = unictype/test-pr_variation_selector.c
+test_pr_variation_selector_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_white_space_SOURCES = unictype/test-pr_white_space.c
+test_pr_white_space_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_xid_continue_SOURCES = unictype/test-pr_xid_continue.c
+test_pr_xid_continue_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_xid_start_SOURCES = unictype/test-pr_xid_start.c
+test_pr_xid_start_LDADD = $(LDADD) $(LIBUNISTRING)
 test_pr_zero_width_SOURCES = unictype/test-pr_zero_width.c
+test_pr_zero_width_LDADD = $(LDADD) $(LIBUNISTRING)
 test_scripts_SOURCES = unictype/test-scripts.c
+test_scripts_LDADD = $(LDADD) $(LIBUNISTRING)
 test_sy_c_ident_SOURCES = unictype/test-sy_c_ident.c
+test_sy_c_ident_LDADD = $(LDADD) $(LIBUNISTRING)
 test_sy_c_whitespace_SOURCES = unictype/test-sy_c_whitespace.c
+test_sy_c_whitespace_LDADD = $(LDADD) $(LIBUNISTRING)
 test_sy_java_ident_SOURCES = unictype/test-sy_java_ident.c
+test_sy_java_ident_LDADD = $(LDADD) $(LIBUNISTRING)
 test_sy_java_whitespace_SOURCES = unictype/test-sy_java_whitespace.c
+test_sy_java_whitespace_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u16_grapheme_breaks_SOURCES = unigbrk/test-u16-grapheme-breaks.c
+test_u16_grapheme_breaks_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u16_grapheme_next_SOURCES = unigbrk/test-u16-grapheme-next.c
+test_u16_grapheme_next_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u16_grapheme_prev_SOURCES = unigbrk/test-u16-grapheme-prev.c
+test_u16_grapheme_prev_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u32_grapheme_breaks_SOURCES = unigbrk/test-u32-grapheme-breaks.c
+test_u32_grapheme_breaks_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u32_grapheme_next_SOURCES = unigbrk/test-u32-grapheme-next.c
+test_u32_grapheme_next_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u32_grapheme_prev_SOURCES = unigbrk/test-u32-grapheme-prev.c
+test_u32_grapheme_prev_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u8_grapheme_breaks_SOURCES = unigbrk/test-u8-grapheme-breaks.c
+test_u8_grapheme_breaks_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u8_grapheme_next_SOURCES = unigbrk/test-u8-grapheme-next.c
+test_u8_grapheme_next_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u8_grapheme_prev_SOURCES = unigbrk/test-u8-grapheme-prev.c
+test_u8_grapheme_prev_LDADD = $(LDADD) $(LIBUNISTRING)
+test_uc_gbrk_prop_SOURCES = unigbrk/test-uc-gbrk-prop.c
+test_uc_gbrk_prop_LDADD = $(LDADD) $(LIBUNISTRING)
+test_uc_is_grapheme_break_SOURCES = unigbrk/test-uc-is-grapheme-break.c
+test_uc_is_grapheme_break_LDADD = $(LDADD) $(LIBUNISTRING)
+test_ulc_grapheme_breaks_SOURCES = unigbrk/test-ulc-grapheme-breaks.c
+test_ulc_grapheme_breaks_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_possible_linebreaks_SOURCES = unilbrk/test-u16-possible-linebreaks.c
+test_u16_possible_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_width_linebreaks_SOURCES = unilbrk/test-u16-width-linebreaks.c
+test_u16_width_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_possible_linebreaks_SOURCES = unilbrk/test-u32-possible-linebreaks.c
+test_u32_possible_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_width_linebreaks_SOURCES = unilbrk/test-u32-width-linebreaks.c
+test_u32_width_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_possible_linebreaks_SOURCES = unilbrk/test-u8-possible-linebreaks.c
+test_u8_possible_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_width_linebreaks_SOURCES = unilbrk/test-u8-width-linebreaks.c
+test_u8_width_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ulc_possible_linebreaks_SOURCES = unilbrk/test-ulc-possible-linebreaks.c
-test_ulc_possible_linebreaks_LDADD = $(LDADD) @LIBICONV@
+test_ulc_possible_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_ulc_width_linebreaks_SOURCES = unilbrk/test-ulc-width-linebreaks.c
-test_ulc_width_linebreaks_LDADD = $(LDADD) @LIBICONV@
-test_uninames_SOURCES = uniname/test-uninames.c
-test_uninames_LDADD = $(LDADD) @LIBINTL@
+test_ulc_width_linebreaks_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
+@LIBUNISTRING_COMPILE_UNINAME_UNINAME_TRUE@test_uninames_SOURCES = uniname/test-uninames.c
+@LIBUNISTRING_COMPILE_UNINAME_UNINAME_TRUE@test_uninames_LDADD = $(LDADD) @LIBINTL@
 test_canonical_decomposition_SOURCES = uninorm/test-canonical-decomposition.c
+test_canonical_decomposition_LDADD = $(LDADD) $(LIBUNISTRING)
 test_compat_decomposition_SOURCES = uninorm/test-compat-decomposition.c
+test_compat_decomposition_LDADD = $(LDADD) $(LIBUNISTRING)
 test_composition_SOURCES = uninorm/test-composition.c
+test_composition_LDADD = $(LDADD) $(LIBUNISTRING)
 test_decomposing_form_SOURCES = uninorm/test-decomposing-form.c
+test_decomposing_form_LDADD = $(LDADD) $(LIBUNISTRING)
 test_decomposition_SOURCES = uninorm/test-decomposition.c
+test_decomposition_LDADD = $(LDADD) $(LIBUNISTRING)
 test_uninorm_filter_nfc_SOURCES = uninorm/test-uninorm-filter-nfc.c
+test_uninorm_filter_nfc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_nfc_SOURCES = \
   uninorm/test-nfc.c \
   uninorm/test-u8-nfc.c \
   uninorm/test-u16-nfc.c \
   uninorm/test-u32-nfc.c
 
+test_nfc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_nfc_big_SOURCES = \
   uninorm/test-u32-nfc-big.c \
   uninorm/test-u32-normalize-big.c
 
-test_u32_nfc_big_LDADD = $(LDADD) @LIBINTL@
+test_u32_nfc_big_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@
 test_nfd_SOURCES = \
   uninorm/test-nfd.c \
   uninorm/test-u8-nfd.c \
   uninorm/test-u16-nfd.c \
   uninorm/test-u32-nfd.c
 
+test_nfd_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_nfd_big_SOURCES = \
   uninorm/test-u32-nfd-big.c \
   uninorm/test-u32-normalize-big.c
 
-test_u32_nfd_big_LDADD = $(LDADD) @LIBINTL@
+test_u32_nfd_big_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@
 test_nfkc_SOURCES = \
   uninorm/test-nfkc.c \
   uninorm/test-u8-nfkc.c \
   uninorm/test-u16-nfkc.c \
   uninorm/test-u32-nfkc.c
 
+test_nfkc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_nfkc_big_SOURCES = \
   uninorm/test-u32-nfkc-big.c \
   uninorm/test-u32-normalize-big.c
 
-test_u32_nfkc_big_LDADD = $(LDADD) @LIBINTL@
+test_u32_nfkc_big_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@
 test_nfkd_SOURCES = \
   uninorm/test-nfkd.c \
   uninorm/test-u8-nfkd.c \
   uninorm/test-u16-nfkd.c \
   uninorm/test-u32-nfkd.c
 
+test_nfkd_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_nfkd_big_SOURCES = \
   uninorm/test-u32-nfkd-big.c \
   uninorm/test-u32-normalize-big.c
 
-test_u32_nfkd_big_LDADD = $(LDADD) @LIBINTL@
+test_u32_nfkd_big_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@
 test_u16_normcmp_SOURCES = uninorm/test-u16-normcmp.c
+test_u16_normcmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_normcoll_SOURCES = uninorm/test-u16-normcoll.c
-test_u16_normcoll_LDADD = $(LDADD) @LIBICONV@
+test_u16_normcoll_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_normcmp_SOURCES = uninorm/test-u32-normcmp.c
+test_u32_normcmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_normcoll_SOURCES = uninorm/test-u32-normcoll.c
-test_u32_normcoll_LDADD = $(LDADD) @LIBICONV@
+test_u32_normcoll_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u8_normcmp_SOURCES = uninorm/test-u8-normcmp.c
+test_u8_normcmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_normcoll_SOURCES = uninorm/test-u8-normcoll.c
-test_u8_normcoll_LDADD = $(LDADD) @LIBICONV@
+test_u8_normcoll_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_asnprintf1_SOURCES = unistdio/test-u16-asnprintf1.c
-test_u16_asnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u16_asnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_vasnprintf1_SOURCES = unistdio/test-u16-vasnprintf1.c
-test_u16_vasnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u16_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_vasnprintf2_SOURCES = unistdio/test-u16-vasnprintf2.c
-test_u16_vasnprintf2_LDADD = $(LDADD) @LIBICONV@
+test_u16_vasnprintf2_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_vasnprintf3_SOURCES = unistdio/test-u16-vasnprintf3.c
-test_u16_vasnprintf3_LDADD = $(LDADD) @LIBICONV@
+test_u16_vasnprintf3_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_vasprintf1_SOURCES = unistdio/test-u16-vasprintf1.c
-test_u16_vasprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u16_vasprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_vsnprintf1_SOURCES = unistdio/test-u16-vsnprintf1.c
-test_u16_vsnprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@
+test_u16_vsnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@
 test_u16_vsprintf1_SOURCES = unistdio/test-u16-vsprintf1.c
-test_u16_vsprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@
+test_u16_vsprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@
 test_u32_asnprintf1_SOURCES = unistdio/test-u32-asnprintf1.c
-test_u32_asnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u32_asnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_vasnprintf1_SOURCES = unistdio/test-u32-vasnprintf1.c
-test_u32_vasnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u32_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_vasnprintf2_SOURCES = unistdio/test-u32-vasnprintf2.c
-test_u32_vasnprintf2_LDADD = $(LDADD) @LIBICONV@
+test_u32_vasnprintf2_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_vasnprintf3_SOURCES = unistdio/test-u32-vasnprintf3.c
-test_u32_vasnprintf3_LDADD = $(LDADD) @LIBICONV@
+test_u32_vasnprintf3_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_vasprintf1_SOURCES = unistdio/test-u32-vasprintf1.c
-test_u32_vasprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u32_vasprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_vsnprintf1_SOURCES = unistdio/test-u32-vsnprintf1.c
-test_u32_vsnprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@
+test_u32_vsnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@
 test_u32_vsprintf1_SOURCES = unistdio/test-u32-vsprintf1.c
-test_u32_vsprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@
+test_u32_vsprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@
 test_u8_asnprintf1_SOURCES = unistdio/test-u8-asnprintf1.c
-test_u8_asnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u8_asnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u8_vasnprintf1_SOURCES = unistdio/test-u8-vasnprintf1.c
-test_u8_vasnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u8_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u8_vasnprintf2_SOURCES = unistdio/test-u8-vasnprintf2.c
-test_u8_vasnprintf2_LDADD = $(LDADD) @LIBICONV@
+test_u8_vasnprintf2_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u8_vasnprintf3_SOURCES = unistdio/test-u8-vasnprintf3.c
-test_u8_vasnprintf3_LDADD = $(LDADD) @LIBICONV@
+test_u8_vasnprintf3_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u8_vasprintf1_SOURCES = unistdio/test-u8-vasprintf1.c
-test_u8_vasprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u8_vasprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u8_vsnprintf1_SOURCES = unistdio/test-u8-vsnprintf1.c
-test_u8_vsnprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@
+test_u8_vsnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@
 test_u8_vsprintf1_SOURCES = unistdio/test-u8-vsprintf1.c
-test_u8_vsprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@
+test_u8_vsprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@
 test_ulc_asnprintf1_SOURCES = unistdio/test-ulc-asnprintf1.c
-test_ulc_asnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_ulc_asnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_ulc_vasnprintf1_SOURCES = unistdio/test-ulc-vasnprintf1.c
-test_ulc_vasnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_ulc_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_ulc_vasnprintf2_SOURCES = unistdio/test-ulc-vasnprintf2.c
-test_ulc_vasnprintf2_LDADD = $(LDADD) @LIBICONV@
+test_ulc_vasnprintf2_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_ulc_vasnprintf3_SOURCES = unistdio/test-ulc-vasnprintf3.c
-test_ulc_vasnprintf3_LDADD = $(LDADD) @LIBICONV@
+test_ulc_vasnprintf3_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_ulc_vasprintf1_SOURCES = unistdio/test-ulc-vasprintf1.c
-test_ulc_vasprintf1_LDADD = $(LDADD) @LIBICONV@
+test_ulc_vasprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_ulc_vsnprintf1_SOURCES = unistdio/test-ulc-vsnprintf1.c
-test_ulc_vsnprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@
+test_ulc_vsnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@
 test_ulc_vsprintf1_SOURCES = unistdio/test-ulc-vsprintf1.c
-test_ulc_vsprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@
+test_ulc_vsprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@
 test_u16_check_SOURCES = unistr/test-u16-check.c
+test_u16_check_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_chr_SOURCES = unistr/test-u16-chr.c
+test_u16_chr_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_cmp_SOURCES = unistr/test-u16-cmp.c
+test_u16_cmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_cmp2_SOURCES = unistr/test-u16-cmp2.c
+test_u16_cmp2_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_cpy_alloc_SOURCES = unistr/test-u16-cpy-alloc.c
+test_u16_cpy_alloc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_cpy_SOURCES = unistr/test-u16-cpy.c
+test_u16_cpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_mblen_SOURCES = unistr/test-u16-mblen.c
+test_u16_mblen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_mbsnlen_SOURCES = unistr/test-u16-mbsnlen.c
+test_u16_mbsnlen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_mbtouc_SOURCES = unistr/test-u16-mbtouc.c
+test_u16_mbtouc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_mbtouc_unsafe_SOURCES = unistr/test-u16-mbtouc-unsafe.c
+test_u16_mbtouc_unsafe_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_mbtoucr_SOURCES = unistr/test-u16-mbtoucr.c
+test_u16_mbtoucr_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_move_SOURCES = unistr/test-u16-move.c
+test_u16_move_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_next_SOURCES = unistr/test-u16-next.c
+test_u16_next_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_prev_SOURCES = unistr/test-u16-prev.c
+test_u16_prev_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_set_SOURCES = unistr/test-u16-set.c
+test_u16_set_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_stpcpy_SOURCES = unistr/test-u16-stpcpy.c
+test_u16_stpcpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_stpncpy_SOURCES = unistr/test-u16-stpncpy.c
+test_u16_stpncpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_strcat_SOURCES = unistr/test-u16-strcat.c
+test_u16_strcat_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u16_strchr_SOURCES = unistr/test-u16-strchr.c
+test_u16_strchr_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_strcmp_SOURCES = unistr/test-u16-strcmp.c
+test_u16_strcmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_strcoll_SOURCES = unistr/test-u16-strcoll.c
-test_u16_strcoll_LDADD = $(LDADD) @LIBICONV@
+test_u16_strcoll_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_strcpy_SOURCES = unistr/test-u16-strcpy.c
+test_u16_strcpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_strdup_SOURCES = unistr/test-u16-strdup.c
+test_u16_strdup_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_strlen_SOURCES = unistr/test-u16-strlen.c
+test_u16_strlen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_strmblen_SOURCES = unistr/test-u16-strmblen.c
+test_u16_strmblen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_strmbtouc_SOURCES = unistr/test-u16-strmbtouc.c
+test_u16_strmbtouc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_strncat_SOURCES = unistr/test-u16-strncat.c
+test_u16_strncat_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_strncmp_SOURCES = unistr/test-u16-strncmp.c
+test_u16_strncmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_strncpy_SOURCES = unistr/test-u16-strncpy.c
+test_u16_strncpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_strnlen_SOURCES = unistr/test-u16-strnlen.c
+test_u16_strnlen_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u16_strstr_SOURCES = unistr/test-u16-strstr.c
+test_u16_strstr_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u16_strtok_SOURCES = unistr/test-u16-strtok.c
+test_u16_strtok_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_to_u32_SOURCES = unistr/test-u16-to-u32.c
+test_u16_to_u32_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_to_u8_SOURCES = unistr/test-u16-to-u8.c
+test_u16_to_u8_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_uctomb_SOURCES = unistr/test-u16-uctomb.c
+test_u16_uctomb_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_check_SOURCES = unistr/test-u32-check.c
+test_u32_check_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_chr_SOURCES = unistr/test-u32-chr.c
+test_u32_chr_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_cmp_SOURCES = unistr/test-u32-cmp.c
+test_u32_cmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_cmp2_SOURCES = unistr/test-u32-cmp2.c
+test_u32_cmp2_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_cpy_alloc_SOURCES = unistr/test-u32-cpy-alloc.c
+test_u32_cpy_alloc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_cpy_SOURCES = unistr/test-u32-cpy.c
+test_u32_cpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_mblen_SOURCES = unistr/test-u32-mblen.c
+test_u32_mblen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_mbsnlen_SOURCES = unistr/test-u32-mbsnlen.c
+test_u32_mbsnlen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_mbtouc_SOURCES = unistr/test-u32-mbtouc.c
+test_u32_mbtouc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_mbtouc_unsafe_SOURCES = unistr/test-u32-mbtouc-unsafe.c
+test_u32_mbtouc_unsafe_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_mbtoucr_SOURCES = unistr/test-u32-mbtoucr.c
+test_u32_mbtoucr_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_move_SOURCES = unistr/test-u32-move.c
+test_u32_move_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_next_SOURCES = unistr/test-u32-next.c
+test_u32_next_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_prev_SOURCES = unistr/test-u32-prev.c
+test_u32_prev_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_set_SOURCES = unistr/test-u32-set.c
+test_u32_set_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_stpcpy_SOURCES = unistr/test-u32-stpcpy.c
+test_u32_stpcpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_stpncpy_SOURCES = unistr/test-u32-stpncpy.c
+test_u32_stpncpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_strcat_SOURCES = unistr/test-u32-strcat.c
+test_u32_strcat_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u32_strchr_SOURCES = unistr/test-u32-strchr.c
+test_u32_strchr_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_strcmp_SOURCES = unistr/test-u32-strcmp.c
+test_u32_strcmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_strcoll_SOURCES = unistr/test-u32-strcoll.c
-test_u32_strcoll_LDADD = $(LDADD) @LIBICONV@
+test_u32_strcoll_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_strcpy_SOURCES = unistr/test-u32-strcpy.c
+test_u32_strcpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_strdup_SOURCES = unistr/test-u32-strdup.c
+test_u32_strdup_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_strlen_SOURCES = unistr/test-u32-strlen.c
+test_u32_strlen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_strmblen_SOURCES = unistr/test-u32-strmblen.c
+test_u32_strmblen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_strmbtouc_SOURCES = unistr/test-u32-strmbtouc.c
+test_u32_strmbtouc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_strncat_SOURCES = unistr/test-u32-strncat.c
+test_u32_strncat_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_strncmp_SOURCES = unistr/test-u32-strncmp.c
+test_u32_strncmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_strncpy_SOURCES = unistr/test-u32-strncpy.c
+test_u32_strncpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_strnlen_SOURCES = unistr/test-u32-strnlen.c
+test_u32_strnlen_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u32_strstr_SOURCES = unistr/test-u32-strstr.c
+test_u32_strstr_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u32_strtok_SOURCES = unistr/test-u32-strtok.c
+test_u32_strtok_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_to_u16_SOURCES = unistr/test-u32-to-u16.c
+test_u32_to_u16_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_to_u8_SOURCES = unistr/test-u32-to-u8.c
+test_u32_to_u8_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_uctomb_SOURCES = unistr/test-u32-uctomb.c
+test_u32_uctomb_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_check_SOURCES = unistr/test-u8-check.c
+test_u8_check_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_chr_SOURCES = unistr/test-u8-chr.c
+test_u8_chr_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_cmp_SOURCES = unistr/test-u8-cmp.c
+test_u8_cmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_cmp2_SOURCES = unistr/test-u8-cmp2.c
+test_u8_cmp2_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_cpy_alloc_SOURCES = unistr/test-u8-cpy-alloc.c
+test_u8_cpy_alloc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_cpy_SOURCES = unistr/test-u8-cpy.c
+test_u8_cpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_mblen_SOURCES = unistr/test-u8-mblen.c
+test_u8_mblen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_mbsnlen_SOURCES = unistr/test-u8-mbsnlen.c
+test_u8_mbsnlen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_mbtouc_SOURCES = unistr/test-u8-mbtouc.c
+test_u8_mbtouc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_mbtouc_unsafe_SOURCES = unistr/test-u8-mbtouc-unsafe.c
+test_u8_mbtouc_unsafe_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_mbtoucr_SOURCES = unistr/test-u8-mbtoucr.c
+test_u8_mbtoucr_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_move_SOURCES = unistr/test-u8-move.c
+test_u8_move_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_next_SOURCES = unistr/test-u8-next.c
+test_u8_next_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_prev_SOURCES = unistr/test-u8-prev.c
+test_u8_prev_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_set_SOURCES = unistr/test-u8-set.c
+test_u8_set_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_stpcpy_SOURCES = unistr/test-u8-stpcpy.c
+test_u8_stpcpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_stpncpy_SOURCES = unistr/test-u8-stpncpy.c
+test_u8_stpncpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_strcat_SOURCES = unistr/test-u8-strcat.c
+test_u8_strcat_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u8_strchr_SOURCES = unistr/test-u8-strchr.c
+test_u8_strchr_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_strcmp_SOURCES = unistr/test-u8-strcmp.c
+test_u8_strcmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_strcoll_SOURCES = unistr/test-u8-strcoll.c
-test_u8_strcoll_LDADD = $(LDADD) @LIBICONV@
+test_u8_strcoll_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u8_strcpy_SOURCES = unistr/test-u8-strcpy.c
+test_u8_strcpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_strdup_SOURCES = unistr/test-u8-strdup.c
+test_u8_strdup_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_strlen_SOURCES = unistr/test-u8-strlen.c
+test_u8_strlen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_strmblen_SOURCES = unistr/test-u8-strmblen.c
+test_u8_strmblen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_strmbtouc_SOURCES = unistr/test-u8-strmbtouc.c
+test_u8_strmbtouc_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_strncat_SOURCES = unistr/test-u8-strncat.c
+test_u8_strncat_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_strncmp_SOURCES = unistr/test-u8-strncmp.c
+test_u8_strncmp_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_strncpy_SOURCES = unistr/test-u8-strncpy.c
+test_u8_strncpy_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_strnlen_SOURCES = unistr/test-u8-strnlen.c
+test_u8_strnlen_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u8_strstr_SOURCES = unistr/test-u8-strstr.c
+test_u8_strstr_LDADD = $(LDADD) $(LIBUNISTRING)
+test_u8_strtok_SOURCES = unistr/test-u8-strtok.c
+test_u8_strtok_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_to_u16_SOURCES = unistr/test-u8-to-u16.c
+test_u8_to_u16_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_to_u32_SOURCES = unistr/test-u8-to-u32.c
+test_u8_to_u32_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_uctomb_SOURCES = unistr/test-u8-uctomb.c
+test_u8_uctomb_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_wordbreaks_SOURCES = uniwbrk/test-u16-wordbreaks.c
+test_u16_wordbreaks_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_wordbreaks_SOURCES = uniwbrk/test-u32-wordbreaks.c
+test_u32_wordbreaks_LDADD = $(LDADD) $(LIBUNISTRING)
+test_uc_wordbreaks_SOURCES = uniwbrk/test-uc-wordbreaks.c
+test_uc_wordbreaks_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_wordbreaks_SOURCES = uniwbrk/test-u8-wordbreaks.c
+test_u8_wordbreaks_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ulc_wordbreaks_SOURCES = uniwbrk/test-ulc-wordbreaks.c
-test_ulc_wordbreaks_LDADD = $(LDADD) @LIBICONV@
+test_ulc_wordbreaks_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_strwidth_SOURCES = uniwidth/test-u16-strwidth.c
+test_u16_strwidth_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u16_width_SOURCES = uniwidth/test-u16-width.c
+test_u16_width_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_strwidth_SOURCES = uniwidth/test-u32-strwidth.c
+test_u32_strwidth_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u32_width_SOURCES = uniwidth/test-u32-width.c
+test_u32_width_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_strwidth_SOURCES = uniwidth/test-u8-strwidth.c
+test_u8_strwidth_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_width_SOURCES = uniwidth/test-u8-width.c
+test_u8_width_LDADD = $(LDADD) $(LIBUNISTRING)
 test_uc_width_SOURCES = uniwidth/test-uc_width.c
+test_uc_width_LDADD = $(LDADD) $(LIBUNISTRING)
 test_uc_width2_SOURCES = uniwidth/test-uc_width2.c
-UNUSED_PARAMETER_H = unused-parameter.h
-WARN_ON_USE_H = warn-on-use.h
+test_uc_width2_LDADD = $(LDADD) $(LIBUNISTRING)
 test_xalloc_die_LDADD = $(LDADD) @LIBINTL@
 
 # Ensure that ../lib/config.h is seen before ../config.h.
@@ -5058,7 +6182,7 @@ all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/Makefile.gnulib $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -5071,7 +6195,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/Makefile.gnulib $(am__co
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign tests/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -5080,6 +6203,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/Makefile.gnulib $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -5103,7 +6227,8 @@ glthread/$(DEPDIR)/$(am__dirstamp):
 	@: > glthread/$(DEPDIR)/$(am__dirstamp)
 glthread/thread.$(OBJEXT): glthread/$(am__dirstamp) \
 	glthread/$(DEPDIR)/$(am__dirstamp)
-libtests.a: $(libtests_a_OBJECTS) $(libtests_a_DEPENDENCIES) 
+
+libtests.a: $(libtests_a_OBJECTS) $(libtests_a_DEPENDENCIES) $(EXTRA_libtests_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libtests.a
 	$(AM_V_AR)$(libtests_a_AR) libtests.a $(libtests_a_OBJECTS) $(libtests_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libtests.a
@@ -5125,10 +6250,12 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-test-alloca-opt$(EXEEXT): $(test_alloca_opt_OBJECTS) $(test_alloca_opt_DEPENDENCIES) 
+
+test-alloca-opt$(EXEEXT): $(test_alloca_opt_OBJECTS) $(test_alloca_opt_DEPENDENCIES) $(EXTRA_test_alloca_opt_DEPENDENCIES) 
 	@rm -f test-alloca-opt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_alloca_opt_OBJECTS) $(test_alloca_opt_LDADD) $(LIBS)
-test-array-mergesort$(EXEEXT): $(test_array_mergesort_OBJECTS) $(test_array_mergesort_DEPENDENCIES) 
+
+test-array-mergesort$(EXEEXT): $(test_array_mergesort_OBJECTS) $(test_array_mergesort_DEPENDENCIES) $(EXTRA_test_array_mergesort_DEPENDENCIES) 
 	@rm -f test-array-mergesort$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_array_mergesort_OBJECTS) $(test_array_mergesort_LDADD) $(LIBS)
 unictype/$(am__dirstamp):
@@ -5139,46 +6266,66 @@ unictype/$(DEPDIR)/$(am__dirstamp):
 	@: > unictype/$(DEPDIR)/$(am__dirstamp)
 unictype/test-bidi_byname.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-bidi_byname$(EXEEXT): $(test_bidi_byname_OBJECTS) $(test_bidi_byname_DEPENDENCIES) 
+
+test-bidi_byname$(EXEEXT): $(test_bidi_byname_OBJECTS) $(test_bidi_byname_DEPENDENCIES) $(EXTRA_test_bidi_byname_DEPENDENCIES) 
 	@rm -f test-bidi_byname$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_bidi_byname_OBJECTS) $(test_bidi_byname_LDADD) $(LIBS)
+unictype/test-bidi_longname.$(OBJEXT): unictype/$(am__dirstamp) \
+	unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-bidi_longname$(EXEEXT): $(test_bidi_longname_OBJECTS) $(test_bidi_longname_DEPENDENCIES) $(EXTRA_test_bidi_longname_DEPENDENCIES) 
+	@rm -f test-bidi_longname$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_bidi_longname_OBJECTS) $(test_bidi_longname_LDADD) $(LIBS)
 unictype/test-bidi_name.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-bidi_name$(EXEEXT): $(test_bidi_name_OBJECTS) $(test_bidi_name_DEPENDENCIES) 
+
+test-bidi_name$(EXEEXT): $(test_bidi_name_OBJECTS) $(test_bidi_name_DEPENDENCIES) $(EXTRA_test_bidi_name_DEPENDENCIES) 
 	@rm -f test-bidi_name$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_bidi_name_OBJECTS) $(test_bidi_name_LDADD) $(LIBS)
 unictype/test-bidi_of.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-bidi_of$(EXEEXT): $(test_bidi_of_OBJECTS) $(test_bidi_of_DEPENDENCIES) 
+
+test-bidi_of$(EXEEXT): $(test_bidi_of_OBJECTS) $(test_bidi_of_DEPENDENCIES) $(EXTRA_test_bidi_of_DEPENDENCIES) 
 	@rm -f test-bidi_of$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_bidi_of_OBJECTS) $(test_bidi_of_LDADD) $(LIBS)
 unictype/test-bidi_test.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-bidi_test$(EXEEXT): $(test_bidi_test_OBJECTS) $(test_bidi_test_DEPENDENCIES) 
+
+test-bidi_test$(EXEEXT): $(test_bidi_test_OBJECTS) $(test_bidi_test_DEPENDENCIES) $(EXTRA_test_bidi_test_DEPENDENCIES) 
 	@rm -f test-bidi_test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_bidi_test_OBJECTS) $(test_bidi_test_LDADD) $(LIBS)
 unictype/test-block_list.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-block_list$(EXEEXT): $(test_block_list_OBJECTS) $(test_block_list_DEPENDENCIES) 
+
+test-block_list$(EXEEXT): $(test_block_list_OBJECTS) $(test_block_list_DEPENDENCIES) $(EXTRA_test_block_list_DEPENDENCIES) 
 	@rm -f test-block_list$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_block_list_OBJECTS) $(test_block_list_LDADD) $(LIBS)
 unictype/test-block_of.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-block_of$(EXEEXT): $(test_block_of_OBJECTS) $(test_block_of_DEPENDENCIES) 
+
+test-block_of$(EXEEXT): $(test_block_of_OBJECTS) $(test_block_of_DEPENDENCIES) $(EXTRA_test_block_of_DEPENDENCIES) 
 	@rm -f test-block_of$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_block_of_OBJECTS) $(test_block_of_LDADD) $(LIBS)
 unictype/test-block_test.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-block_test$(EXEEXT): $(test_block_test_OBJECTS) $(test_block_test_DEPENDENCIES) 
+
+test-block_test$(EXEEXT): $(test_block_test_OBJECTS) $(test_block_test_DEPENDENCIES) $(EXTRA_test_block_test_DEPENDENCIES) 
 	@rm -f test-block_test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_block_test_OBJECTS) $(test_block_test_LDADD) $(LIBS)
-test-c-ctype$(EXEEXT): $(test_c_ctype_OBJECTS) $(test_c_ctype_DEPENDENCIES) 
+
+test-btowc$(EXEEXT): $(test_btowc_OBJECTS) $(test_btowc_DEPENDENCIES) $(EXTRA_test_btowc_DEPENDENCIES) 
+	@rm -f test-btowc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_btowc_OBJECTS) $(test_btowc_LDADD) $(LIBS)
+
+test-c-ctype$(EXEEXT): $(test_c_ctype_OBJECTS) $(test_c_ctype_DEPENDENCIES) $(EXTRA_test_c_ctype_DEPENDENCIES) 
 	@rm -f test-c-ctype$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_c_ctype_OBJECTS) $(test_c_ctype_LDADD) $(LIBS)
-test-c-strcasecmp$(EXEEXT): $(test_c_strcasecmp_OBJECTS) $(test_c_strcasecmp_DEPENDENCIES) 
+
+test-c-strcasecmp$(EXEEXT): $(test_c_strcasecmp_OBJECTS) $(test_c_strcasecmp_DEPENDENCIES) $(EXTRA_test_c_strcasecmp_DEPENDENCIES) 
 	@rm -f test-c-strcasecmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_c_strcasecmp_OBJECTS) $(test_c_strcasecmp_LDADD) $(LIBS)
-test-c-strncasecmp$(EXEEXT): $(test_c_strncasecmp_OBJECTS) $(test_c_strncasecmp_DEPENDENCIES) 
+
+test-c-strncasecmp$(EXEEXT): $(test_c_strncasecmp_OBJECTS) $(test_c_strncasecmp_DEPENDENCIES) $(EXTRA_test_c_strncasecmp_DEPENDENCIES) 
 	@rm -f test-c-strncasecmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_c_strncasecmp_OBJECTS) $(test_c_strncasecmp_LDADD) $(LIBS)
 uninorm/$(am__dirstamp):
@@ -5189,7 +6336,8 @@ uninorm/$(DEPDIR)/$(am__dirstamp):
 	@: > uninorm/$(DEPDIR)/$(am__dirstamp)
 uninorm/test-canonical-decomposition.$(OBJEXT):  \
 	uninorm/$(am__dirstamp) uninorm/$(DEPDIR)/$(am__dirstamp)
-test-canonical-decomposition$(EXEEXT): $(test_canonical_decomposition_OBJECTS) $(test_canonical_decomposition_DEPENDENCIES) 
+
+test-canonical-decomposition$(EXEEXT): $(test_canonical_decomposition_OBJECTS) $(test_canonical_decomposition_DEPENDENCIES) $(EXTRA_test_canonical_decomposition_DEPENDENCIES) 
 	@rm -f test-canonical-decomposition$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_canonical_decomposition_OBJECTS) $(test_canonical_decomposition_LDADD) $(LIBS)
 unicase/$(am__dirstamp):
@@ -5200,393 +6348,598 @@ unicase/$(DEPDIR)/$(am__dirstamp):
 	@: > unicase/$(DEPDIR)/$(am__dirstamp)
 unicase/test-cased.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-cased$(EXEEXT): $(test_cased_OBJECTS) $(test_cased_DEPENDENCIES) 
+
+test-cased$(EXEEXT): $(test_cased_OBJECTS) $(test_cased_DEPENDENCIES) $(EXTRA_test_cased_DEPENDENCIES) 
 	@rm -f test-cased$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_cased_OBJECTS) $(test_cased_LDADD) $(LIBS)
 unictype/test-categ_C.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_C$(EXEEXT): $(test_categ_C_OBJECTS) $(test_categ_C_DEPENDENCIES) 
+
+test-categ_C$(EXEEXT): $(test_categ_C_OBJECTS) $(test_categ_C_DEPENDENCIES) $(EXTRA_test_categ_C_DEPENDENCIES) 
 	@rm -f test-categ_C$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_C_OBJECTS) $(test_categ_C_LDADD) $(LIBS)
 unictype/test-categ_Cc.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Cc$(EXEEXT): $(test_categ_Cc_OBJECTS) $(test_categ_Cc_DEPENDENCIES) 
+
+test-categ_Cc$(EXEEXT): $(test_categ_Cc_OBJECTS) $(test_categ_Cc_DEPENDENCIES) $(EXTRA_test_categ_Cc_DEPENDENCIES) 
 	@rm -f test-categ_Cc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Cc_OBJECTS) $(test_categ_Cc_LDADD) $(LIBS)
 unictype/test-categ_Cf.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Cf$(EXEEXT): $(test_categ_Cf_OBJECTS) $(test_categ_Cf_DEPENDENCIES) 
+
+test-categ_Cf$(EXEEXT): $(test_categ_Cf_OBJECTS) $(test_categ_Cf_DEPENDENCIES) $(EXTRA_test_categ_Cf_DEPENDENCIES) 
 	@rm -f test-categ_Cf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Cf_OBJECTS) $(test_categ_Cf_LDADD) $(LIBS)
 unictype/test-categ_Cn.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Cn$(EXEEXT): $(test_categ_Cn_OBJECTS) $(test_categ_Cn_DEPENDENCIES) 
+
+test-categ_Cn$(EXEEXT): $(test_categ_Cn_OBJECTS) $(test_categ_Cn_DEPENDENCIES) $(EXTRA_test_categ_Cn_DEPENDENCIES) 
 	@rm -f test-categ_Cn$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Cn_OBJECTS) $(test_categ_Cn_LDADD) $(LIBS)
 unictype/test-categ_Co.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Co$(EXEEXT): $(test_categ_Co_OBJECTS) $(test_categ_Co_DEPENDENCIES) 
+
+test-categ_Co$(EXEEXT): $(test_categ_Co_OBJECTS) $(test_categ_Co_DEPENDENCIES) $(EXTRA_test_categ_Co_DEPENDENCIES) 
 	@rm -f test-categ_Co$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Co_OBJECTS) $(test_categ_Co_LDADD) $(LIBS)
 unictype/test-categ_Cs.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Cs$(EXEEXT): $(test_categ_Cs_OBJECTS) $(test_categ_Cs_DEPENDENCIES) 
+
+test-categ_Cs$(EXEEXT): $(test_categ_Cs_OBJECTS) $(test_categ_Cs_DEPENDENCIES) $(EXTRA_test_categ_Cs_DEPENDENCIES) 
 	@rm -f test-categ_Cs$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Cs_OBJECTS) $(test_categ_Cs_LDADD) $(LIBS)
 unictype/test-categ_L.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_L$(EXEEXT): $(test_categ_L_OBJECTS) $(test_categ_L_DEPENDENCIES) 
+
+test-categ_L$(EXEEXT): $(test_categ_L_OBJECTS) $(test_categ_L_DEPENDENCIES) $(EXTRA_test_categ_L_DEPENDENCIES) 
 	@rm -f test-categ_L$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_L_OBJECTS) $(test_categ_L_LDADD) $(LIBS)
+unictype/test-categ_LC.$(OBJEXT): unictype/$(am__dirstamp) \
+	unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-categ_LC$(EXEEXT): $(test_categ_LC_OBJECTS) $(test_categ_LC_DEPENDENCIES) $(EXTRA_test_categ_LC_DEPENDENCIES) 
+	@rm -f test-categ_LC$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_categ_LC_OBJECTS) $(test_categ_LC_LDADD) $(LIBS)
 unictype/test-categ_Ll.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Ll$(EXEEXT): $(test_categ_Ll_OBJECTS) $(test_categ_Ll_DEPENDENCIES) 
+
+test-categ_Ll$(EXEEXT): $(test_categ_Ll_OBJECTS) $(test_categ_Ll_DEPENDENCIES) $(EXTRA_test_categ_Ll_DEPENDENCIES) 
 	@rm -f test-categ_Ll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Ll_OBJECTS) $(test_categ_Ll_LDADD) $(LIBS)
 unictype/test-categ_Lm.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Lm$(EXEEXT): $(test_categ_Lm_OBJECTS) $(test_categ_Lm_DEPENDENCIES) 
+
+test-categ_Lm$(EXEEXT): $(test_categ_Lm_OBJECTS) $(test_categ_Lm_DEPENDENCIES) $(EXTRA_test_categ_Lm_DEPENDENCIES) 
 	@rm -f test-categ_Lm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Lm_OBJECTS) $(test_categ_Lm_LDADD) $(LIBS)
 unictype/test-categ_Lo.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Lo$(EXEEXT): $(test_categ_Lo_OBJECTS) $(test_categ_Lo_DEPENDENCIES) 
+
+test-categ_Lo$(EXEEXT): $(test_categ_Lo_OBJECTS) $(test_categ_Lo_DEPENDENCIES) $(EXTRA_test_categ_Lo_DEPENDENCIES) 
 	@rm -f test-categ_Lo$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Lo_OBJECTS) $(test_categ_Lo_LDADD) $(LIBS)
 unictype/test-categ_Lt.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Lt$(EXEEXT): $(test_categ_Lt_OBJECTS) $(test_categ_Lt_DEPENDENCIES) 
+
+test-categ_Lt$(EXEEXT): $(test_categ_Lt_OBJECTS) $(test_categ_Lt_DEPENDENCIES) $(EXTRA_test_categ_Lt_DEPENDENCIES) 
 	@rm -f test-categ_Lt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Lt_OBJECTS) $(test_categ_Lt_LDADD) $(LIBS)
 unictype/test-categ_Lu.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Lu$(EXEEXT): $(test_categ_Lu_OBJECTS) $(test_categ_Lu_DEPENDENCIES) 
+
+test-categ_Lu$(EXEEXT): $(test_categ_Lu_OBJECTS) $(test_categ_Lu_DEPENDENCIES) $(EXTRA_test_categ_Lu_DEPENDENCIES) 
 	@rm -f test-categ_Lu$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Lu_OBJECTS) $(test_categ_Lu_LDADD) $(LIBS)
 unictype/test-categ_M.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_M$(EXEEXT): $(test_categ_M_OBJECTS) $(test_categ_M_DEPENDENCIES) 
+
+test-categ_M$(EXEEXT): $(test_categ_M_OBJECTS) $(test_categ_M_DEPENDENCIES) $(EXTRA_test_categ_M_DEPENDENCIES) 
 	@rm -f test-categ_M$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_M_OBJECTS) $(test_categ_M_LDADD) $(LIBS)
 unictype/test-categ_Mc.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Mc$(EXEEXT): $(test_categ_Mc_OBJECTS) $(test_categ_Mc_DEPENDENCIES) 
+
+test-categ_Mc$(EXEEXT): $(test_categ_Mc_OBJECTS) $(test_categ_Mc_DEPENDENCIES) $(EXTRA_test_categ_Mc_DEPENDENCIES) 
 	@rm -f test-categ_Mc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Mc_OBJECTS) $(test_categ_Mc_LDADD) $(LIBS)
 unictype/test-categ_Me.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Me$(EXEEXT): $(test_categ_Me_OBJECTS) $(test_categ_Me_DEPENDENCIES) 
+
+test-categ_Me$(EXEEXT): $(test_categ_Me_OBJECTS) $(test_categ_Me_DEPENDENCIES) $(EXTRA_test_categ_Me_DEPENDENCIES) 
 	@rm -f test-categ_Me$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Me_OBJECTS) $(test_categ_Me_LDADD) $(LIBS)
 unictype/test-categ_Mn.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Mn$(EXEEXT): $(test_categ_Mn_OBJECTS) $(test_categ_Mn_DEPENDENCIES) 
+
+test-categ_Mn$(EXEEXT): $(test_categ_Mn_OBJECTS) $(test_categ_Mn_DEPENDENCIES) $(EXTRA_test_categ_Mn_DEPENDENCIES) 
 	@rm -f test-categ_Mn$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Mn_OBJECTS) $(test_categ_Mn_LDADD) $(LIBS)
 unictype/test-categ_N.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_N$(EXEEXT): $(test_categ_N_OBJECTS) $(test_categ_N_DEPENDENCIES) 
+
+test-categ_N$(EXEEXT): $(test_categ_N_OBJECTS) $(test_categ_N_DEPENDENCIES) $(EXTRA_test_categ_N_DEPENDENCIES) 
 	@rm -f test-categ_N$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_N_OBJECTS) $(test_categ_N_LDADD) $(LIBS)
 unictype/test-categ_Nd.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Nd$(EXEEXT): $(test_categ_Nd_OBJECTS) $(test_categ_Nd_DEPENDENCIES) 
+
+test-categ_Nd$(EXEEXT): $(test_categ_Nd_OBJECTS) $(test_categ_Nd_DEPENDENCIES) $(EXTRA_test_categ_Nd_DEPENDENCIES) 
 	@rm -f test-categ_Nd$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Nd_OBJECTS) $(test_categ_Nd_LDADD) $(LIBS)
 unictype/test-categ_Nl.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Nl$(EXEEXT): $(test_categ_Nl_OBJECTS) $(test_categ_Nl_DEPENDENCIES) 
+
+test-categ_Nl$(EXEEXT): $(test_categ_Nl_OBJECTS) $(test_categ_Nl_DEPENDENCIES) $(EXTRA_test_categ_Nl_DEPENDENCIES) 
 	@rm -f test-categ_Nl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Nl_OBJECTS) $(test_categ_Nl_LDADD) $(LIBS)
 unictype/test-categ_No.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_No$(EXEEXT): $(test_categ_No_OBJECTS) $(test_categ_No_DEPENDENCIES) 
+
+test-categ_No$(EXEEXT): $(test_categ_No_OBJECTS) $(test_categ_No_DEPENDENCIES) $(EXTRA_test_categ_No_DEPENDENCIES) 
 	@rm -f test-categ_No$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_No_OBJECTS) $(test_categ_No_LDADD) $(LIBS)
 unictype/test-categ_P.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_P$(EXEEXT): $(test_categ_P_OBJECTS) $(test_categ_P_DEPENDENCIES) 
+
+test-categ_P$(EXEEXT): $(test_categ_P_OBJECTS) $(test_categ_P_DEPENDENCIES) $(EXTRA_test_categ_P_DEPENDENCIES) 
 	@rm -f test-categ_P$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_P_OBJECTS) $(test_categ_P_LDADD) $(LIBS)
 unictype/test-categ_Pc.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Pc$(EXEEXT): $(test_categ_Pc_OBJECTS) $(test_categ_Pc_DEPENDENCIES) 
+
+test-categ_Pc$(EXEEXT): $(test_categ_Pc_OBJECTS) $(test_categ_Pc_DEPENDENCIES) $(EXTRA_test_categ_Pc_DEPENDENCIES) 
 	@rm -f test-categ_Pc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Pc_OBJECTS) $(test_categ_Pc_LDADD) $(LIBS)
 unictype/test-categ_Pd.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Pd$(EXEEXT): $(test_categ_Pd_OBJECTS) $(test_categ_Pd_DEPENDENCIES) 
+
+test-categ_Pd$(EXEEXT): $(test_categ_Pd_OBJECTS) $(test_categ_Pd_DEPENDENCIES) $(EXTRA_test_categ_Pd_DEPENDENCIES) 
 	@rm -f test-categ_Pd$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Pd_OBJECTS) $(test_categ_Pd_LDADD) $(LIBS)
 unictype/test-categ_Pe.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Pe$(EXEEXT): $(test_categ_Pe_OBJECTS) $(test_categ_Pe_DEPENDENCIES) 
+
+test-categ_Pe$(EXEEXT): $(test_categ_Pe_OBJECTS) $(test_categ_Pe_DEPENDENCIES) $(EXTRA_test_categ_Pe_DEPENDENCIES) 
 	@rm -f test-categ_Pe$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Pe_OBJECTS) $(test_categ_Pe_LDADD) $(LIBS)
 unictype/test-categ_Pf.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Pf$(EXEEXT): $(test_categ_Pf_OBJECTS) $(test_categ_Pf_DEPENDENCIES) 
+
+test-categ_Pf$(EXEEXT): $(test_categ_Pf_OBJECTS) $(test_categ_Pf_DEPENDENCIES) $(EXTRA_test_categ_Pf_DEPENDENCIES) 
 	@rm -f test-categ_Pf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Pf_OBJECTS) $(test_categ_Pf_LDADD) $(LIBS)
 unictype/test-categ_Pi.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Pi$(EXEEXT): $(test_categ_Pi_OBJECTS) $(test_categ_Pi_DEPENDENCIES) 
+
+test-categ_Pi$(EXEEXT): $(test_categ_Pi_OBJECTS) $(test_categ_Pi_DEPENDENCIES) $(EXTRA_test_categ_Pi_DEPENDENCIES) 
 	@rm -f test-categ_Pi$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Pi_OBJECTS) $(test_categ_Pi_LDADD) $(LIBS)
 unictype/test-categ_Po.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Po$(EXEEXT): $(test_categ_Po_OBJECTS) $(test_categ_Po_DEPENDENCIES) 
+
+test-categ_Po$(EXEEXT): $(test_categ_Po_OBJECTS) $(test_categ_Po_DEPENDENCIES) $(EXTRA_test_categ_Po_DEPENDENCIES) 
 	@rm -f test-categ_Po$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Po_OBJECTS) $(test_categ_Po_LDADD) $(LIBS)
 unictype/test-categ_Ps.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Ps$(EXEEXT): $(test_categ_Ps_OBJECTS) $(test_categ_Ps_DEPENDENCIES) 
+
+test-categ_Ps$(EXEEXT): $(test_categ_Ps_OBJECTS) $(test_categ_Ps_DEPENDENCIES) $(EXTRA_test_categ_Ps_DEPENDENCIES) 
 	@rm -f test-categ_Ps$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Ps_OBJECTS) $(test_categ_Ps_LDADD) $(LIBS)
 unictype/test-categ_S.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_S$(EXEEXT): $(test_categ_S_OBJECTS) $(test_categ_S_DEPENDENCIES) 
+
+test-categ_S$(EXEEXT): $(test_categ_S_OBJECTS) $(test_categ_S_DEPENDENCIES) $(EXTRA_test_categ_S_DEPENDENCIES) 
 	@rm -f test-categ_S$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_S_OBJECTS) $(test_categ_S_LDADD) $(LIBS)
 unictype/test-categ_Sc.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Sc$(EXEEXT): $(test_categ_Sc_OBJECTS) $(test_categ_Sc_DEPENDENCIES) 
+
+test-categ_Sc$(EXEEXT): $(test_categ_Sc_OBJECTS) $(test_categ_Sc_DEPENDENCIES) $(EXTRA_test_categ_Sc_DEPENDENCIES) 
 	@rm -f test-categ_Sc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Sc_OBJECTS) $(test_categ_Sc_LDADD) $(LIBS)
 unictype/test-categ_Sk.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Sk$(EXEEXT): $(test_categ_Sk_OBJECTS) $(test_categ_Sk_DEPENDENCIES) 
+
+test-categ_Sk$(EXEEXT): $(test_categ_Sk_OBJECTS) $(test_categ_Sk_DEPENDENCIES) $(EXTRA_test_categ_Sk_DEPENDENCIES) 
 	@rm -f test-categ_Sk$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Sk_OBJECTS) $(test_categ_Sk_LDADD) $(LIBS)
 unictype/test-categ_Sm.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Sm$(EXEEXT): $(test_categ_Sm_OBJECTS) $(test_categ_Sm_DEPENDENCIES) 
+
+test-categ_Sm$(EXEEXT): $(test_categ_Sm_OBJECTS) $(test_categ_Sm_DEPENDENCIES) $(EXTRA_test_categ_Sm_DEPENDENCIES) 
 	@rm -f test-categ_Sm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Sm_OBJECTS) $(test_categ_Sm_LDADD) $(LIBS)
 unictype/test-categ_So.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_So$(EXEEXT): $(test_categ_So_OBJECTS) $(test_categ_So_DEPENDENCIES) 
+
+test-categ_So$(EXEEXT): $(test_categ_So_OBJECTS) $(test_categ_So_DEPENDENCIES) $(EXTRA_test_categ_So_DEPENDENCIES) 
 	@rm -f test-categ_So$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_So_OBJECTS) $(test_categ_So_LDADD) $(LIBS)
 unictype/test-categ_Z.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Z$(EXEEXT): $(test_categ_Z_OBJECTS) $(test_categ_Z_DEPENDENCIES) 
+
+test-categ_Z$(EXEEXT): $(test_categ_Z_OBJECTS) $(test_categ_Z_DEPENDENCIES) $(EXTRA_test_categ_Z_DEPENDENCIES) 
 	@rm -f test-categ_Z$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Z_OBJECTS) $(test_categ_Z_LDADD) $(LIBS)
 unictype/test-categ_Zl.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Zl$(EXEEXT): $(test_categ_Zl_OBJECTS) $(test_categ_Zl_DEPENDENCIES) 
+
+test-categ_Zl$(EXEEXT): $(test_categ_Zl_OBJECTS) $(test_categ_Zl_DEPENDENCIES) $(EXTRA_test_categ_Zl_DEPENDENCIES) 
 	@rm -f test-categ_Zl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Zl_OBJECTS) $(test_categ_Zl_LDADD) $(LIBS)
 unictype/test-categ_Zp.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Zp$(EXEEXT): $(test_categ_Zp_OBJECTS) $(test_categ_Zp_DEPENDENCIES) 
+
+test-categ_Zp$(EXEEXT): $(test_categ_Zp_OBJECTS) $(test_categ_Zp_DEPENDENCIES) $(EXTRA_test_categ_Zp_DEPENDENCIES) 
 	@rm -f test-categ_Zp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Zp_OBJECTS) $(test_categ_Zp_LDADD) $(LIBS)
 unictype/test-categ_Zs.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_Zs$(EXEEXT): $(test_categ_Zs_OBJECTS) $(test_categ_Zs_DEPENDENCIES) 
+
+test-categ_Zs$(EXEEXT): $(test_categ_Zs_OBJECTS) $(test_categ_Zs_DEPENDENCIES) $(EXTRA_test_categ_Zs_DEPENDENCIES) 
 	@rm -f test-categ_Zs$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_Zs_OBJECTS) $(test_categ_Zs_LDADD) $(LIBS)
 unictype/test-categ_and.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_and$(EXEEXT): $(test_categ_and_OBJECTS) $(test_categ_and_DEPENDENCIES) 
+
+test-categ_and$(EXEEXT): $(test_categ_and_OBJECTS) $(test_categ_and_DEPENDENCIES) $(EXTRA_test_categ_and_DEPENDENCIES) 
 	@rm -f test-categ_and$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_and_OBJECTS) $(test_categ_and_LDADD) $(LIBS)
 unictype/test-categ_and_not.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_and_not$(EXEEXT): $(test_categ_and_not_OBJECTS) $(test_categ_and_not_DEPENDENCIES) 
+
+test-categ_and_not$(EXEEXT): $(test_categ_and_not_OBJECTS) $(test_categ_and_not_DEPENDENCIES) $(EXTRA_test_categ_and_not_DEPENDENCIES) 
 	@rm -f test-categ_and_not$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_and_not_OBJECTS) $(test_categ_and_not_LDADD) $(LIBS)
 unictype/test-categ_byname.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_byname$(EXEEXT): $(test_categ_byname_OBJECTS) $(test_categ_byname_DEPENDENCIES) 
+
+test-categ_byname$(EXEEXT): $(test_categ_byname_OBJECTS) $(test_categ_byname_DEPENDENCIES) $(EXTRA_test_categ_byname_DEPENDENCIES) 
 	@rm -f test-categ_byname$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_byname_OBJECTS) $(test_categ_byname_LDADD) $(LIBS)
+unictype/test-categ_longname.$(OBJEXT): unictype/$(am__dirstamp) \
+	unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-categ_longname$(EXEEXT): $(test_categ_longname_OBJECTS) $(test_categ_longname_DEPENDENCIES) $(EXTRA_test_categ_longname_DEPENDENCIES) 
+	@rm -f test-categ_longname$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_categ_longname_OBJECTS) $(test_categ_longname_LDADD) $(LIBS)
 unictype/test-categ_name.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_name$(EXEEXT): $(test_categ_name_OBJECTS) $(test_categ_name_DEPENDENCIES) 
+
+test-categ_name$(EXEEXT): $(test_categ_name_OBJECTS) $(test_categ_name_DEPENDENCIES) $(EXTRA_test_categ_name_DEPENDENCIES) 
 	@rm -f test-categ_name$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_name_OBJECTS) $(test_categ_name_LDADD) $(LIBS)
 unictype/test-categ_none.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_none$(EXEEXT): $(test_categ_none_OBJECTS) $(test_categ_none_DEPENDENCIES) 
+
+test-categ_none$(EXEEXT): $(test_categ_none_OBJECTS) $(test_categ_none_DEPENDENCIES) $(EXTRA_test_categ_none_DEPENDENCIES) 
 	@rm -f test-categ_none$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_none_OBJECTS) $(test_categ_none_LDADD) $(LIBS)
 unictype/test-categ_of.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_of$(EXEEXT): $(test_categ_of_OBJECTS) $(test_categ_of_DEPENDENCIES) 
+
+test-categ_of$(EXEEXT): $(test_categ_of_OBJECTS) $(test_categ_of_DEPENDENCIES) $(EXTRA_test_categ_of_DEPENDENCIES) 
 	@rm -f test-categ_of$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_of_OBJECTS) $(test_categ_of_LDADD) $(LIBS)
 unictype/test-categ_or.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_or$(EXEEXT): $(test_categ_or_OBJECTS) $(test_categ_or_DEPENDENCIES) 
+
+test-categ_or$(EXEEXT): $(test_categ_or_OBJECTS) $(test_categ_or_DEPENDENCIES) $(EXTRA_test_categ_or_DEPENDENCIES) 
 	@rm -f test-categ_or$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_or_OBJECTS) $(test_categ_or_LDADD) $(LIBS)
 unictype/test-categ_test_withtable.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-categ_test_withtable$(EXEEXT): $(test_categ_test_withtable_OBJECTS) $(test_categ_test_withtable_DEPENDENCIES) 
+
+test-categ_test_withtable$(EXEEXT): $(test_categ_test_withtable_OBJECTS) $(test_categ_test_withtable_DEPENDENCIES) $(EXTRA_test_categ_test_withtable_DEPENDENCIES) 
 	@rm -f test-categ_test_withtable$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_categ_test_withtable_OBJECTS) $(test_categ_test_withtable_LDADD) $(LIBS)
-unictype/test-combining.$(OBJEXT): unictype/$(am__dirstamp) \
+unictype/test-combiningclass.$(OBJEXT): unictype/$(am__dirstamp) \
+	unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-combiningclass$(EXEEXT): $(test_combiningclass_OBJECTS) $(test_combiningclass_DEPENDENCIES) $(EXTRA_test_combiningclass_DEPENDENCIES) 
+	@rm -f test-combiningclass$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_combiningclass_OBJECTS) $(test_combiningclass_LDADD) $(LIBS)
+unictype/test-combiningclass_byname.$(OBJEXT):  \
+	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-combiningclass_byname$(EXEEXT): $(test_combiningclass_byname_OBJECTS) $(test_combiningclass_byname_DEPENDENCIES) $(EXTRA_test_combiningclass_byname_DEPENDENCIES) 
+	@rm -f test-combiningclass_byname$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_combiningclass_byname_OBJECTS) $(test_combiningclass_byname_LDADD) $(LIBS)
+unictype/test-combiningclass_longname.$(OBJEXT):  \
+	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-combiningclass_longname$(EXEEXT): $(test_combiningclass_longname_OBJECTS) $(test_combiningclass_longname_DEPENDENCIES) $(EXTRA_test_combiningclass_longname_DEPENDENCIES) 
+	@rm -f test-combiningclass_longname$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_combiningclass_longname_OBJECTS) $(test_combiningclass_longname_LDADD) $(LIBS)
+unictype/test-combiningclass_name.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-combining$(EXEEXT): $(test_combining_OBJECTS) $(test_combining_DEPENDENCIES) 
-	@rm -f test-combining$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_combining_OBJECTS) $(test_combining_LDADD) $(LIBS)
+
+test-combiningclass_name$(EXEEXT): $(test_combiningclass_name_OBJECTS) $(test_combiningclass_name_DEPENDENCIES) $(EXTRA_test_combiningclass_name_DEPENDENCIES) 
+	@rm -f test-combiningclass_name$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_combiningclass_name_OBJECTS) $(test_combiningclass_name_LDADD) $(LIBS)
 uninorm/test-compat-decomposition.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-compat-decomposition$(EXEEXT): $(test_compat_decomposition_OBJECTS) $(test_compat_decomposition_DEPENDENCIES) 
+
+test-compat-decomposition$(EXEEXT): $(test_compat_decomposition_OBJECTS) $(test_compat_decomposition_DEPENDENCIES) $(EXTRA_test_compat_decomposition_DEPENDENCIES) 
 	@rm -f test-compat-decomposition$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_compat_decomposition_OBJECTS) $(test_compat_decomposition_LDADD) $(LIBS)
 uninorm/test-composition.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-composition$(EXEEXT): $(test_composition_OBJECTS) $(test_composition_DEPENDENCIES) 
+
+test-composition$(EXEEXT): $(test_composition_OBJECTS) $(test_composition_DEPENDENCIES) $(EXTRA_test_composition_DEPENDENCIES) 
 	@rm -f test-composition$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_composition_OBJECTS) $(test_composition_LDADD) $(LIBS)
 unictype/test-ctype_alnum.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-ctype_alnum$(EXEEXT): $(test_ctype_alnum_OBJECTS) $(test_ctype_alnum_DEPENDENCIES) 
+
+test-ctype_alnum$(EXEEXT): $(test_ctype_alnum_OBJECTS) $(test_ctype_alnum_DEPENDENCIES) $(EXTRA_test_ctype_alnum_DEPENDENCIES) 
 	@rm -f test-ctype_alnum$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ctype_alnum_OBJECTS) $(test_ctype_alnum_LDADD) $(LIBS)
 unictype/test-ctype_alpha.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-ctype_alpha$(EXEEXT): $(test_ctype_alpha_OBJECTS) $(test_ctype_alpha_DEPENDENCIES) 
+
+test-ctype_alpha$(EXEEXT): $(test_ctype_alpha_OBJECTS) $(test_ctype_alpha_DEPENDENCIES) $(EXTRA_test_ctype_alpha_DEPENDENCIES) 
 	@rm -f test-ctype_alpha$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ctype_alpha_OBJECTS) $(test_ctype_alpha_LDADD) $(LIBS)
 unictype/test-ctype_blank.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-ctype_blank$(EXEEXT): $(test_ctype_blank_OBJECTS) $(test_ctype_blank_DEPENDENCIES) 
+
+test-ctype_blank$(EXEEXT): $(test_ctype_blank_OBJECTS) $(test_ctype_blank_DEPENDENCIES) $(EXTRA_test_ctype_blank_DEPENDENCIES) 
 	@rm -f test-ctype_blank$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ctype_blank_OBJECTS) $(test_ctype_blank_LDADD) $(LIBS)
 unictype/test-ctype_cntrl.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-ctype_cntrl$(EXEEXT): $(test_ctype_cntrl_OBJECTS) $(test_ctype_cntrl_DEPENDENCIES) 
+
+test-ctype_cntrl$(EXEEXT): $(test_ctype_cntrl_OBJECTS) $(test_ctype_cntrl_DEPENDENCIES) $(EXTRA_test_ctype_cntrl_DEPENDENCIES) 
 	@rm -f test-ctype_cntrl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ctype_cntrl_OBJECTS) $(test_ctype_cntrl_LDADD) $(LIBS)
 unictype/test-ctype_digit.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-ctype_digit$(EXEEXT): $(test_ctype_digit_OBJECTS) $(test_ctype_digit_DEPENDENCIES) 
+
+test-ctype_digit$(EXEEXT): $(test_ctype_digit_OBJECTS) $(test_ctype_digit_DEPENDENCIES) $(EXTRA_test_ctype_digit_DEPENDENCIES) 
 	@rm -f test-ctype_digit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ctype_digit_OBJECTS) $(test_ctype_digit_LDADD) $(LIBS)
 unictype/test-ctype_graph.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-ctype_graph$(EXEEXT): $(test_ctype_graph_OBJECTS) $(test_ctype_graph_DEPENDENCIES) 
+
+test-ctype_graph$(EXEEXT): $(test_ctype_graph_OBJECTS) $(test_ctype_graph_DEPENDENCIES) $(EXTRA_test_ctype_graph_DEPENDENCIES) 
 	@rm -f test-ctype_graph$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ctype_graph_OBJECTS) $(test_ctype_graph_LDADD) $(LIBS)
 unictype/test-ctype_lower.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-ctype_lower$(EXEEXT): $(test_ctype_lower_OBJECTS) $(test_ctype_lower_DEPENDENCIES) 
+
+test-ctype_lower$(EXEEXT): $(test_ctype_lower_OBJECTS) $(test_ctype_lower_DEPENDENCIES) $(EXTRA_test_ctype_lower_DEPENDENCIES) 
 	@rm -f test-ctype_lower$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ctype_lower_OBJECTS) $(test_ctype_lower_LDADD) $(LIBS)
 unictype/test-ctype_print.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-ctype_print$(EXEEXT): $(test_ctype_print_OBJECTS) $(test_ctype_print_DEPENDENCIES) 
+
+test-ctype_print$(EXEEXT): $(test_ctype_print_OBJECTS) $(test_ctype_print_DEPENDENCIES) $(EXTRA_test_ctype_print_DEPENDENCIES) 
 	@rm -f test-ctype_print$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ctype_print_OBJECTS) $(test_ctype_print_LDADD) $(LIBS)
 unictype/test-ctype_punct.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-ctype_punct$(EXEEXT): $(test_ctype_punct_OBJECTS) $(test_ctype_punct_DEPENDENCIES) 
+
+test-ctype_punct$(EXEEXT): $(test_ctype_punct_OBJECTS) $(test_ctype_punct_DEPENDENCIES) $(EXTRA_test_ctype_punct_DEPENDENCIES) 
 	@rm -f test-ctype_punct$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ctype_punct_OBJECTS) $(test_ctype_punct_LDADD) $(LIBS)
 unictype/test-ctype_space.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-ctype_space$(EXEEXT): $(test_ctype_space_OBJECTS) $(test_ctype_space_DEPENDENCIES) 
+
+test-ctype_space$(EXEEXT): $(test_ctype_space_OBJECTS) $(test_ctype_space_DEPENDENCIES) $(EXTRA_test_ctype_space_DEPENDENCIES) 
 	@rm -f test-ctype_space$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ctype_space_OBJECTS) $(test_ctype_space_LDADD) $(LIBS)
 unictype/test-ctype_upper.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-ctype_upper$(EXEEXT): $(test_ctype_upper_OBJECTS) $(test_ctype_upper_DEPENDENCIES) 
+
+test-ctype_upper$(EXEEXT): $(test_ctype_upper_OBJECTS) $(test_ctype_upper_DEPENDENCIES) $(EXTRA_test_ctype_upper_DEPENDENCIES) 
 	@rm -f test-ctype_upper$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ctype_upper_OBJECTS) $(test_ctype_upper_LDADD) $(LIBS)
 unictype/test-ctype_xdigit.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-ctype_xdigit$(EXEEXT): $(test_ctype_xdigit_OBJECTS) $(test_ctype_xdigit_DEPENDENCIES) 
+
+test-ctype_xdigit$(EXEEXT): $(test_ctype_xdigit_OBJECTS) $(test_ctype_xdigit_DEPENDENCIES) $(EXTRA_test_ctype_xdigit_DEPENDENCIES) 
 	@rm -f test-ctype_xdigit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ctype_xdigit_OBJECTS) $(test_ctype_xdigit_LDADD) $(LIBS)
 unictype/test-decdigit.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-decdigit$(EXEEXT): $(test_decdigit_OBJECTS) $(test_decdigit_DEPENDENCIES) 
+
+test-decdigit$(EXEEXT): $(test_decdigit_OBJECTS) $(test_decdigit_DEPENDENCIES) $(EXTRA_test_decdigit_DEPENDENCIES) 
 	@rm -f test-decdigit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_decdigit_OBJECTS) $(test_decdigit_LDADD) $(LIBS)
 uninorm/test-decomposing-form.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-decomposing-form$(EXEEXT): $(test_decomposing_form_OBJECTS) $(test_decomposing_form_DEPENDENCIES) 
+
+test-decomposing-form$(EXEEXT): $(test_decomposing_form_OBJECTS) $(test_decomposing_form_DEPENDENCIES) $(EXTRA_test_decomposing_form_DEPENDENCIES) 
 	@rm -f test-decomposing-form$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_decomposing_form_OBJECTS) $(test_decomposing_form_LDADD) $(LIBS)
 uninorm/test-decomposition.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-decomposition$(EXEEXT): $(test_decomposition_OBJECTS) $(test_decomposition_DEPENDENCIES) 
+
+test-decomposition$(EXEEXT): $(test_decomposition_OBJECTS) $(test_decomposition_DEPENDENCIES) $(EXTRA_test_decomposition_DEPENDENCIES) 
 	@rm -f test-decomposition$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_decomposition_OBJECTS) $(test_decomposition_LDADD) $(LIBS)
 unictype/test-digit.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-digit$(EXEEXT): $(test_digit_OBJECTS) $(test_digit_DEPENDENCIES) 
+
+test-digit$(EXEEXT): $(test_digit_OBJECTS) $(test_digit_DEPENDENCIES) $(EXTRA_test_digit_DEPENDENCIES) 
 	@rm -f test-digit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_digit_OBJECTS) $(test_digit_LDADD) $(LIBS)
-test-environ$(EXEEXT): $(test_environ_OBJECTS) $(test_environ_DEPENDENCIES) 
+
+test-environ$(EXEEXT): $(test_environ_OBJECTS) $(test_environ_DEPENDENCIES) $(EXTRA_test_environ_DEPENDENCIES) 
 	@rm -f test-environ$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_environ_OBJECTS) $(test_environ_LDADD) $(LIBS)
-test-errno$(EXEEXT): $(test_errno_OBJECTS) $(test_errno_DEPENDENCIES) 
+
+test-errno$(EXEEXT): $(test_errno_OBJECTS) $(test_errno_DEPENDENCIES) $(EXTRA_test_errno_DEPENDENCIES) 
 	@rm -f test-errno$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_errno_OBJECTS) $(test_errno_LDADD) $(LIBS)
-test-frexpl-nolibm$(EXEEXT): $(test_frexpl_nolibm_OBJECTS) $(test_frexpl_nolibm_DEPENDENCIES) 
+
+test-fdopen$(EXEEXT): $(test_fdopen_OBJECTS) $(test_fdopen_DEPENDENCIES) $(EXTRA_test_fdopen_DEPENDENCIES) 
+	@rm -f test-fdopen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_fdopen_OBJECTS) $(test_fdopen_LDADD) $(LIBS)
+
+test-fgetc$(EXEEXT): $(test_fgetc_OBJECTS) $(test_fgetc_DEPENDENCIES) $(EXTRA_test_fgetc_DEPENDENCIES) 
+	@rm -f test-fgetc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_fgetc_OBJECTS) $(test_fgetc_LDADD) $(LIBS)
+
+test-float$(EXEEXT): $(test_float_OBJECTS) $(test_float_DEPENDENCIES) $(EXTRA_test_float_DEPENDENCIES) 
+	@rm -f test-float$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_float_OBJECTS) $(test_float_LDADD) $(LIBS)
+
+test-fputc$(EXEEXT): $(test_fputc_OBJECTS) $(test_fputc_DEPENDENCIES) $(EXTRA_test_fputc_DEPENDENCIES) 
+	@rm -f test-fputc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_fputc_OBJECTS) $(test_fputc_LDADD) $(LIBS)
+
+test-fread$(EXEEXT): $(test_fread_OBJECTS) $(test_fread_DEPENDENCIES) $(EXTRA_test_fread_DEPENDENCIES) 
+	@rm -f test-fread$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_fread_OBJECTS) $(test_fread_LDADD) $(LIBS)
+
+test-frexp-nolibm$(EXEEXT): $(test_frexp_nolibm_OBJECTS) $(test_frexp_nolibm_DEPENDENCIES) $(EXTRA_test_frexp_nolibm_DEPENDENCIES) 
+	@rm -f test-frexp-nolibm$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_frexp_nolibm_OBJECTS) $(test_frexp_nolibm_LDADD) $(LIBS)
+
+test-frexpl-nolibm$(EXEEXT): $(test_frexpl_nolibm_OBJECTS) $(test_frexpl_nolibm_DEPENDENCIES) $(EXTRA_test_frexpl_nolibm_DEPENDENCIES) 
 	@rm -f test-frexpl-nolibm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_frexpl_nolibm_OBJECTS) $(test_frexpl_nolibm_LDADD) $(LIBS)
-test-fseterr$(EXEEXT): $(test_fseterr_OBJECTS) $(test_fseterr_DEPENDENCIES) 
+
+test-fseterr$(EXEEXT): $(test_fseterr_OBJECTS) $(test_fseterr_DEPENDENCIES) $(EXTRA_test_fseterr_DEPENDENCIES) 
 	@rm -f test-fseterr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_fseterr_OBJECTS) $(test_fseterr_LDADD) $(LIBS)
-test-iconv$(EXEEXT): $(test_iconv_OBJECTS) $(test_iconv_DEPENDENCIES) 
+
+test-fwrite$(EXEEXT): $(test_fwrite_OBJECTS) $(test_fwrite_DEPENDENCIES) $(EXTRA_test_fwrite_DEPENDENCIES) 
+	@rm -f test-fwrite$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_fwrite_OBJECTS) $(test_fwrite_LDADD) $(LIBS)
+
+test-iconv$(EXEEXT): $(test_iconv_OBJECTS) $(test_iconv_DEPENDENCIES) $(EXTRA_test_iconv_DEPENDENCIES) 
 	@rm -f test-iconv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_iconv_OBJECTS) $(test_iconv_LDADD) $(LIBS)
-test-iconv-h$(EXEEXT): $(test_iconv_h_OBJECTS) $(test_iconv_h_DEPENDENCIES) 
+
+test-iconv-h$(EXEEXT): $(test_iconv_h_OBJECTS) $(test_iconv_h_DEPENDENCIES) $(EXTRA_test_iconv_h_DEPENDENCIES) 
 	@rm -f test-iconv-h$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_iconv_h_OBJECTS) $(test_iconv_h_LDADD) $(LIBS)
 unicase/test-ignorable.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-ignorable$(EXEEXT): $(test_ignorable_OBJECTS) $(test_ignorable_DEPENDENCIES) 
+
+test-ignorable$(EXEEXT): $(test_ignorable_OBJECTS) $(test_ignorable_DEPENDENCIES) $(EXTRA_test_ignorable_DEPENDENCIES) 
 	@rm -f test-ignorable$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ignorable_OBJECTS) $(test_ignorable_LDADD) $(LIBS)
-test-isnand-nolibm$(EXEEXT): $(test_isnand_nolibm_OBJECTS) $(test_isnand_nolibm_DEPENDENCIES) 
+
+test-intprops$(EXEEXT): $(test_intprops_OBJECTS) $(test_intprops_DEPENDENCIES) $(EXTRA_test_intprops_DEPENDENCIES) 
+	@rm -f test-intprops$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_intprops_OBJECTS) $(test_intprops_LDADD) $(LIBS)
+
+test-inttypes$(EXEEXT): $(test_inttypes_OBJECTS) $(test_inttypes_DEPENDENCIES) $(EXTRA_test_inttypes_DEPENDENCIES) 
+	@rm -f test-inttypes$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_inttypes_OBJECTS) $(test_inttypes_LDADD) $(LIBS)
+
+test-isnand-nolibm$(EXEEXT): $(test_isnand_nolibm_OBJECTS) $(test_isnand_nolibm_DEPENDENCIES) $(EXTRA_test_isnand_nolibm_DEPENDENCIES) 
 	@rm -f test-isnand-nolibm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_isnand_nolibm_OBJECTS) $(test_isnand_nolibm_LDADD) $(LIBS)
-test-isnanf-nolibm$(EXEEXT): $(test_isnanf_nolibm_OBJECTS) $(test_isnanf_nolibm_DEPENDENCIES) 
+
+test-isnanf-nolibm$(EXEEXT): $(test_isnanf_nolibm_OBJECTS) $(test_isnanf_nolibm_DEPENDENCIES) $(EXTRA_test_isnanf_nolibm_DEPENDENCIES) 
 	@rm -f test-isnanf-nolibm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_isnanf_nolibm_OBJECTS) $(test_isnanf_nolibm_LDADD) $(LIBS)
-test-isnanl-nolibm$(EXEEXT): $(test_isnanl_nolibm_OBJECTS) $(test_isnanl_nolibm_DEPENDENCIES) 
+
+test-isnanl-nolibm$(EXEEXT): $(test_isnanl_nolibm_OBJECTS) $(test_isnanl_nolibm_DEPENDENCIES) $(EXTRA_test_isnanl_nolibm_DEPENDENCIES) 
 	@rm -f test-isnanl-nolibm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_isnanl_nolibm_OBJECTS) $(test_isnanl_nolibm_LDADD) $(LIBS)
-test-locale$(EXEEXT): $(test_locale_OBJECTS) $(test_locale_DEPENDENCIES) 
+
+test-iswblank$(EXEEXT): $(test_iswblank_OBJECTS) $(test_iswblank_DEPENDENCIES) $(EXTRA_test_iswblank_DEPENDENCIES) 
+	@rm -f test-iswblank$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_iswblank_OBJECTS) $(test_iswblank_LDADD) $(LIBS)
+unictype/test-joininggroup_byname.$(OBJEXT): unictype/$(am__dirstamp) \
+	unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-joininggroup_byname$(EXEEXT): $(test_joininggroup_byname_OBJECTS) $(test_joininggroup_byname_DEPENDENCIES) $(EXTRA_test_joininggroup_byname_DEPENDENCIES) 
+	@rm -f test-joininggroup_byname$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_joininggroup_byname_OBJECTS) $(test_joininggroup_byname_LDADD) $(LIBS)
+unictype/test-joininggroup_name.$(OBJEXT): unictype/$(am__dirstamp) \
+	unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-joininggroup_name$(EXEEXT): $(test_joininggroup_name_OBJECTS) $(test_joininggroup_name_DEPENDENCIES) $(EXTRA_test_joininggroup_name_DEPENDENCIES) 
+	@rm -f test-joininggroup_name$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_joininggroup_name_OBJECTS) $(test_joininggroup_name_LDADD) $(LIBS)
+unictype/test-joininggroup_of.$(OBJEXT): unictype/$(am__dirstamp) \
+	unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-joininggroup_of$(EXEEXT): $(test_joininggroup_of_OBJECTS) $(test_joininggroup_of_DEPENDENCIES) $(EXTRA_test_joininggroup_of_DEPENDENCIES) 
+	@rm -f test-joininggroup_of$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_joininggroup_of_OBJECTS) $(test_joininggroup_of_LDADD) $(LIBS)
+unictype/test-joiningtype_byname.$(OBJEXT): unictype/$(am__dirstamp) \
+	unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-joiningtype_byname$(EXEEXT): $(test_joiningtype_byname_OBJECTS) $(test_joiningtype_byname_DEPENDENCIES) $(EXTRA_test_joiningtype_byname_DEPENDENCIES) 
+	@rm -f test-joiningtype_byname$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_joiningtype_byname_OBJECTS) $(test_joiningtype_byname_LDADD) $(LIBS)
+unictype/test-joiningtype_longname.$(OBJEXT):  \
+	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-joiningtype_longname$(EXEEXT): $(test_joiningtype_longname_OBJECTS) $(test_joiningtype_longname_DEPENDENCIES) $(EXTRA_test_joiningtype_longname_DEPENDENCIES) 
+	@rm -f test-joiningtype_longname$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_joiningtype_longname_OBJECTS) $(test_joiningtype_longname_LDADD) $(LIBS)
+unictype/test-joiningtype_name.$(OBJEXT): unictype/$(am__dirstamp) \
+	unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-joiningtype_name$(EXEEXT): $(test_joiningtype_name_OBJECTS) $(test_joiningtype_name_DEPENDENCIES) $(EXTRA_test_joiningtype_name_DEPENDENCIES) 
+	@rm -f test-joiningtype_name$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_joiningtype_name_OBJECTS) $(test_joiningtype_name_LDADD) $(LIBS)
+unictype/test-joiningtype_of.$(OBJEXT): unictype/$(am__dirstamp) \
+	unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-joiningtype_of$(EXEEXT): $(test_joiningtype_of_OBJECTS) $(test_joiningtype_of_DEPENDENCIES) $(EXTRA_test_joiningtype_of_DEPENDENCIES) 
+	@rm -f test-joiningtype_of$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_joiningtype_of_OBJECTS) $(test_joiningtype_of_LDADD) $(LIBS)
+
+test-langinfo$(EXEEXT): $(test_langinfo_OBJECTS) $(test_langinfo_DEPENDENCIES) $(EXTRA_test_langinfo_DEPENDENCIES) 
+	@rm -f test-langinfo$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_langinfo_OBJECTS) $(test_langinfo_LDADD) $(LIBS)
+
+test-locale$(EXEEXT): $(test_locale_OBJECTS) $(test_locale_DEPENDENCIES) $(EXTRA_test_locale_DEPENDENCIES) 
 	@rm -f test-locale$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_locale_OBJECTS) $(test_locale_LDADD) $(LIBS)
 unicase/test-locale-language.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-locale-language$(EXEEXT): $(test_locale_language_OBJECTS) $(test_locale_language_DEPENDENCIES) 
+
+test-locale-language$(EXEEXT): $(test_locale_language_OBJECTS) $(test_locale_language_DEPENDENCIES) $(EXTRA_test_locale_language_DEPENDENCIES) 
 	@rm -f test-locale-language$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_locale_language_OBJECTS) $(test_locale_language_LDADD) $(LIBS)
-test-localename$(EXEEXT): $(test_localename_OBJECTS) $(test_localename_DEPENDENCIES) 
+
+test-localename$(EXEEXT): $(test_localename_OBJECTS) $(test_localename_DEPENDENCIES) $(EXTRA_test_localename_DEPENDENCIES) 
 	@rm -f test-localename$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_localename_OBJECTS) $(test_localename_LDADD) $(LIBS)
-test-lock$(EXEEXT): $(test_lock_OBJECTS) $(test_lock_DEPENDENCIES) 
+
+test-lock$(EXEEXT): $(test_lock_OBJECTS) $(test_lock_DEPENDENCIES) $(EXTRA_test_lock_DEPENDENCIES) 
 	@rm -f test-lock$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_lock_OBJECTS) $(test_lock_LDADD) $(LIBS)
-test-malloca$(EXEEXT): $(test_malloca_OBJECTS) $(test_malloca_DEPENDENCIES) 
+
+test-malloca$(EXEEXT): $(test_malloca_OBJECTS) $(test_malloca_DEPENDENCIES) $(EXTRA_test_malloca_DEPENDENCIES) 
 	@rm -f test-malloca$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_malloca_OBJECTS) $(test_malloca_LDADD) $(LIBS)
-test-math$(EXEEXT): $(test_math_OBJECTS) $(test_math_DEPENDENCIES) 
+
+test-math$(EXEEXT): $(test_math_OBJECTS) $(test_math_DEPENDENCIES) $(EXTRA_test_math_DEPENDENCIES) 
 	@rm -f test-math$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_math_OBJECTS) $(test_math_LDADD) $(LIBS)
-test-mbrtowc$(EXEEXT): $(test_mbrtowc_OBJECTS) $(test_mbrtowc_DEPENDENCIES) 
+
+test-mbrtowc$(EXEEXT): $(test_mbrtowc_OBJECTS) $(test_mbrtowc_DEPENDENCIES) $(EXTRA_test_mbrtowc_DEPENDENCIES) 
 	@rm -f test-mbrtowc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbrtowc_OBJECTS) $(test_mbrtowc_LDADD) $(LIBS)
-test-mbsinit$(EXEEXT): $(test_mbsinit_OBJECTS) $(test_mbsinit_DEPENDENCIES) 
+
+test-mbrtowc-w32$(EXEEXT): $(test_mbrtowc_w32_OBJECTS) $(test_mbrtowc_w32_DEPENDENCIES) $(EXTRA_test_mbrtowc_w32_DEPENDENCIES) 
+	@rm -f test-mbrtowc-w32$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_mbrtowc_w32_OBJECTS) $(test_mbrtowc_w32_LDADD) $(LIBS)
+
+test-mbsinit$(EXEEXT): $(test_mbsinit_OBJECTS) $(test_mbsinit_DEPENDENCIES) $(EXTRA_test_mbsinit_DEPENDENCIES) 
 	@rm -f test-mbsinit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mbsinit_OBJECTS) $(test_mbsinit_LDADD) $(LIBS)
-test-memchr$(EXEEXT): $(test_memchr_OBJECTS) $(test_memchr_DEPENDENCIES) 
+
+test-memchr$(EXEEXT): $(test_memchr_OBJECTS) $(test_memchr_DEPENDENCIES) $(EXTRA_test_memchr_DEPENDENCIES) 
 	@rm -f test-memchr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_memchr_OBJECTS) $(test_memchr_LDADD) $(LIBS)
 unictype/test-mirror.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-mirror$(EXEEXT): $(test_mirror_OBJECTS) $(test_mirror_DEPENDENCIES) 
+
+test-mirror$(EXEEXT): $(test_mirror_OBJECTS) $(test_mirror_DEPENDENCIES) $(EXTRA_test_mirror_DEPENDENCIES) 
 	@rm -f test-mirror$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_mirror_OBJECTS) $(test_mirror_LDADD) $(LIBS)
 uninorm/test-nfc.$(OBJEXT): uninorm/$(am__dirstamp) \
@@ -5597,7 +6950,8 @@ uninorm/test-u16-nfc.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
 uninorm/test-u32-nfc.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-nfc$(EXEEXT): $(test_nfc_OBJECTS) $(test_nfc_DEPENDENCIES) 
+
+test-nfc$(EXEEXT): $(test_nfc_OBJECTS) $(test_nfc_DEPENDENCIES) $(EXTRA_test_nfc_DEPENDENCIES) 
 	@rm -f test-nfc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_nfc_OBJECTS) $(test_nfc_LDADD) $(LIBS)
 uninorm/test-nfd.$(OBJEXT): uninorm/$(am__dirstamp) \
@@ -5608,7 +6962,8 @@ uninorm/test-u16-nfd.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
 uninorm/test-u32-nfd.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-nfd$(EXEEXT): $(test_nfd_OBJECTS) $(test_nfd_DEPENDENCIES) 
+
+test-nfd$(EXEEXT): $(test_nfd_OBJECTS) $(test_nfd_DEPENDENCIES) $(EXTRA_test_nfd_DEPENDENCIES) 
 	@rm -f test-nfd$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_nfd_OBJECTS) $(test_nfd_LDADD) $(LIBS)
 uninorm/test-nfkc.$(OBJEXT): uninorm/$(am__dirstamp) \
@@ -5619,7 +6974,8 @@ uninorm/test-u16-nfkc.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
 uninorm/test-u32-nfkc.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-nfkc$(EXEEXT): $(test_nfkc_OBJECTS) $(test_nfkc_DEPENDENCIES) 
+
+test-nfkc$(EXEEXT): $(test_nfkc_OBJECTS) $(test_nfkc_DEPENDENCIES) $(EXTRA_test_nfkc_DEPENDENCIES) 
 	@rm -f test-nfkc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_nfkc_OBJECTS) $(test_nfkc_LDADD) $(LIBS)
 uninorm/test-nfkd.$(OBJEXT): uninorm/$(am__dirstamp) \
@@ -5630,483 +6986,658 @@ uninorm/test-u16-nfkd.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
 uninorm/test-u32-nfkd.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-nfkd$(EXEEXT): $(test_nfkd_OBJECTS) $(test_nfkd_DEPENDENCIES) 
+
+test-nfkd$(EXEEXT): $(test_nfkd_OBJECTS) $(test_nfkd_DEPENDENCIES) $(EXTRA_test_nfkd_DEPENDENCIES) 
 	@rm -f test-nfkd$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_nfkd_OBJECTS) $(test_nfkd_LDADD) $(LIBS)
 unictype/test-numeric.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-numeric$(EXEEXT): $(test_numeric_OBJECTS) $(test_numeric_DEPENDENCIES) 
+
+test-numeric$(EXEEXT): $(test_numeric_OBJECTS) $(test_numeric_DEPENDENCIES) $(EXTRA_test_numeric_DEPENDENCIES) 
 	@rm -f test-numeric$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_numeric_OBJECTS) $(test_numeric_LDADD) $(LIBS)
 unictype/test-pr_alphabetic.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_alphabetic$(EXEEXT): $(test_pr_alphabetic_OBJECTS) $(test_pr_alphabetic_DEPENDENCIES) 
+
+test-pr_alphabetic$(EXEEXT): $(test_pr_alphabetic_OBJECTS) $(test_pr_alphabetic_DEPENDENCIES) $(EXTRA_test_pr_alphabetic_DEPENDENCIES) 
 	@rm -f test-pr_alphabetic$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_alphabetic_OBJECTS) $(test_pr_alphabetic_LDADD) $(LIBS)
 unictype/test-pr_ascii_hex_digit.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_ascii_hex_digit$(EXEEXT): $(test_pr_ascii_hex_digit_OBJECTS) $(test_pr_ascii_hex_digit_DEPENDENCIES) 
+
+test-pr_ascii_hex_digit$(EXEEXT): $(test_pr_ascii_hex_digit_OBJECTS) $(test_pr_ascii_hex_digit_DEPENDENCIES) $(EXTRA_test_pr_ascii_hex_digit_DEPENDENCIES) 
 	@rm -f test-pr_ascii_hex_digit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_ascii_hex_digit_OBJECTS) $(test_pr_ascii_hex_digit_LDADD) $(LIBS)
 unictype/test-pr_bidi_arabic_digit.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_arabic_digit$(EXEEXT): $(test_pr_bidi_arabic_digit_OBJECTS) $(test_pr_bidi_arabic_digit_DEPENDENCIES) 
+
+test-pr_bidi_arabic_digit$(EXEEXT): $(test_pr_bidi_arabic_digit_OBJECTS) $(test_pr_bidi_arabic_digit_DEPENDENCIES) $(EXTRA_test_pr_bidi_arabic_digit_DEPENDENCIES) 
 	@rm -f test-pr_bidi_arabic_digit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_arabic_digit_OBJECTS) $(test_pr_bidi_arabic_digit_LDADD) $(LIBS)
 unictype/test-pr_bidi_arabic_right_to_left.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_arabic_right_to_left$(EXEEXT): $(test_pr_bidi_arabic_right_to_left_OBJECTS) $(test_pr_bidi_arabic_right_to_left_DEPENDENCIES) 
+
+test-pr_bidi_arabic_right_to_left$(EXEEXT): $(test_pr_bidi_arabic_right_to_left_OBJECTS) $(test_pr_bidi_arabic_right_to_left_DEPENDENCIES) $(EXTRA_test_pr_bidi_arabic_right_to_left_DEPENDENCIES) 
 	@rm -f test-pr_bidi_arabic_right_to_left$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_arabic_right_to_left_OBJECTS) $(test_pr_bidi_arabic_right_to_left_LDADD) $(LIBS)
 unictype/test-pr_bidi_block_separator.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_block_separator$(EXEEXT): $(test_pr_bidi_block_separator_OBJECTS) $(test_pr_bidi_block_separator_DEPENDENCIES) 
+
+test-pr_bidi_block_separator$(EXEEXT): $(test_pr_bidi_block_separator_OBJECTS) $(test_pr_bidi_block_separator_DEPENDENCIES) $(EXTRA_test_pr_bidi_block_separator_DEPENDENCIES) 
 	@rm -f test-pr_bidi_block_separator$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_block_separator_OBJECTS) $(test_pr_bidi_block_separator_LDADD) $(LIBS)
 unictype/test-pr_bidi_boundary_neutral.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_boundary_neutral$(EXEEXT): $(test_pr_bidi_boundary_neutral_OBJECTS) $(test_pr_bidi_boundary_neutral_DEPENDENCIES) 
+
+test-pr_bidi_boundary_neutral$(EXEEXT): $(test_pr_bidi_boundary_neutral_OBJECTS) $(test_pr_bidi_boundary_neutral_DEPENDENCIES) $(EXTRA_test_pr_bidi_boundary_neutral_DEPENDENCIES) 
 	@rm -f test-pr_bidi_boundary_neutral$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_boundary_neutral_OBJECTS) $(test_pr_bidi_boundary_neutral_LDADD) $(LIBS)
 unictype/test-pr_bidi_common_separator.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_common_separator$(EXEEXT): $(test_pr_bidi_common_separator_OBJECTS) $(test_pr_bidi_common_separator_DEPENDENCIES) 
+
+test-pr_bidi_common_separator$(EXEEXT): $(test_pr_bidi_common_separator_OBJECTS) $(test_pr_bidi_common_separator_DEPENDENCIES) $(EXTRA_test_pr_bidi_common_separator_DEPENDENCIES) 
 	@rm -f test-pr_bidi_common_separator$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_common_separator_OBJECTS) $(test_pr_bidi_common_separator_LDADD) $(LIBS)
 unictype/test-pr_bidi_control.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_control$(EXEEXT): $(test_pr_bidi_control_OBJECTS) $(test_pr_bidi_control_DEPENDENCIES) 
+
+test-pr_bidi_control$(EXEEXT): $(test_pr_bidi_control_OBJECTS) $(test_pr_bidi_control_DEPENDENCIES) $(EXTRA_test_pr_bidi_control_DEPENDENCIES) 
 	@rm -f test-pr_bidi_control$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_control_OBJECTS) $(test_pr_bidi_control_LDADD) $(LIBS)
 unictype/test-pr_bidi_embedding_or_override.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_embedding_or_override$(EXEEXT): $(test_pr_bidi_embedding_or_override_OBJECTS) $(test_pr_bidi_embedding_or_override_DEPENDENCIES) 
+
+test-pr_bidi_embedding_or_override$(EXEEXT): $(test_pr_bidi_embedding_or_override_OBJECTS) $(test_pr_bidi_embedding_or_override_DEPENDENCIES) $(EXTRA_test_pr_bidi_embedding_or_override_DEPENDENCIES) 
 	@rm -f test-pr_bidi_embedding_or_override$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_embedding_or_override_OBJECTS) $(test_pr_bidi_embedding_or_override_LDADD) $(LIBS)
 unictype/test-pr_bidi_eur_num_separator.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_eur_num_separator$(EXEEXT): $(test_pr_bidi_eur_num_separator_OBJECTS) $(test_pr_bidi_eur_num_separator_DEPENDENCIES) 
+
+test-pr_bidi_eur_num_separator$(EXEEXT): $(test_pr_bidi_eur_num_separator_OBJECTS) $(test_pr_bidi_eur_num_separator_DEPENDENCIES) $(EXTRA_test_pr_bidi_eur_num_separator_DEPENDENCIES) 
 	@rm -f test-pr_bidi_eur_num_separator$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_eur_num_separator_OBJECTS) $(test_pr_bidi_eur_num_separator_LDADD) $(LIBS)
 unictype/test-pr_bidi_eur_num_terminator.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_eur_num_terminator$(EXEEXT): $(test_pr_bidi_eur_num_terminator_OBJECTS) $(test_pr_bidi_eur_num_terminator_DEPENDENCIES) 
+
+test-pr_bidi_eur_num_terminator$(EXEEXT): $(test_pr_bidi_eur_num_terminator_OBJECTS) $(test_pr_bidi_eur_num_terminator_DEPENDENCIES) $(EXTRA_test_pr_bidi_eur_num_terminator_DEPENDENCIES) 
 	@rm -f test-pr_bidi_eur_num_terminator$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_eur_num_terminator_OBJECTS) $(test_pr_bidi_eur_num_terminator_LDADD) $(LIBS)
 unictype/test-pr_bidi_european_digit.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_european_digit$(EXEEXT): $(test_pr_bidi_european_digit_OBJECTS) $(test_pr_bidi_european_digit_DEPENDENCIES) 
+
+test-pr_bidi_european_digit$(EXEEXT): $(test_pr_bidi_european_digit_OBJECTS) $(test_pr_bidi_european_digit_DEPENDENCIES) $(EXTRA_test_pr_bidi_european_digit_DEPENDENCIES) 
 	@rm -f test-pr_bidi_european_digit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_european_digit_OBJECTS) $(test_pr_bidi_european_digit_LDADD) $(LIBS)
 unictype/test-pr_bidi_hebrew_right_to_left.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_hebrew_right_to_left$(EXEEXT): $(test_pr_bidi_hebrew_right_to_left_OBJECTS) $(test_pr_bidi_hebrew_right_to_left_DEPENDENCIES) 
+
+test-pr_bidi_hebrew_right_to_left$(EXEEXT): $(test_pr_bidi_hebrew_right_to_left_OBJECTS) $(test_pr_bidi_hebrew_right_to_left_DEPENDENCIES) $(EXTRA_test_pr_bidi_hebrew_right_to_left_DEPENDENCIES) 
 	@rm -f test-pr_bidi_hebrew_right_to_left$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_hebrew_right_to_left_OBJECTS) $(test_pr_bidi_hebrew_right_to_left_LDADD) $(LIBS)
 unictype/test-pr_bidi_left_to_right.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_left_to_right$(EXEEXT): $(test_pr_bidi_left_to_right_OBJECTS) $(test_pr_bidi_left_to_right_DEPENDENCIES) 
+
+test-pr_bidi_left_to_right$(EXEEXT): $(test_pr_bidi_left_to_right_OBJECTS) $(test_pr_bidi_left_to_right_DEPENDENCIES) $(EXTRA_test_pr_bidi_left_to_right_DEPENDENCIES) 
 	@rm -f test-pr_bidi_left_to_right$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_left_to_right_OBJECTS) $(test_pr_bidi_left_to_right_LDADD) $(LIBS)
 unictype/test-pr_bidi_non_spacing_mark.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_non_spacing_mark$(EXEEXT): $(test_pr_bidi_non_spacing_mark_OBJECTS) $(test_pr_bidi_non_spacing_mark_DEPENDENCIES) 
+
+test-pr_bidi_non_spacing_mark$(EXEEXT): $(test_pr_bidi_non_spacing_mark_OBJECTS) $(test_pr_bidi_non_spacing_mark_DEPENDENCIES) $(EXTRA_test_pr_bidi_non_spacing_mark_DEPENDENCIES) 
 	@rm -f test-pr_bidi_non_spacing_mark$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_non_spacing_mark_OBJECTS) $(test_pr_bidi_non_spacing_mark_LDADD) $(LIBS)
 unictype/test-pr_bidi_other_neutral.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_other_neutral$(EXEEXT): $(test_pr_bidi_other_neutral_OBJECTS) $(test_pr_bidi_other_neutral_DEPENDENCIES) 
+
+test-pr_bidi_other_neutral$(EXEEXT): $(test_pr_bidi_other_neutral_OBJECTS) $(test_pr_bidi_other_neutral_DEPENDENCIES) $(EXTRA_test_pr_bidi_other_neutral_DEPENDENCIES) 
 	@rm -f test-pr_bidi_other_neutral$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_other_neutral_OBJECTS) $(test_pr_bidi_other_neutral_LDADD) $(LIBS)
 unictype/test-pr_bidi_pdf.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_pdf$(EXEEXT): $(test_pr_bidi_pdf_OBJECTS) $(test_pr_bidi_pdf_DEPENDENCIES) 
+
+test-pr_bidi_pdf$(EXEEXT): $(test_pr_bidi_pdf_OBJECTS) $(test_pr_bidi_pdf_DEPENDENCIES) $(EXTRA_test_pr_bidi_pdf_DEPENDENCIES) 
 	@rm -f test-pr_bidi_pdf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_pdf_OBJECTS) $(test_pr_bidi_pdf_LDADD) $(LIBS)
 unictype/test-pr_bidi_segment_separator.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_segment_separator$(EXEEXT): $(test_pr_bidi_segment_separator_OBJECTS) $(test_pr_bidi_segment_separator_DEPENDENCIES) 
+
+test-pr_bidi_segment_separator$(EXEEXT): $(test_pr_bidi_segment_separator_OBJECTS) $(test_pr_bidi_segment_separator_DEPENDENCIES) $(EXTRA_test_pr_bidi_segment_separator_DEPENDENCIES) 
 	@rm -f test-pr_bidi_segment_separator$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_segment_separator_OBJECTS) $(test_pr_bidi_segment_separator_LDADD) $(LIBS)
 unictype/test-pr_bidi_whitespace.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_bidi_whitespace$(EXEEXT): $(test_pr_bidi_whitespace_OBJECTS) $(test_pr_bidi_whitespace_DEPENDENCIES) 
+
+test-pr_bidi_whitespace$(EXEEXT): $(test_pr_bidi_whitespace_OBJECTS) $(test_pr_bidi_whitespace_DEPENDENCIES) $(EXTRA_test_pr_bidi_whitespace_DEPENDENCIES) 
 	@rm -f test-pr_bidi_whitespace$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_bidi_whitespace_OBJECTS) $(test_pr_bidi_whitespace_LDADD) $(LIBS)
 unictype/test-pr_byname.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_byname$(EXEEXT): $(test_pr_byname_OBJECTS) $(test_pr_byname_DEPENDENCIES) 
+
+test-pr_byname$(EXEEXT): $(test_pr_byname_OBJECTS) $(test_pr_byname_DEPENDENCIES) $(EXTRA_test_pr_byname_DEPENDENCIES) 
 	@rm -f test-pr_byname$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_byname_OBJECTS) $(test_pr_byname_LDADD) $(LIBS)
+unictype/test-pr_case_ignorable.$(OBJEXT): unictype/$(am__dirstamp) \
+	unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-pr_case_ignorable$(EXEEXT): $(test_pr_case_ignorable_OBJECTS) $(test_pr_case_ignorable_DEPENDENCIES) $(EXTRA_test_pr_case_ignorable_DEPENDENCIES) 
+	@rm -f test-pr_case_ignorable$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_pr_case_ignorable_OBJECTS) $(test_pr_case_ignorable_LDADD) $(LIBS)
+unictype/test-pr_cased.$(OBJEXT): unictype/$(am__dirstamp) \
+	unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-pr_cased$(EXEEXT): $(test_pr_cased_OBJECTS) $(test_pr_cased_DEPENDENCIES) $(EXTRA_test_pr_cased_DEPENDENCIES) 
+	@rm -f test-pr_cased$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_pr_cased_OBJECTS) $(test_pr_cased_LDADD) $(LIBS)
+unictype/test-pr_changes_when_casefolded.$(OBJEXT):  \
+	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-pr_changes_when_casefolded$(EXEEXT): $(test_pr_changes_when_casefolded_OBJECTS) $(test_pr_changes_when_casefolded_DEPENDENCIES) $(EXTRA_test_pr_changes_when_casefolded_DEPENDENCIES) 
+	@rm -f test-pr_changes_when_casefolded$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_pr_changes_when_casefolded_OBJECTS) $(test_pr_changes_when_casefolded_LDADD) $(LIBS)
+unictype/test-pr_changes_when_casemapped.$(OBJEXT):  \
+	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-pr_changes_when_casemapped$(EXEEXT): $(test_pr_changes_when_casemapped_OBJECTS) $(test_pr_changes_when_casemapped_DEPENDENCIES) $(EXTRA_test_pr_changes_when_casemapped_DEPENDENCIES) 
+	@rm -f test-pr_changes_when_casemapped$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_pr_changes_when_casemapped_OBJECTS) $(test_pr_changes_when_casemapped_LDADD) $(LIBS)
+unictype/test-pr_changes_when_lowercased.$(OBJEXT):  \
+	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-pr_changes_when_lowercased$(EXEEXT): $(test_pr_changes_when_lowercased_OBJECTS) $(test_pr_changes_when_lowercased_DEPENDENCIES) $(EXTRA_test_pr_changes_when_lowercased_DEPENDENCIES) 
+	@rm -f test-pr_changes_when_lowercased$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_pr_changes_when_lowercased_OBJECTS) $(test_pr_changes_when_lowercased_LDADD) $(LIBS)
+unictype/test-pr_changes_when_titlecased.$(OBJEXT):  \
+	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-pr_changes_when_titlecased$(EXEEXT): $(test_pr_changes_when_titlecased_OBJECTS) $(test_pr_changes_when_titlecased_DEPENDENCIES) $(EXTRA_test_pr_changes_when_titlecased_DEPENDENCIES) 
+	@rm -f test-pr_changes_when_titlecased$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_pr_changes_when_titlecased_OBJECTS) $(test_pr_changes_when_titlecased_LDADD) $(LIBS)
+unictype/test-pr_changes_when_uppercased.$(OBJEXT):  \
+	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
+
+test-pr_changes_when_uppercased$(EXEEXT): $(test_pr_changes_when_uppercased_OBJECTS) $(test_pr_changes_when_uppercased_DEPENDENCIES) $(EXTRA_test_pr_changes_when_uppercased_DEPENDENCIES) 
+	@rm -f test-pr_changes_when_uppercased$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_pr_changes_when_uppercased_OBJECTS) $(test_pr_changes_when_uppercased_LDADD) $(LIBS)
 unictype/test-pr_combining.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_combining$(EXEEXT): $(test_pr_combining_OBJECTS) $(test_pr_combining_DEPENDENCIES) 
+
+test-pr_combining$(EXEEXT): $(test_pr_combining_OBJECTS) $(test_pr_combining_DEPENDENCIES) $(EXTRA_test_pr_combining_DEPENDENCIES) 
 	@rm -f test-pr_combining$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_combining_OBJECTS) $(test_pr_combining_LDADD) $(LIBS)
 unictype/test-pr_composite.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_composite$(EXEEXT): $(test_pr_composite_OBJECTS) $(test_pr_composite_DEPENDENCIES) 
+
+test-pr_composite$(EXEEXT): $(test_pr_composite_OBJECTS) $(test_pr_composite_DEPENDENCIES) $(EXTRA_test_pr_composite_DEPENDENCIES) 
 	@rm -f test-pr_composite$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_composite_OBJECTS) $(test_pr_composite_LDADD) $(LIBS)
 unictype/test-pr_currency_symbol.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_currency_symbol$(EXEEXT): $(test_pr_currency_symbol_OBJECTS) $(test_pr_currency_symbol_DEPENDENCIES) 
+
+test-pr_currency_symbol$(EXEEXT): $(test_pr_currency_symbol_OBJECTS) $(test_pr_currency_symbol_DEPENDENCIES) $(EXTRA_test_pr_currency_symbol_DEPENDENCIES) 
 	@rm -f test-pr_currency_symbol$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_currency_symbol_OBJECTS) $(test_pr_currency_symbol_LDADD) $(LIBS)
 unictype/test-pr_dash.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_dash$(EXEEXT): $(test_pr_dash_OBJECTS) $(test_pr_dash_DEPENDENCIES) 
+
+test-pr_dash$(EXEEXT): $(test_pr_dash_OBJECTS) $(test_pr_dash_DEPENDENCIES) $(EXTRA_test_pr_dash_DEPENDENCIES) 
 	@rm -f test-pr_dash$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_dash_OBJECTS) $(test_pr_dash_LDADD) $(LIBS)
 unictype/test-pr_decimal_digit.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_decimal_digit$(EXEEXT): $(test_pr_decimal_digit_OBJECTS) $(test_pr_decimal_digit_DEPENDENCIES) 
+
+test-pr_decimal_digit$(EXEEXT): $(test_pr_decimal_digit_OBJECTS) $(test_pr_decimal_digit_DEPENDENCIES) $(EXTRA_test_pr_decimal_digit_DEPENDENCIES) 
 	@rm -f test-pr_decimal_digit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_decimal_digit_OBJECTS) $(test_pr_decimal_digit_LDADD) $(LIBS)
 unictype/test-pr_default_ignorable_code_point.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_default_ignorable_code_point$(EXEEXT): $(test_pr_default_ignorable_code_point_OBJECTS) $(test_pr_default_ignorable_code_point_DEPENDENCIES) 
+
+test-pr_default_ignorable_code_point$(EXEEXT): $(test_pr_default_ignorable_code_point_OBJECTS) $(test_pr_default_ignorable_code_point_DEPENDENCIES) $(EXTRA_test_pr_default_ignorable_code_point_DEPENDENCIES) 
 	@rm -f test-pr_default_ignorable_code_point$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_default_ignorable_code_point_OBJECTS) $(test_pr_default_ignorable_code_point_LDADD) $(LIBS)
 unictype/test-pr_deprecated.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_deprecated$(EXEEXT): $(test_pr_deprecated_OBJECTS) $(test_pr_deprecated_DEPENDENCIES) 
+
+test-pr_deprecated$(EXEEXT): $(test_pr_deprecated_OBJECTS) $(test_pr_deprecated_DEPENDENCIES) $(EXTRA_test_pr_deprecated_DEPENDENCIES) 
 	@rm -f test-pr_deprecated$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_deprecated_OBJECTS) $(test_pr_deprecated_LDADD) $(LIBS)
 unictype/test-pr_diacritic.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_diacritic$(EXEEXT): $(test_pr_diacritic_OBJECTS) $(test_pr_diacritic_DEPENDENCIES) 
+
+test-pr_diacritic$(EXEEXT): $(test_pr_diacritic_OBJECTS) $(test_pr_diacritic_DEPENDENCIES) $(EXTRA_test_pr_diacritic_DEPENDENCIES) 
 	@rm -f test-pr_diacritic$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_diacritic_OBJECTS) $(test_pr_diacritic_LDADD) $(LIBS)
 unictype/test-pr_extender.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_extender$(EXEEXT): $(test_pr_extender_OBJECTS) $(test_pr_extender_DEPENDENCIES) 
+
+test-pr_extender$(EXEEXT): $(test_pr_extender_OBJECTS) $(test_pr_extender_DEPENDENCIES) $(EXTRA_test_pr_extender_DEPENDENCIES) 
 	@rm -f test-pr_extender$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_extender_OBJECTS) $(test_pr_extender_LDADD) $(LIBS)
 unictype/test-pr_format_control.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_format_control$(EXEEXT): $(test_pr_format_control_OBJECTS) $(test_pr_format_control_DEPENDENCIES) 
+
+test-pr_format_control$(EXEEXT): $(test_pr_format_control_OBJECTS) $(test_pr_format_control_DEPENDENCIES) $(EXTRA_test_pr_format_control_DEPENDENCIES) 
 	@rm -f test-pr_format_control$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_format_control_OBJECTS) $(test_pr_format_control_LDADD) $(LIBS)
 unictype/test-pr_grapheme_base.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_grapheme_base$(EXEEXT): $(test_pr_grapheme_base_OBJECTS) $(test_pr_grapheme_base_DEPENDENCIES) 
+
+test-pr_grapheme_base$(EXEEXT): $(test_pr_grapheme_base_OBJECTS) $(test_pr_grapheme_base_DEPENDENCIES) $(EXTRA_test_pr_grapheme_base_DEPENDENCIES) 
 	@rm -f test-pr_grapheme_base$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_grapheme_base_OBJECTS) $(test_pr_grapheme_base_LDADD) $(LIBS)
 unictype/test-pr_grapheme_extend.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_grapheme_extend$(EXEEXT): $(test_pr_grapheme_extend_OBJECTS) $(test_pr_grapheme_extend_DEPENDENCIES) 
+
+test-pr_grapheme_extend$(EXEEXT): $(test_pr_grapheme_extend_OBJECTS) $(test_pr_grapheme_extend_DEPENDENCIES) $(EXTRA_test_pr_grapheme_extend_DEPENDENCIES) 
 	@rm -f test-pr_grapheme_extend$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_grapheme_extend_OBJECTS) $(test_pr_grapheme_extend_LDADD) $(LIBS)
 unictype/test-pr_grapheme_link.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_grapheme_link$(EXEEXT): $(test_pr_grapheme_link_OBJECTS) $(test_pr_grapheme_link_DEPENDENCIES) 
+
+test-pr_grapheme_link$(EXEEXT): $(test_pr_grapheme_link_OBJECTS) $(test_pr_grapheme_link_DEPENDENCIES) $(EXTRA_test_pr_grapheme_link_DEPENDENCIES) 
 	@rm -f test-pr_grapheme_link$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_grapheme_link_OBJECTS) $(test_pr_grapheme_link_LDADD) $(LIBS)
 unictype/test-pr_hex_digit.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_hex_digit$(EXEEXT): $(test_pr_hex_digit_OBJECTS) $(test_pr_hex_digit_DEPENDENCIES) 
+
+test-pr_hex_digit$(EXEEXT): $(test_pr_hex_digit_OBJECTS) $(test_pr_hex_digit_DEPENDENCIES) $(EXTRA_test_pr_hex_digit_DEPENDENCIES) 
 	@rm -f test-pr_hex_digit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_hex_digit_OBJECTS) $(test_pr_hex_digit_LDADD) $(LIBS)
 unictype/test-pr_hyphen.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_hyphen$(EXEEXT): $(test_pr_hyphen_OBJECTS) $(test_pr_hyphen_DEPENDENCIES) 
+
+test-pr_hyphen$(EXEEXT): $(test_pr_hyphen_OBJECTS) $(test_pr_hyphen_DEPENDENCIES) $(EXTRA_test_pr_hyphen_DEPENDENCIES) 
 	@rm -f test-pr_hyphen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_hyphen_OBJECTS) $(test_pr_hyphen_LDADD) $(LIBS)
 unictype/test-pr_id_continue.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_id_continue$(EXEEXT): $(test_pr_id_continue_OBJECTS) $(test_pr_id_continue_DEPENDENCIES) 
+
+test-pr_id_continue$(EXEEXT): $(test_pr_id_continue_OBJECTS) $(test_pr_id_continue_DEPENDENCIES) $(EXTRA_test_pr_id_continue_DEPENDENCIES) 
 	@rm -f test-pr_id_continue$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_id_continue_OBJECTS) $(test_pr_id_continue_LDADD) $(LIBS)
 unictype/test-pr_id_start.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_id_start$(EXEEXT): $(test_pr_id_start_OBJECTS) $(test_pr_id_start_DEPENDENCIES) 
+
+test-pr_id_start$(EXEEXT): $(test_pr_id_start_OBJECTS) $(test_pr_id_start_DEPENDENCIES) $(EXTRA_test_pr_id_start_DEPENDENCIES) 
 	@rm -f test-pr_id_start$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_id_start_OBJECTS) $(test_pr_id_start_LDADD) $(LIBS)
 unictype/test-pr_ideographic.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_ideographic$(EXEEXT): $(test_pr_ideographic_OBJECTS) $(test_pr_ideographic_DEPENDENCIES) 
+
+test-pr_ideographic$(EXEEXT): $(test_pr_ideographic_OBJECTS) $(test_pr_ideographic_DEPENDENCIES) $(EXTRA_test_pr_ideographic_DEPENDENCIES) 
 	@rm -f test-pr_ideographic$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_ideographic_OBJECTS) $(test_pr_ideographic_LDADD) $(LIBS)
 unictype/test-pr_ids_binary_operator.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_ids_binary_operator$(EXEEXT): $(test_pr_ids_binary_operator_OBJECTS) $(test_pr_ids_binary_operator_DEPENDENCIES) 
+
+test-pr_ids_binary_operator$(EXEEXT): $(test_pr_ids_binary_operator_OBJECTS) $(test_pr_ids_binary_operator_DEPENDENCIES) $(EXTRA_test_pr_ids_binary_operator_DEPENDENCIES) 
 	@rm -f test-pr_ids_binary_operator$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_ids_binary_operator_OBJECTS) $(test_pr_ids_binary_operator_LDADD) $(LIBS)
 unictype/test-pr_ids_trinary_operator.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_ids_trinary_operator$(EXEEXT): $(test_pr_ids_trinary_operator_OBJECTS) $(test_pr_ids_trinary_operator_DEPENDENCIES) 
+
+test-pr_ids_trinary_operator$(EXEEXT): $(test_pr_ids_trinary_operator_OBJECTS) $(test_pr_ids_trinary_operator_DEPENDENCIES) $(EXTRA_test_pr_ids_trinary_operator_DEPENDENCIES) 
 	@rm -f test-pr_ids_trinary_operator$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_ids_trinary_operator_OBJECTS) $(test_pr_ids_trinary_operator_LDADD) $(LIBS)
 unictype/test-pr_ignorable_control.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_ignorable_control$(EXEEXT): $(test_pr_ignorable_control_OBJECTS) $(test_pr_ignorable_control_DEPENDENCIES) 
+
+test-pr_ignorable_control$(EXEEXT): $(test_pr_ignorable_control_OBJECTS) $(test_pr_ignorable_control_DEPENDENCIES) $(EXTRA_test_pr_ignorable_control_DEPENDENCIES) 
 	@rm -f test-pr_ignorable_control$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_ignorable_control_OBJECTS) $(test_pr_ignorable_control_LDADD) $(LIBS)
 unictype/test-pr_iso_control.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_iso_control$(EXEEXT): $(test_pr_iso_control_OBJECTS) $(test_pr_iso_control_DEPENDENCIES) 
+
+test-pr_iso_control$(EXEEXT): $(test_pr_iso_control_OBJECTS) $(test_pr_iso_control_DEPENDENCIES) $(EXTRA_test_pr_iso_control_DEPENDENCIES) 
 	@rm -f test-pr_iso_control$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_iso_control_OBJECTS) $(test_pr_iso_control_LDADD) $(LIBS)
 unictype/test-pr_join_control.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_join_control$(EXEEXT): $(test_pr_join_control_OBJECTS) $(test_pr_join_control_DEPENDENCIES) 
+
+test-pr_join_control$(EXEEXT): $(test_pr_join_control_OBJECTS) $(test_pr_join_control_DEPENDENCIES) $(EXTRA_test_pr_join_control_DEPENDENCIES) 
 	@rm -f test-pr_join_control$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_join_control_OBJECTS) $(test_pr_join_control_LDADD) $(LIBS)
 unictype/test-pr_left_of_pair.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_left_of_pair$(EXEEXT): $(test_pr_left_of_pair_OBJECTS) $(test_pr_left_of_pair_DEPENDENCIES) 
+
+test-pr_left_of_pair$(EXEEXT): $(test_pr_left_of_pair_OBJECTS) $(test_pr_left_of_pair_DEPENDENCIES) $(EXTRA_test_pr_left_of_pair_DEPENDENCIES) 
 	@rm -f test-pr_left_of_pair$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_left_of_pair_OBJECTS) $(test_pr_left_of_pair_LDADD) $(LIBS)
 unictype/test-pr_line_separator.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_line_separator$(EXEEXT): $(test_pr_line_separator_OBJECTS) $(test_pr_line_separator_DEPENDENCIES) 
+
+test-pr_line_separator$(EXEEXT): $(test_pr_line_separator_OBJECTS) $(test_pr_line_separator_DEPENDENCIES) $(EXTRA_test_pr_line_separator_DEPENDENCIES) 
 	@rm -f test-pr_line_separator$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_line_separator_OBJECTS) $(test_pr_line_separator_LDADD) $(LIBS)
 unictype/test-pr_logical_order_exception.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_logical_order_exception$(EXEEXT): $(test_pr_logical_order_exception_OBJECTS) $(test_pr_logical_order_exception_DEPENDENCIES) 
+
+test-pr_logical_order_exception$(EXEEXT): $(test_pr_logical_order_exception_OBJECTS) $(test_pr_logical_order_exception_DEPENDENCIES) $(EXTRA_test_pr_logical_order_exception_DEPENDENCIES) 
 	@rm -f test-pr_logical_order_exception$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_logical_order_exception_OBJECTS) $(test_pr_logical_order_exception_LDADD) $(LIBS)
 unictype/test-pr_lowercase.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_lowercase$(EXEEXT): $(test_pr_lowercase_OBJECTS) $(test_pr_lowercase_DEPENDENCIES) 
+
+test-pr_lowercase$(EXEEXT): $(test_pr_lowercase_OBJECTS) $(test_pr_lowercase_DEPENDENCIES) $(EXTRA_test_pr_lowercase_DEPENDENCIES) 
 	@rm -f test-pr_lowercase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_lowercase_OBJECTS) $(test_pr_lowercase_LDADD) $(LIBS)
 unictype/test-pr_math.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_math$(EXEEXT): $(test_pr_math_OBJECTS) $(test_pr_math_DEPENDENCIES) 
+
+test-pr_math$(EXEEXT): $(test_pr_math_OBJECTS) $(test_pr_math_DEPENDENCIES) $(EXTRA_test_pr_math_DEPENDENCIES) 
 	@rm -f test-pr_math$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_math_OBJECTS) $(test_pr_math_LDADD) $(LIBS)
 unictype/test-pr_non_break.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_non_break$(EXEEXT): $(test_pr_non_break_OBJECTS) $(test_pr_non_break_DEPENDENCIES) 
+
+test-pr_non_break$(EXEEXT): $(test_pr_non_break_OBJECTS) $(test_pr_non_break_DEPENDENCIES) $(EXTRA_test_pr_non_break_DEPENDENCIES) 
 	@rm -f test-pr_non_break$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_non_break_OBJECTS) $(test_pr_non_break_LDADD) $(LIBS)
 unictype/test-pr_not_a_character.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_not_a_character$(EXEEXT): $(test_pr_not_a_character_OBJECTS) $(test_pr_not_a_character_DEPENDENCIES) 
+
+test-pr_not_a_character$(EXEEXT): $(test_pr_not_a_character_OBJECTS) $(test_pr_not_a_character_DEPENDENCIES) $(EXTRA_test_pr_not_a_character_DEPENDENCIES) 
 	@rm -f test-pr_not_a_character$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_not_a_character_OBJECTS) $(test_pr_not_a_character_LDADD) $(LIBS)
 unictype/test-pr_numeric.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_numeric$(EXEEXT): $(test_pr_numeric_OBJECTS) $(test_pr_numeric_DEPENDENCIES) 
+
+test-pr_numeric$(EXEEXT): $(test_pr_numeric_OBJECTS) $(test_pr_numeric_DEPENDENCIES) $(EXTRA_test_pr_numeric_DEPENDENCIES) 
 	@rm -f test-pr_numeric$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_numeric_OBJECTS) $(test_pr_numeric_LDADD) $(LIBS)
 unictype/test-pr_other_alphabetic.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_other_alphabetic$(EXEEXT): $(test_pr_other_alphabetic_OBJECTS) $(test_pr_other_alphabetic_DEPENDENCIES) 
+
+test-pr_other_alphabetic$(EXEEXT): $(test_pr_other_alphabetic_OBJECTS) $(test_pr_other_alphabetic_DEPENDENCIES) $(EXTRA_test_pr_other_alphabetic_DEPENDENCIES) 
 	@rm -f test-pr_other_alphabetic$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_other_alphabetic_OBJECTS) $(test_pr_other_alphabetic_LDADD) $(LIBS)
 unictype/test-pr_other_default_ignorable_code_point.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_other_default_ignorable_code_point$(EXEEXT): $(test_pr_other_default_ignorable_code_point_OBJECTS) $(test_pr_other_default_ignorable_code_point_DEPENDENCIES) 
+
+test-pr_other_default_ignorable_code_point$(EXEEXT): $(test_pr_other_default_ignorable_code_point_OBJECTS) $(test_pr_other_default_ignorable_code_point_DEPENDENCIES) $(EXTRA_test_pr_other_default_ignorable_code_point_DEPENDENCIES) 
 	@rm -f test-pr_other_default_ignorable_code_point$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_other_default_ignorable_code_point_OBJECTS) $(test_pr_other_default_ignorable_code_point_LDADD) $(LIBS)
 unictype/test-pr_other_grapheme_extend.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_other_grapheme_extend$(EXEEXT): $(test_pr_other_grapheme_extend_OBJECTS) $(test_pr_other_grapheme_extend_DEPENDENCIES) 
+
+test-pr_other_grapheme_extend$(EXEEXT): $(test_pr_other_grapheme_extend_OBJECTS) $(test_pr_other_grapheme_extend_DEPENDENCIES) $(EXTRA_test_pr_other_grapheme_extend_DEPENDENCIES) 
 	@rm -f test-pr_other_grapheme_extend$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_other_grapheme_extend_OBJECTS) $(test_pr_other_grapheme_extend_LDADD) $(LIBS)
 unictype/test-pr_other_id_continue.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_other_id_continue$(EXEEXT): $(test_pr_other_id_continue_OBJECTS) $(test_pr_other_id_continue_DEPENDENCIES) 
+
+test-pr_other_id_continue$(EXEEXT): $(test_pr_other_id_continue_OBJECTS) $(test_pr_other_id_continue_DEPENDENCIES) $(EXTRA_test_pr_other_id_continue_DEPENDENCIES) 
 	@rm -f test-pr_other_id_continue$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_other_id_continue_OBJECTS) $(test_pr_other_id_continue_LDADD) $(LIBS)
 unictype/test-pr_other_id_start.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_other_id_start$(EXEEXT): $(test_pr_other_id_start_OBJECTS) $(test_pr_other_id_start_DEPENDENCIES) 
+
+test-pr_other_id_start$(EXEEXT): $(test_pr_other_id_start_OBJECTS) $(test_pr_other_id_start_DEPENDENCIES) $(EXTRA_test_pr_other_id_start_DEPENDENCIES) 
 	@rm -f test-pr_other_id_start$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_other_id_start_OBJECTS) $(test_pr_other_id_start_LDADD) $(LIBS)
 unictype/test-pr_other_lowercase.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_other_lowercase$(EXEEXT): $(test_pr_other_lowercase_OBJECTS) $(test_pr_other_lowercase_DEPENDENCIES) 
+
+test-pr_other_lowercase$(EXEEXT): $(test_pr_other_lowercase_OBJECTS) $(test_pr_other_lowercase_DEPENDENCIES) $(EXTRA_test_pr_other_lowercase_DEPENDENCIES) 
 	@rm -f test-pr_other_lowercase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_other_lowercase_OBJECTS) $(test_pr_other_lowercase_LDADD) $(LIBS)
 unictype/test-pr_other_math.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_other_math$(EXEEXT): $(test_pr_other_math_OBJECTS) $(test_pr_other_math_DEPENDENCIES) 
+
+test-pr_other_math$(EXEEXT): $(test_pr_other_math_OBJECTS) $(test_pr_other_math_DEPENDENCIES) $(EXTRA_test_pr_other_math_DEPENDENCIES) 
 	@rm -f test-pr_other_math$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_other_math_OBJECTS) $(test_pr_other_math_LDADD) $(LIBS)
 unictype/test-pr_other_uppercase.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_other_uppercase$(EXEEXT): $(test_pr_other_uppercase_OBJECTS) $(test_pr_other_uppercase_DEPENDENCIES) 
+
+test-pr_other_uppercase$(EXEEXT): $(test_pr_other_uppercase_OBJECTS) $(test_pr_other_uppercase_DEPENDENCIES) $(EXTRA_test_pr_other_uppercase_DEPENDENCIES) 
 	@rm -f test-pr_other_uppercase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_other_uppercase_OBJECTS) $(test_pr_other_uppercase_LDADD) $(LIBS)
 unictype/test-pr_paired_punctuation.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_paired_punctuation$(EXEEXT): $(test_pr_paired_punctuation_OBJECTS) $(test_pr_paired_punctuation_DEPENDENCIES) 
+
+test-pr_paired_punctuation$(EXEEXT): $(test_pr_paired_punctuation_OBJECTS) $(test_pr_paired_punctuation_DEPENDENCIES) $(EXTRA_test_pr_paired_punctuation_DEPENDENCIES) 
 	@rm -f test-pr_paired_punctuation$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_paired_punctuation_OBJECTS) $(test_pr_paired_punctuation_LDADD) $(LIBS)
 unictype/test-pr_paragraph_separator.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_paragraph_separator$(EXEEXT): $(test_pr_paragraph_separator_OBJECTS) $(test_pr_paragraph_separator_DEPENDENCIES) 
+
+test-pr_paragraph_separator$(EXEEXT): $(test_pr_paragraph_separator_OBJECTS) $(test_pr_paragraph_separator_DEPENDENCIES) $(EXTRA_test_pr_paragraph_separator_DEPENDENCIES) 
 	@rm -f test-pr_paragraph_separator$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_paragraph_separator_OBJECTS) $(test_pr_paragraph_separator_LDADD) $(LIBS)
 unictype/test-pr_pattern_syntax.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_pattern_syntax$(EXEEXT): $(test_pr_pattern_syntax_OBJECTS) $(test_pr_pattern_syntax_DEPENDENCIES) 
+
+test-pr_pattern_syntax$(EXEEXT): $(test_pr_pattern_syntax_OBJECTS) $(test_pr_pattern_syntax_DEPENDENCIES) $(EXTRA_test_pr_pattern_syntax_DEPENDENCIES) 
 	@rm -f test-pr_pattern_syntax$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_pattern_syntax_OBJECTS) $(test_pr_pattern_syntax_LDADD) $(LIBS)
 unictype/test-pr_pattern_white_space.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_pattern_white_space$(EXEEXT): $(test_pr_pattern_white_space_OBJECTS) $(test_pr_pattern_white_space_DEPENDENCIES) 
+
+test-pr_pattern_white_space$(EXEEXT): $(test_pr_pattern_white_space_OBJECTS) $(test_pr_pattern_white_space_DEPENDENCIES) $(EXTRA_test_pr_pattern_white_space_DEPENDENCIES) 
 	@rm -f test-pr_pattern_white_space$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_pattern_white_space_OBJECTS) $(test_pr_pattern_white_space_LDADD) $(LIBS)
 unictype/test-pr_private_use.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_private_use$(EXEEXT): $(test_pr_private_use_OBJECTS) $(test_pr_private_use_DEPENDENCIES) 
+
+test-pr_private_use$(EXEEXT): $(test_pr_private_use_OBJECTS) $(test_pr_private_use_DEPENDENCIES) $(EXTRA_test_pr_private_use_DEPENDENCIES) 
 	@rm -f test-pr_private_use$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_private_use_OBJECTS) $(test_pr_private_use_LDADD) $(LIBS)
 unictype/test-pr_punctuation.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_punctuation$(EXEEXT): $(test_pr_punctuation_OBJECTS) $(test_pr_punctuation_DEPENDENCIES) 
+
+test-pr_punctuation$(EXEEXT): $(test_pr_punctuation_OBJECTS) $(test_pr_punctuation_DEPENDENCIES) $(EXTRA_test_pr_punctuation_DEPENDENCIES) 
 	@rm -f test-pr_punctuation$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_punctuation_OBJECTS) $(test_pr_punctuation_LDADD) $(LIBS)
 unictype/test-pr_quotation_mark.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_quotation_mark$(EXEEXT): $(test_pr_quotation_mark_OBJECTS) $(test_pr_quotation_mark_DEPENDENCIES) 
+
+test-pr_quotation_mark$(EXEEXT): $(test_pr_quotation_mark_OBJECTS) $(test_pr_quotation_mark_DEPENDENCIES) $(EXTRA_test_pr_quotation_mark_DEPENDENCIES) 
 	@rm -f test-pr_quotation_mark$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_quotation_mark_OBJECTS) $(test_pr_quotation_mark_LDADD) $(LIBS)
 unictype/test-pr_radical.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_radical$(EXEEXT): $(test_pr_radical_OBJECTS) $(test_pr_radical_DEPENDENCIES) 
+
+test-pr_radical$(EXEEXT): $(test_pr_radical_OBJECTS) $(test_pr_radical_DEPENDENCIES) $(EXTRA_test_pr_radical_DEPENDENCIES) 
 	@rm -f test-pr_radical$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_radical_OBJECTS) $(test_pr_radical_LDADD) $(LIBS)
 unictype/test-pr_sentence_terminal.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_sentence_terminal$(EXEEXT): $(test_pr_sentence_terminal_OBJECTS) $(test_pr_sentence_terminal_DEPENDENCIES) 
+
+test-pr_sentence_terminal$(EXEEXT): $(test_pr_sentence_terminal_OBJECTS) $(test_pr_sentence_terminal_DEPENDENCIES) $(EXTRA_test_pr_sentence_terminal_DEPENDENCIES) 
 	@rm -f test-pr_sentence_terminal$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_sentence_terminal_OBJECTS) $(test_pr_sentence_terminal_LDADD) $(LIBS)
 unictype/test-pr_soft_dotted.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_soft_dotted$(EXEEXT): $(test_pr_soft_dotted_OBJECTS) $(test_pr_soft_dotted_DEPENDENCIES) 
+
+test-pr_soft_dotted$(EXEEXT): $(test_pr_soft_dotted_OBJECTS) $(test_pr_soft_dotted_DEPENDENCIES) $(EXTRA_test_pr_soft_dotted_DEPENDENCIES) 
 	@rm -f test-pr_soft_dotted$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_soft_dotted_OBJECTS) $(test_pr_soft_dotted_LDADD) $(LIBS)
 unictype/test-pr_space.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_space$(EXEEXT): $(test_pr_space_OBJECTS) $(test_pr_space_DEPENDENCIES) 
+
+test-pr_space$(EXEEXT): $(test_pr_space_OBJECTS) $(test_pr_space_DEPENDENCIES) $(EXTRA_test_pr_space_DEPENDENCIES) 
 	@rm -f test-pr_space$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_space_OBJECTS) $(test_pr_space_LDADD) $(LIBS)
 unictype/test-pr_terminal_punctuation.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_terminal_punctuation$(EXEEXT): $(test_pr_terminal_punctuation_OBJECTS) $(test_pr_terminal_punctuation_DEPENDENCIES) 
+
+test-pr_terminal_punctuation$(EXEEXT): $(test_pr_terminal_punctuation_OBJECTS) $(test_pr_terminal_punctuation_DEPENDENCIES) $(EXTRA_test_pr_terminal_punctuation_DEPENDENCIES) 
 	@rm -f test-pr_terminal_punctuation$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_terminal_punctuation_OBJECTS) $(test_pr_terminal_punctuation_LDADD) $(LIBS)
 unictype/test-pr_test.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_test$(EXEEXT): $(test_pr_test_OBJECTS) $(test_pr_test_DEPENDENCIES) 
+
+test-pr_test$(EXEEXT): $(test_pr_test_OBJECTS) $(test_pr_test_DEPENDENCIES) $(EXTRA_test_pr_test_DEPENDENCIES) 
 	@rm -f test-pr_test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_test_OBJECTS) $(test_pr_test_LDADD) $(LIBS)
 unictype/test-pr_titlecase.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_titlecase$(EXEEXT): $(test_pr_titlecase_OBJECTS) $(test_pr_titlecase_DEPENDENCIES) 
+
+test-pr_titlecase$(EXEEXT): $(test_pr_titlecase_OBJECTS) $(test_pr_titlecase_DEPENDENCIES) $(EXTRA_test_pr_titlecase_DEPENDENCIES) 
 	@rm -f test-pr_titlecase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_titlecase_OBJECTS) $(test_pr_titlecase_LDADD) $(LIBS)
 unictype/test-pr_unassigned_code_value.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_unassigned_code_value$(EXEEXT): $(test_pr_unassigned_code_value_OBJECTS) $(test_pr_unassigned_code_value_DEPENDENCIES) 
+
+test-pr_unassigned_code_value$(EXEEXT): $(test_pr_unassigned_code_value_OBJECTS) $(test_pr_unassigned_code_value_DEPENDENCIES) $(EXTRA_test_pr_unassigned_code_value_DEPENDENCIES) 
 	@rm -f test-pr_unassigned_code_value$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_unassigned_code_value_OBJECTS) $(test_pr_unassigned_code_value_LDADD) $(LIBS)
 unictype/test-pr_unified_ideograph.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_unified_ideograph$(EXEEXT): $(test_pr_unified_ideograph_OBJECTS) $(test_pr_unified_ideograph_DEPENDENCIES) 
+
+test-pr_unified_ideograph$(EXEEXT): $(test_pr_unified_ideograph_OBJECTS) $(test_pr_unified_ideograph_DEPENDENCIES) $(EXTRA_test_pr_unified_ideograph_DEPENDENCIES) 
 	@rm -f test-pr_unified_ideograph$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_unified_ideograph_OBJECTS) $(test_pr_unified_ideograph_LDADD) $(LIBS)
 unictype/test-pr_uppercase.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_uppercase$(EXEEXT): $(test_pr_uppercase_OBJECTS) $(test_pr_uppercase_DEPENDENCIES) 
+
+test-pr_uppercase$(EXEEXT): $(test_pr_uppercase_OBJECTS) $(test_pr_uppercase_DEPENDENCIES) $(EXTRA_test_pr_uppercase_DEPENDENCIES) 
 	@rm -f test-pr_uppercase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_uppercase_OBJECTS) $(test_pr_uppercase_LDADD) $(LIBS)
 unictype/test-pr_variation_selector.$(OBJEXT):  \
 	unictype/$(am__dirstamp) unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_variation_selector$(EXEEXT): $(test_pr_variation_selector_OBJECTS) $(test_pr_variation_selector_DEPENDENCIES) 
+
+test-pr_variation_selector$(EXEEXT): $(test_pr_variation_selector_OBJECTS) $(test_pr_variation_selector_DEPENDENCIES) $(EXTRA_test_pr_variation_selector_DEPENDENCIES) 
 	@rm -f test-pr_variation_selector$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_variation_selector_OBJECTS) $(test_pr_variation_selector_LDADD) $(LIBS)
 unictype/test-pr_white_space.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_white_space$(EXEEXT): $(test_pr_white_space_OBJECTS) $(test_pr_white_space_DEPENDENCIES) 
+
+test-pr_white_space$(EXEEXT): $(test_pr_white_space_OBJECTS) $(test_pr_white_space_DEPENDENCIES) $(EXTRA_test_pr_white_space_DEPENDENCIES) 
 	@rm -f test-pr_white_space$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_white_space_OBJECTS) $(test_pr_white_space_LDADD) $(LIBS)
 unictype/test-pr_xid_continue.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_xid_continue$(EXEEXT): $(test_pr_xid_continue_OBJECTS) $(test_pr_xid_continue_DEPENDENCIES) 
+
+test-pr_xid_continue$(EXEEXT): $(test_pr_xid_continue_OBJECTS) $(test_pr_xid_continue_DEPENDENCIES) $(EXTRA_test_pr_xid_continue_DEPENDENCIES) 
 	@rm -f test-pr_xid_continue$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_xid_continue_OBJECTS) $(test_pr_xid_continue_LDADD) $(LIBS)
 unictype/test-pr_xid_start.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_xid_start$(EXEEXT): $(test_pr_xid_start_OBJECTS) $(test_pr_xid_start_DEPENDENCIES) 
+
+test-pr_xid_start$(EXEEXT): $(test_pr_xid_start_OBJECTS) $(test_pr_xid_start_DEPENDENCIES) $(EXTRA_test_pr_xid_start_DEPENDENCIES) 
 	@rm -f test-pr_xid_start$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_xid_start_OBJECTS) $(test_pr_xid_start_LDADD) $(LIBS)
 unictype/test-pr_zero_width.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-pr_zero_width$(EXEEXT): $(test_pr_zero_width_OBJECTS) $(test_pr_zero_width_DEPENDENCIES) 
+
+test-pr_zero_width$(EXEEXT): $(test_pr_zero_width_OBJECTS) $(test_pr_zero_width_DEPENDENCIES) $(EXTRA_test_pr_zero_width_DEPENDENCIES) 
 	@rm -f test-pr_zero_width$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_pr_zero_width_OBJECTS) $(test_pr_zero_width_LDADD) $(LIBS)
-test-printf-frexp$(EXEEXT): $(test_printf_frexp_OBJECTS) $(test_printf_frexp_DEPENDENCIES) 
+
+test-printf-frexp$(EXEEXT): $(test_printf_frexp_OBJECTS) $(test_printf_frexp_DEPENDENCIES) $(EXTRA_test_printf_frexp_DEPENDENCIES) 
 	@rm -f test-printf-frexp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_printf_frexp_OBJECTS) $(test_printf_frexp_LDADD) $(LIBS)
-test-printf-frexpl$(EXEEXT): $(test_printf_frexpl_OBJECTS) $(test_printf_frexpl_DEPENDENCIES) 
+
+test-printf-frexpl$(EXEEXT): $(test_printf_frexpl_OBJECTS) $(test_printf_frexpl_DEPENDENCIES) $(EXTRA_test_printf_frexpl_DEPENDENCIES) 
 	@rm -f test-printf-frexpl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_printf_frexpl_OBJECTS) $(test_printf_frexpl_LDADD) $(LIBS)
 unictype/test-scripts.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-scripts$(EXEEXT): $(test_scripts_OBJECTS) $(test_scripts_DEPENDENCIES) 
+
+test-scripts$(EXEEXT): $(test_scripts_OBJECTS) $(test_scripts_DEPENDENCIES) $(EXTRA_test_scripts_DEPENDENCIES) 
 	@rm -f test-scripts$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_scripts_OBJECTS) $(test_scripts_LDADD) $(LIBS)
-test-setenv$(EXEEXT): $(test_setenv_OBJECTS) $(test_setenv_DEPENDENCIES) 
+
+test-setenv$(EXEEXT): $(test_setenv_OBJECTS) $(test_setenv_DEPENDENCIES) $(EXTRA_test_setenv_DEPENDENCIES) 
 	@rm -f test-setenv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_setenv_OBJECTS) $(test_setenv_LDADD) $(LIBS)
-test-signbit$(EXEEXT): $(test_signbit_OBJECTS) $(test_signbit_DEPENDENCIES) 
+
+test-setlocale1$(EXEEXT): $(test_setlocale1_OBJECTS) $(test_setlocale1_DEPENDENCIES) $(EXTRA_test_setlocale1_DEPENDENCIES) 
+	@rm -f test-setlocale1$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_setlocale1_OBJECTS) $(test_setlocale1_LDADD) $(LIBS)
+
+test-setlocale2$(EXEEXT): $(test_setlocale2_OBJECTS) $(test_setlocale2_DEPENDENCIES) $(EXTRA_test_setlocale2_DEPENDENCIES) 
+	@rm -f test-setlocale2$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_setlocale2_OBJECTS) $(test_setlocale2_LDADD) $(LIBS)
+
+test-signbit$(EXEEXT): $(test_signbit_OBJECTS) $(test_signbit_DEPENDENCIES) $(EXTRA_test_signbit_DEPENDENCIES) 
 	@rm -f test-signbit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_signbit_OBJECTS) $(test_signbit_LDADD) $(LIBS)
-test-stdbool$(EXEEXT): $(test_stdbool_OBJECTS) $(test_stdbool_DEPENDENCIES) 
+
+test-stdalign$(EXEEXT): $(test_stdalign_OBJECTS) $(test_stdalign_DEPENDENCIES) $(EXTRA_test_stdalign_DEPENDENCIES) 
+	@rm -f test-stdalign$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_stdalign_OBJECTS) $(test_stdalign_LDADD) $(LIBS)
+
+test-stdbool$(EXEEXT): $(test_stdbool_OBJECTS) $(test_stdbool_DEPENDENCIES) $(EXTRA_test_stdbool_DEPENDENCIES) 
 	@rm -f test-stdbool$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stdbool_OBJECTS) $(test_stdbool_LDADD) $(LIBS)
-test-stddef$(EXEEXT): $(test_stddef_OBJECTS) $(test_stddef_DEPENDENCIES) 
+
+test-stddef$(EXEEXT): $(test_stddef_OBJECTS) $(test_stddef_DEPENDENCIES) $(EXTRA_test_stddef_DEPENDENCIES) 
 	@rm -f test-stddef$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stddef_OBJECTS) $(test_stddef_LDADD) $(LIBS)
-test-stdint$(EXEEXT): $(test_stdint_OBJECTS) $(test_stdint_DEPENDENCIES) 
+
+test-stdint$(EXEEXT): $(test_stdint_OBJECTS) $(test_stdint_DEPENDENCIES) $(EXTRA_test_stdint_DEPENDENCIES) 
 	@rm -f test-stdint$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stdint_OBJECTS) $(test_stdint_LDADD) $(LIBS)
-test-stdlib$(EXEEXT): $(test_stdlib_OBJECTS) $(test_stdlib_DEPENDENCIES) 
+
+test-stdio$(EXEEXT): $(test_stdio_OBJECTS) $(test_stdio_DEPENDENCIES) $(EXTRA_test_stdio_DEPENDENCIES) 
+	@rm -f test-stdio$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_stdio_OBJECTS) $(test_stdio_LDADD) $(LIBS)
+
+test-stdlib$(EXEEXT): $(test_stdlib_OBJECTS) $(test_stdlib_DEPENDENCIES) $(EXTRA_test_stdlib_DEPENDENCIES) 
 	@rm -f test-stdlib$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stdlib_OBJECTS) $(test_stdlib_LDADD) $(LIBS)
-test-strerror$(EXEEXT): $(test_strerror_OBJECTS) $(test_strerror_DEPENDENCIES) 
+
+test-strerror$(EXEEXT): $(test_strerror_OBJECTS) $(test_strerror_DEPENDENCIES) $(EXTRA_test_strerror_DEPENDENCIES) 
 	@rm -f test-strerror$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strerror_OBJECTS) $(test_strerror_LDADD) $(LIBS)
-test-striconveh$(EXEEXT): $(test_striconveh_OBJECTS) $(test_striconveh_DEPENDENCIES) 
+
+test-striconveh$(EXEEXT): $(test_striconveh_OBJECTS) $(test_striconveh_DEPENDENCIES) $(EXTRA_test_striconveh_DEPENDENCIES) 
 	@rm -f test-striconveh$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_striconveh_OBJECTS) $(test_striconveh_LDADD) $(LIBS)
-test-striconveha$(EXEEXT): $(test_striconveha_OBJECTS) $(test_striconveha_DEPENDENCIES) 
+
+test-striconveha$(EXEEXT): $(test_striconveha_OBJECTS) $(test_striconveha_DEPENDENCIES) $(EXTRA_test_striconveha_DEPENDENCIES) 
 	@rm -f test-striconveha$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_striconveha_OBJECTS) $(test_striconveha_LDADD) $(LIBS)
-test-string$(EXEEXT): $(test_string_OBJECTS) $(test_string_DEPENDENCIES) 
+
+test-string$(EXEEXT): $(test_string_OBJECTS) $(test_string_DEPENDENCIES) $(EXTRA_test_string_DEPENDENCIES) 
 	@rm -f test-string$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_string_OBJECTS) $(test_string_LDADD) $(LIBS)
-test-strncat$(EXEEXT): $(test_strncat_OBJECTS) $(test_strncat_DEPENDENCIES) 
+
+test-strncat$(EXEEXT): $(test_strncat_OBJECTS) $(test_strncat_DEPENDENCIES) $(EXTRA_test_strncat_DEPENDENCIES) 
 	@rm -f test-strncat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_strncat_OBJECTS) $(test_strncat_LDADD) $(LIBS)
+
+test-strstr$(EXEEXT): $(test_strstr_OBJECTS) $(test_strstr_DEPENDENCIES) $(EXTRA_test_strstr_DEPENDENCIES) 
+	@rm -f test-strstr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_strstr_OBJECTS) $(test_strstr_LDADD) $(LIBS)
 unictype/test-sy_c_ident.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-sy_c_ident$(EXEEXT): $(test_sy_c_ident_OBJECTS) $(test_sy_c_ident_DEPENDENCIES) 
+
+test-sy_c_ident$(EXEEXT): $(test_sy_c_ident_OBJECTS) $(test_sy_c_ident_DEPENDENCIES) $(EXTRA_test_sy_c_ident_DEPENDENCIES) 
 	@rm -f test-sy_c_ident$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sy_c_ident_OBJECTS) $(test_sy_c_ident_LDADD) $(LIBS)
 unictype/test-sy_c_whitespace.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-sy_c_whitespace$(EXEEXT): $(test_sy_c_whitespace_OBJECTS) $(test_sy_c_whitespace_DEPENDENCIES) 
+
+test-sy_c_whitespace$(EXEEXT): $(test_sy_c_whitespace_OBJECTS) $(test_sy_c_whitespace_DEPENDENCIES) $(EXTRA_test_sy_c_whitespace_DEPENDENCIES) 
 	@rm -f test-sy_c_whitespace$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sy_c_whitespace_OBJECTS) $(test_sy_c_whitespace_LDADD) $(LIBS)
 unictype/test-sy_java_ident.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-sy_java_ident$(EXEEXT): $(test_sy_java_ident_OBJECTS) $(test_sy_java_ident_DEPENDENCIES) 
+
+test-sy_java_ident$(EXEEXT): $(test_sy_java_ident_OBJECTS) $(test_sy_java_ident_DEPENDENCIES) $(EXTRA_test_sy_java_ident_DEPENDENCIES) 
 	@rm -f test-sy_java_ident$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sy_java_ident_OBJECTS) $(test_sy_java_ident_LDADD) $(LIBS)
 unictype/test-sy_java_whitespace.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
-test-sy_java_whitespace$(EXEEXT): $(test_sy_java_whitespace_OBJECTS) $(test_sy_java_whitespace_DEPENDENCIES) 
+
+test-sy_java_whitespace$(EXEEXT): $(test_sy_java_whitespace_OBJECTS) $(test_sy_java_whitespace_DEPENDENCIES) $(EXTRA_test_sy_java_whitespace_DEPENDENCIES) 
 	@rm -f test-sy_java_whitespace$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sy_java_whitespace_OBJECTS) $(test_sy_java_whitespace_LDADD) $(LIBS)
+
+test-sys_types$(EXEEXT): $(test_sys_types_OBJECTS) $(test_sys_types_DEPENDENCIES) $(EXTRA_test_sys_types_DEPENDENCIES) 
+	@rm -f test-sys_types$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_sys_types_OBJECTS) $(test_sys_types_LDADD) $(LIBS)
+
+test-thread_create$(EXEEXT): $(test_thread_create_OBJECTS) $(test_thread_create_DEPENDENCIES) $(EXTRA_test_thread_create_DEPENDENCIES) 
+	@rm -f test-thread_create$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_thread_create_OBJECTS) $(test_thread_create_LDADD) $(LIBS)
+
+test-thread_self$(EXEEXT): $(test_thread_self_OBJECTS) $(test_thread_self_DEPENDENCIES) $(EXTRA_test_thread_self_DEPENDENCIES) 
+	@rm -f test-thread_self$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_thread_self_OBJECTS) $(test_thread_self_LDADD) $(LIBS)
 unistdio/$(am__dirstamp):
 	@$(MKDIR_P) unistdio
 	@: > unistdio/$(am__dirstamp)
@@ -6115,22 +7646,26 @@ unistdio/$(DEPDIR)/$(am__dirstamp):
 	@: > unistdio/$(DEPDIR)/$(am__dirstamp)
 unistdio/test-u16-asnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u16-asnprintf1$(EXEEXT): $(test_u16_asnprintf1_OBJECTS) $(test_u16_asnprintf1_DEPENDENCIES) 
+
+test-u16-asnprintf1$(EXEEXT): $(test_u16_asnprintf1_OBJECTS) $(test_u16_asnprintf1_DEPENDENCIES) $(EXTRA_test_u16_asnprintf1_DEPENDENCIES) 
 	@rm -f test-u16-asnprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_asnprintf1_OBJECTS) $(test_u16_asnprintf1_LDADD) $(LIBS)
 unicase/test-u16-casecmp.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u16-casecmp$(EXEEXT): $(test_u16_casecmp_OBJECTS) $(test_u16_casecmp_DEPENDENCIES) 
+
+test-u16-casecmp$(EXEEXT): $(test_u16_casecmp_OBJECTS) $(test_u16_casecmp_DEPENDENCIES) $(EXTRA_test_u16_casecmp_DEPENDENCIES) 
 	@rm -f test-u16-casecmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_casecmp_OBJECTS) $(test_u16_casecmp_LDADD) $(LIBS)
 unicase/test-u16-casecoll.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u16-casecoll$(EXEEXT): $(test_u16_casecoll_OBJECTS) $(test_u16_casecoll_DEPENDENCIES) 
+
+test-u16-casecoll$(EXEEXT): $(test_u16_casecoll_OBJECTS) $(test_u16_casecoll_DEPENDENCIES) $(EXTRA_test_u16_casecoll_DEPENDENCIES) 
 	@rm -f test-u16-casecoll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_casecoll_OBJECTS) $(test_u16_casecoll_LDADD) $(LIBS)
 unicase/test-u16-casefold.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u16-casefold$(EXEEXT): $(test_u16_casefold_OBJECTS) $(test_u16_casefold_DEPENDENCIES) 
+
+test-u16-casefold$(EXEEXT): $(test_u16_casefold_OBJECTS) $(test_u16_casefold_DEPENDENCIES) $(EXTRA_test_u16_casefold_DEPENDENCIES) 
 	@rm -f test-u16-casefold$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_casefold_OBJECTS) $(test_u16_casefold_LDADD) $(LIBS)
 unistr/$(am__dirstamp):
@@ -6141,22 +7676,26 @@ unistr/$(DEPDIR)/$(am__dirstamp):
 	@: > unistr/$(DEPDIR)/$(am__dirstamp)
 unistr/test-u16-check.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-check$(EXEEXT): $(test_u16_check_OBJECTS) $(test_u16_check_DEPENDENCIES) 
+
+test-u16-check$(EXEEXT): $(test_u16_check_OBJECTS) $(test_u16_check_DEPENDENCIES) $(EXTRA_test_u16_check_DEPENDENCIES) 
 	@rm -f test-u16-check$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_check_OBJECTS) $(test_u16_check_LDADD) $(LIBS)
 unistr/test-u16-chr.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-chr$(EXEEXT): $(test_u16_chr_OBJECTS) $(test_u16_chr_DEPENDENCIES) 
+
+test-u16-chr$(EXEEXT): $(test_u16_chr_OBJECTS) $(test_u16_chr_DEPENDENCIES) $(EXTRA_test_u16_chr_DEPENDENCIES) 
 	@rm -f test-u16-chr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_chr_OBJECTS) $(test_u16_chr_LDADD) $(LIBS)
 unistr/test-u16-cmp.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-cmp$(EXEEXT): $(test_u16_cmp_OBJECTS) $(test_u16_cmp_DEPENDENCIES) 
+
+test-u16-cmp$(EXEEXT): $(test_u16_cmp_OBJECTS) $(test_u16_cmp_DEPENDENCIES) $(EXTRA_test_u16_cmp_DEPENDENCIES) 
 	@rm -f test-u16-cmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_cmp_OBJECTS) $(test_u16_cmp_LDADD) $(LIBS)
 unistr/test-u16-cmp2.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-cmp2$(EXEEXT): $(test_u16_cmp2_OBJECTS) $(test_u16_cmp2_DEPENDENCIES) 
+
+test-u16-cmp2$(EXEEXT): $(test_u16_cmp2_OBJECTS) $(test_u16_cmp2_DEPENDENCIES) $(EXTRA_test_u16_cmp2_DEPENDENCIES) 
 	@rm -f test-u16-cmp2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_cmp2_OBJECTS) $(test_u16_cmp2_LDADD) $(LIBS)
 uniconv/$(am__dirstamp):
@@ -6167,92 +7706,134 @@ uniconv/$(DEPDIR)/$(am__dirstamp):
 	@: > uniconv/$(DEPDIR)/$(am__dirstamp)
 uniconv/test-u16-conv-from-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
-test-u16-conv-from-enc$(EXEEXT): $(test_u16_conv_from_enc_OBJECTS) $(test_u16_conv_from_enc_DEPENDENCIES) 
+
+test-u16-conv-from-enc$(EXEEXT): $(test_u16_conv_from_enc_OBJECTS) $(test_u16_conv_from_enc_DEPENDENCIES) $(EXTRA_test_u16_conv_from_enc_DEPENDENCIES) 
 	@rm -f test-u16-conv-from-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_conv_from_enc_OBJECTS) $(test_u16_conv_from_enc_LDADD) $(LIBS)
 uniconv/test-u16-conv-to-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
-test-u16-conv-to-enc$(EXEEXT): $(test_u16_conv_to_enc_OBJECTS) $(test_u16_conv_to_enc_DEPENDENCIES) 
+
+test-u16-conv-to-enc$(EXEEXT): $(test_u16_conv_to_enc_OBJECTS) $(test_u16_conv_to_enc_DEPENDENCIES) $(EXTRA_test_u16_conv_to_enc_DEPENDENCIES) 
 	@rm -f test-u16-conv-to-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_conv_to_enc_OBJECTS) $(test_u16_conv_to_enc_LDADD) $(LIBS)
 unistr/test-u16-cpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-cpy$(EXEEXT): $(test_u16_cpy_OBJECTS) $(test_u16_cpy_DEPENDENCIES) 
+
+test-u16-cpy$(EXEEXT): $(test_u16_cpy_OBJECTS) $(test_u16_cpy_DEPENDENCIES) $(EXTRA_test_u16_cpy_DEPENDENCIES) 
 	@rm -f test-u16-cpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_cpy_OBJECTS) $(test_u16_cpy_LDADD) $(LIBS)
 unistr/test-u16-cpy-alloc.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-cpy-alloc$(EXEEXT): $(test_u16_cpy_alloc_OBJECTS) $(test_u16_cpy_alloc_DEPENDENCIES) 
+
+test-u16-cpy-alloc$(EXEEXT): $(test_u16_cpy_alloc_OBJECTS) $(test_u16_cpy_alloc_DEPENDENCIES) $(EXTRA_test_u16_cpy_alloc_DEPENDENCIES) 
 	@rm -f test-u16-cpy-alloc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_cpy_alloc_OBJECTS) $(test_u16_cpy_alloc_LDADD) $(LIBS)
+unigbrk/$(am__dirstamp):
+	@$(MKDIR_P) unigbrk
+	@: > unigbrk/$(am__dirstamp)
+unigbrk/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) unigbrk/$(DEPDIR)
+	@: > unigbrk/$(DEPDIR)/$(am__dirstamp)
+unigbrk/test-u16-grapheme-breaks.$(OBJEXT): unigbrk/$(am__dirstamp) \
+	unigbrk/$(DEPDIR)/$(am__dirstamp)
+
+test-u16-grapheme-breaks$(EXEEXT): $(test_u16_grapheme_breaks_OBJECTS) $(test_u16_grapheme_breaks_DEPENDENCIES) $(EXTRA_test_u16_grapheme_breaks_DEPENDENCIES) 
+	@rm -f test-u16-grapheme-breaks$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_grapheme_breaks_OBJECTS) $(test_u16_grapheme_breaks_LDADD) $(LIBS)
+unigbrk/test-u16-grapheme-next.$(OBJEXT): unigbrk/$(am__dirstamp) \
+	unigbrk/$(DEPDIR)/$(am__dirstamp)
+
+test-u16-grapheme-next$(EXEEXT): $(test_u16_grapheme_next_OBJECTS) $(test_u16_grapheme_next_DEPENDENCIES) $(EXTRA_test_u16_grapheme_next_DEPENDENCIES) 
+	@rm -f test-u16-grapheme-next$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_grapheme_next_OBJECTS) $(test_u16_grapheme_next_LDADD) $(LIBS)
+unigbrk/test-u16-grapheme-prev.$(OBJEXT): unigbrk/$(am__dirstamp) \
+	unigbrk/$(DEPDIR)/$(am__dirstamp)
+
+test-u16-grapheme-prev$(EXEEXT): $(test_u16_grapheme_prev_OBJECTS) $(test_u16_grapheme_prev_DEPENDENCIES) $(EXTRA_test_u16_grapheme_prev_DEPENDENCIES) 
+	@rm -f test-u16-grapheme-prev$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_grapheme_prev_OBJECTS) $(test_u16_grapheme_prev_LDADD) $(LIBS)
 unicase/test-u16-is-cased.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u16-is-cased$(EXEEXT): $(test_u16_is_cased_OBJECTS) $(test_u16_is_cased_DEPENDENCIES) 
+
+test-u16-is-cased$(EXEEXT): $(test_u16_is_cased_OBJECTS) $(test_u16_is_cased_DEPENDENCIES) $(EXTRA_test_u16_is_cased_DEPENDENCIES) 
 	@rm -f test-u16-is-cased$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_is_cased_OBJECTS) $(test_u16_is_cased_LDADD) $(LIBS)
 unicase/test-u16-is-casefolded.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u16-is-casefolded$(EXEEXT): $(test_u16_is_casefolded_OBJECTS) $(test_u16_is_casefolded_DEPENDENCIES) 
+
+test-u16-is-casefolded$(EXEEXT): $(test_u16_is_casefolded_OBJECTS) $(test_u16_is_casefolded_DEPENDENCIES) $(EXTRA_test_u16_is_casefolded_DEPENDENCIES) 
 	@rm -f test-u16-is-casefolded$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_is_casefolded_OBJECTS) $(test_u16_is_casefolded_LDADD) $(LIBS)
 unicase/test-u16-is-lowercase.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u16-is-lowercase$(EXEEXT): $(test_u16_is_lowercase_OBJECTS) $(test_u16_is_lowercase_DEPENDENCIES) 
+
+test-u16-is-lowercase$(EXEEXT): $(test_u16_is_lowercase_OBJECTS) $(test_u16_is_lowercase_DEPENDENCIES) $(EXTRA_test_u16_is_lowercase_DEPENDENCIES) 
 	@rm -f test-u16-is-lowercase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_is_lowercase_OBJECTS) $(test_u16_is_lowercase_LDADD) $(LIBS)
 unicase/test-u16-is-titlecase.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u16-is-titlecase$(EXEEXT): $(test_u16_is_titlecase_OBJECTS) $(test_u16_is_titlecase_DEPENDENCIES) 
+
+test-u16-is-titlecase$(EXEEXT): $(test_u16_is_titlecase_OBJECTS) $(test_u16_is_titlecase_DEPENDENCIES) $(EXTRA_test_u16_is_titlecase_DEPENDENCIES) 
 	@rm -f test-u16-is-titlecase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_is_titlecase_OBJECTS) $(test_u16_is_titlecase_LDADD) $(LIBS)
 unicase/test-u16-is-uppercase.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u16-is-uppercase$(EXEEXT): $(test_u16_is_uppercase_OBJECTS) $(test_u16_is_uppercase_DEPENDENCIES) 
+
+test-u16-is-uppercase$(EXEEXT): $(test_u16_is_uppercase_OBJECTS) $(test_u16_is_uppercase_DEPENDENCIES) $(EXTRA_test_u16_is_uppercase_DEPENDENCIES) 
 	@rm -f test-u16-is-uppercase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_is_uppercase_OBJECTS) $(test_u16_is_uppercase_LDADD) $(LIBS)
 unistr/test-u16-mblen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-mblen$(EXEEXT): $(test_u16_mblen_OBJECTS) $(test_u16_mblen_DEPENDENCIES) 
+
+test-u16-mblen$(EXEEXT): $(test_u16_mblen_OBJECTS) $(test_u16_mblen_DEPENDENCIES) $(EXTRA_test_u16_mblen_DEPENDENCIES) 
 	@rm -f test-u16-mblen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_mblen_OBJECTS) $(test_u16_mblen_LDADD) $(LIBS)
 unistr/test-u16-mbsnlen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-mbsnlen$(EXEEXT): $(test_u16_mbsnlen_OBJECTS) $(test_u16_mbsnlen_DEPENDENCIES) 
+
+test-u16-mbsnlen$(EXEEXT): $(test_u16_mbsnlen_OBJECTS) $(test_u16_mbsnlen_DEPENDENCIES) $(EXTRA_test_u16_mbsnlen_DEPENDENCIES) 
 	@rm -f test-u16-mbsnlen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_mbsnlen_OBJECTS) $(test_u16_mbsnlen_LDADD) $(LIBS)
 unistr/test-u16-mbtouc.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-mbtouc$(EXEEXT): $(test_u16_mbtouc_OBJECTS) $(test_u16_mbtouc_DEPENDENCIES) 
+
+test-u16-mbtouc$(EXEEXT): $(test_u16_mbtouc_OBJECTS) $(test_u16_mbtouc_DEPENDENCIES) $(EXTRA_test_u16_mbtouc_DEPENDENCIES) 
 	@rm -f test-u16-mbtouc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_mbtouc_OBJECTS) $(test_u16_mbtouc_LDADD) $(LIBS)
 unistr/test-u16-mbtouc-unsafe.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-mbtouc-unsafe$(EXEEXT): $(test_u16_mbtouc_unsafe_OBJECTS) $(test_u16_mbtouc_unsafe_DEPENDENCIES) 
+
+test-u16-mbtouc-unsafe$(EXEEXT): $(test_u16_mbtouc_unsafe_OBJECTS) $(test_u16_mbtouc_unsafe_DEPENDENCIES) $(EXTRA_test_u16_mbtouc_unsafe_DEPENDENCIES) 
 	@rm -f test-u16-mbtouc-unsafe$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_mbtouc_unsafe_OBJECTS) $(test_u16_mbtouc_unsafe_LDADD) $(LIBS)
 unistr/test-u16-mbtoucr.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-mbtoucr$(EXEEXT): $(test_u16_mbtoucr_OBJECTS) $(test_u16_mbtoucr_DEPENDENCIES) 
+
+test-u16-mbtoucr$(EXEEXT): $(test_u16_mbtoucr_OBJECTS) $(test_u16_mbtoucr_DEPENDENCIES) $(EXTRA_test_u16_mbtoucr_DEPENDENCIES) 
 	@rm -f test-u16-mbtoucr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_mbtoucr_OBJECTS) $(test_u16_mbtoucr_LDADD) $(LIBS)
 unistr/test-u16-move.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-move$(EXEEXT): $(test_u16_move_OBJECTS) $(test_u16_move_DEPENDENCIES) 
+
+test-u16-move$(EXEEXT): $(test_u16_move_OBJECTS) $(test_u16_move_DEPENDENCIES) $(EXTRA_test_u16_move_DEPENDENCIES) 
 	@rm -f test-u16-move$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_move_OBJECTS) $(test_u16_move_LDADD) $(LIBS)
 unistr/test-u16-next.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-next$(EXEEXT): $(test_u16_next_OBJECTS) $(test_u16_next_DEPENDENCIES) 
+
+test-u16-next$(EXEEXT): $(test_u16_next_OBJECTS) $(test_u16_next_DEPENDENCIES) $(EXTRA_test_u16_next_DEPENDENCIES) 
 	@rm -f test-u16-next$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_next_OBJECTS) $(test_u16_next_LDADD) $(LIBS)
 uninorm/test-u16-normcmp.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-u16-normcmp$(EXEEXT): $(test_u16_normcmp_OBJECTS) $(test_u16_normcmp_DEPENDENCIES) 
+
+test-u16-normcmp$(EXEEXT): $(test_u16_normcmp_OBJECTS) $(test_u16_normcmp_DEPENDENCIES) $(EXTRA_test_u16_normcmp_DEPENDENCIES) 
 	@rm -f test-u16-normcmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_normcmp_OBJECTS) $(test_u16_normcmp_LDADD) $(LIBS)
 uninorm/test-u16-normcoll.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-u16-normcoll$(EXEEXT): $(test_u16_normcoll_OBJECTS) $(test_u16_normcoll_DEPENDENCIES) 
+
+test-u16-normcoll$(EXEEXT): $(test_u16_normcoll_OBJECTS) $(test_u16_normcoll_DEPENDENCIES) $(EXTRA_test_u16_normcoll_DEPENDENCIES) 
 	@rm -f test-u16-normcoll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_normcoll_OBJECTS) $(test_u16_normcoll_LDADD) $(LIBS)
 unilbrk/$(am__dirstamp):
@@ -6263,99 +7844,136 @@ unilbrk/$(DEPDIR)/$(am__dirstamp):
 	@: > unilbrk/$(DEPDIR)/$(am__dirstamp)
 unilbrk/test-u16-possible-linebreaks.$(OBJEXT):  \
 	unilbrk/$(am__dirstamp) unilbrk/$(DEPDIR)/$(am__dirstamp)
-test-u16-possible-linebreaks$(EXEEXT): $(test_u16_possible_linebreaks_OBJECTS) $(test_u16_possible_linebreaks_DEPENDENCIES) 
+
+test-u16-possible-linebreaks$(EXEEXT): $(test_u16_possible_linebreaks_OBJECTS) $(test_u16_possible_linebreaks_DEPENDENCIES) $(EXTRA_test_u16_possible_linebreaks_DEPENDENCIES) 
 	@rm -f test-u16-possible-linebreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_possible_linebreaks_OBJECTS) $(test_u16_possible_linebreaks_LDADD) $(LIBS)
 unistr/test-u16-prev.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-prev$(EXEEXT): $(test_u16_prev_OBJECTS) $(test_u16_prev_DEPENDENCIES) 
+
+test-u16-prev$(EXEEXT): $(test_u16_prev_OBJECTS) $(test_u16_prev_DEPENDENCIES) $(EXTRA_test_u16_prev_DEPENDENCIES) 
 	@rm -f test-u16-prev$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_prev_OBJECTS) $(test_u16_prev_LDADD) $(LIBS)
 unistr/test-u16-set.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-set$(EXEEXT): $(test_u16_set_OBJECTS) $(test_u16_set_DEPENDENCIES) 
+
+test-u16-set$(EXEEXT): $(test_u16_set_OBJECTS) $(test_u16_set_DEPENDENCIES) $(EXTRA_test_u16_set_DEPENDENCIES) 
 	@rm -f test-u16-set$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_set_OBJECTS) $(test_u16_set_LDADD) $(LIBS)
 unistr/test-u16-stpcpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-stpcpy$(EXEEXT): $(test_u16_stpcpy_OBJECTS) $(test_u16_stpcpy_DEPENDENCIES) 
+
+test-u16-stpcpy$(EXEEXT): $(test_u16_stpcpy_OBJECTS) $(test_u16_stpcpy_DEPENDENCIES) $(EXTRA_test_u16_stpcpy_DEPENDENCIES) 
 	@rm -f test-u16-stpcpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_stpcpy_OBJECTS) $(test_u16_stpcpy_LDADD) $(LIBS)
 unistr/test-u16-stpncpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-stpncpy$(EXEEXT): $(test_u16_stpncpy_OBJECTS) $(test_u16_stpncpy_DEPENDENCIES) 
+
+test-u16-stpncpy$(EXEEXT): $(test_u16_stpncpy_OBJECTS) $(test_u16_stpncpy_DEPENDENCIES) $(EXTRA_test_u16_stpncpy_DEPENDENCIES) 
 	@rm -f test-u16-stpncpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_stpncpy_OBJECTS) $(test_u16_stpncpy_LDADD) $(LIBS)
 unistr/test-u16-strcat.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-strcat$(EXEEXT): $(test_u16_strcat_OBJECTS) $(test_u16_strcat_DEPENDENCIES) 
+
+test-u16-strcat$(EXEEXT): $(test_u16_strcat_OBJECTS) $(test_u16_strcat_DEPENDENCIES) $(EXTRA_test_u16_strcat_DEPENDENCIES) 
 	@rm -f test-u16-strcat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strcat_OBJECTS) $(test_u16_strcat_LDADD) $(LIBS)
+unistr/test-u16-strchr.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+
+test-u16-strchr$(EXEEXT): $(test_u16_strchr_OBJECTS) $(test_u16_strchr_DEPENDENCIES) $(EXTRA_test_u16_strchr_DEPENDENCIES) 
+	@rm -f test-u16-strchr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strchr_OBJECTS) $(test_u16_strchr_LDADD) $(LIBS)
 unistr/test-u16-strcmp.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-strcmp$(EXEEXT): $(test_u16_strcmp_OBJECTS) $(test_u16_strcmp_DEPENDENCIES) 
+
+test-u16-strcmp$(EXEEXT): $(test_u16_strcmp_OBJECTS) $(test_u16_strcmp_DEPENDENCIES) $(EXTRA_test_u16_strcmp_DEPENDENCIES) 
 	@rm -f test-u16-strcmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strcmp_OBJECTS) $(test_u16_strcmp_LDADD) $(LIBS)
 unistr/test-u16-strcoll.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-strcoll$(EXEEXT): $(test_u16_strcoll_OBJECTS) $(test_u16_strcoll_DEPENDENCIES) 
+
+test-u16-strcoll$(EXEEXT): $(test_u16_strcoll_OBJECTS) $(test_u16_strcoll_DEPENDENCIES) $(EXTRA_test_u16_strcoll_DEPENDENCIES) 
 	@rm -f test-u16-strcoll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strcoll_OBJECTS) $(test_u16_strcoll_LDADD) $(LIBS)
 uniconv/test-u16-strconv-from-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
-test-u16-strconv-from-enc$(EXEEXT): $(test_u16_strconv_from_enc_OBJECTS) $(test_u16_strconv_from_enc_DEPENDENCIES) 
+
+test-u16-strconv-from-enc$(EXEEXT): $(test_u16_strconv_from_enc_OBJECTS) $(test_u16_strconv_from_enc_DEPENDENCIES) $(EXTRA_test_u16_strconv_from_enc_DEPENDENCIES) 
 	@rm -f test-u16-strconv-from-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strconv_from_enc_OBJECTS) $(test_u16_strconv_from_enc_LDADD) $(LIBS)
 uniconv/test-u16-strconv-to-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
-test-u16-strconv-to-enc$(EXEEXT): $(test_u16_strconv_to_enc_OBJECTS) $(test_u16_strconv_to_enc_DEPENDENCIES) 
+
+test-u16-strconv-to-enc$(EXEEXT): $(test_u16_strconv_to_enc_OBJECTS) $(test_u16_strconv_to_enc_DEPENDENCIES) $(EXTRA_test_u16_strconv_to_enc_DEPENDENCIES) 
 	@rm -f test-u16-strconv-to-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strconv_to_enc_OBJECTS) $(test_u16_strconv_to_enc_LDADD) $(LIBS)
 unistr/test-u16-strcpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-strcpy$(EXEEXT): $(test_u16_strcpy_OBJECTS) $(test_u16_strcpy_DEPENDENCIES) 
+
+test-u16-strcpy$(EXEEXT): $(test_u16_strcpy_OBJECTS) $(test_u16_strcpy_DEPENDENCIES) $(EXTRA_test_u16_strcpy_DEPENDENCIES) 
 	@rm -f test-u16-strcpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strcpy_OBJECTS) $(test_u16_strcpy_LDADD) $(LIBS)
 unistr/test-u16-strdup.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-strdup$(EXEEXT): $(test_u16_strdup_OBJECTS) $(test_u16_strdup_DEPENDENCIES) 
+
+test-u16-strdup$(EXEEXT): $(test_u16_strdup_OBJECTS) $(test_u16_strdup_DEPENDENCIES) $(EXTRA_test_u16_strdup_DEPENDENCIES) 
 	@rm -f test-u16-strdup$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strdup_OBJECTS) $(test_u16_strdup_LDADD) $(LIBS)
 unistr/test-u16-strlen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-strlen$(EXEEXT): $(test_u16_strlen_OBJECTS) $(test_u16_strlen_DEPENDENCIES) 
+
+test-u16-strlen$(EXEEXT): $(test_u16_strlen_OBJECTS) $(test_u16_strlen_DEPENDENCIES) $(EXTRA_test_u16_strlen_DEPENDENCIES) 
 	@rm -f test-u16-strlen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strlen_OBJECTS) $(test_u16_strlen_LDADD) $(LIBS)
 unistr/test-u16-strmblen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-strmblen$(EXEEXT): $(test_u16_strmblen_OBJECTS) $(test_u16_strmblen_DEPENDENCIES) 
+
+test-u16-strmblen$(EXEEXT): $(test_u16_strmblen_OBJECTS) $(test_u16_strmblen_DEPENDENCIES) $(EXTRA_test_u16_strmblen_DEPENDENCIES) 
 	@rm -f test-u16-strmblen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strmblen_OBJECTS) $(test_u16_strmblen_LDADD) $(LIBS)
 unistr/test-u16-strmbtouc.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-strmbtouc$(EXEEXT): $(test_u16_strmbtouc_OBJECTS) $(test_u16_strmbtouc_DEPENDENCIES) 
+
+test-u16-strmbtouc$(EXEEXT): $(test_u16_strmbtouc_OBJECTS) $(test_u16_strmbtouc_DEPENDENCIES) $(EXTRA_test_u16_strmbtouc_DEPENDENCIES) 
 	@rm -f test-u16-strmbtouc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strmbtouc_OBJECTS) $(test_u16_strmbtouc_LDADD) $(LIBS)
 unistr/test-u16-strncat.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-strncat$(EXEEXT): $(test_u16_strncat_OBJECTS) $(test_u16_strncat_DEPENDENCIES) 
+
+test-u16-strncat$(EXEEXT): $(test_u16_strncat_OBJECTS) $(test_u16_strncat_DEPENDENCIES) $(EXTRA_test_u16_strncat_DEPENDENCIES) 
 	@rm -f test-u16-strncat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strncat_OBJECTS) $(test_u16_strncat_LDADD) $(LIBS)
 unistr/test-u16-strncmp.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-strncmp$(EXEEXT): $(test_u16_strncmp_OBJECTS) $(test_u16_strncmp_DEPENDENCIES) 
+
+test-u16-strncmp$(EXEEXT): $(test_u16_strncmp_OBJECTS) $(test_u16_strncmp_DEPENDENCIES) $(EXTRA_test_u16_strncmp_DEPENDENCIES) 
 	@rm -f test-u16-strncmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strncmp_OBJECTS) $(test_u16_strncmp_LDADD) $(LIBS)
 unistr/test-u16-strncpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-strncpy$(EXEEXT): $(test_u16_strncpy_OBJECTS) $(test_u16_strncpy_DEPENDENCIES) 
+
+test-u16-strncpy$(EXEEXT): $(test_u16_strncpy_OBJECTS) $(test_u16_strncpy_DEPENDENCIES) $(EXTRA_test_u16_strncpy_DEPENDENCIES) 
 	@rm -f test-u16-strncpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strncpy_OBJECTS) $(test_u16_strncpy_LDADD) $(LIBS)
 unistr/test-u16-strnlen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-strnlen$(EXEEXT): $(test_u16_strnlen_OBJECTS) $(test_u16_strnlen_DEPENDENCIES) 
+
+test-u16-strnlen$(EXEEXT): $(test_u16_strnlen_OBJECTS) $(test_u16_strnlen_DEPENDENCIES) $(EXTRA_test_u16_strnlen_DEPENDENCIES) 
 	@rm -f test-u16-strnlen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strnlen_OBJECTS) $(test_u16_strnlen_LDADD) $(LIBS)
+unistr/test-u16-strstr.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+
+test-u16-strstr$(EXEEXT): $(test_u16_strstr_OBJECTS) $(test_u16_strstr_DEPENDENCIES) $(EXTRA_test_u16_strstr_DEPENDENCIES) 
+	@rm -f test-u16-strstr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strstr_OBJECTS) $(test_u16_strstr_LDADD) $(LIBS)
+unistr/test-u16-strtok.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+
+test-u16-strtok$(EXEEXT): $(test_u16_strtok_OBJECTS) $(test_u16_strtok_DEPENDENCIES) $(EXTRA_test_u16_strtok_DEPENDENCIES) 
+	@rm -f test-u16-strtok$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strtok_OBJECTS) $(test_u16_strtok_LDADD) $(LIBS)
 uniwidth/$(am__dirstamp):
 	@$(MKDIR_P) uniwidth
 	@: > uniwidth/$(am__dirstamp)
@@ -6364,77 +7982,92 @@ uniwidth/$(DEPDIR)/$(am__dirstamp):
 	@: > uniwidth/$(DEPDIR)/$(am__dirstamp)
 uniwidth/test-u16-strwidth.$(OBJEXT): uniwidth/$(am__dirstamp) \
 	uniwidth/$(DEPDIR)/$(am__dirstamp)
-test-u16-strwidth$(EXEEXT): $(test_u16_strwidth_OBJECTS) $(test_u16_strwidth_DEPENDENCIES) 
+
+test-u16-strwidth$(EXEEXT): $(test_u16_strwidth_OBJECTS) $(test_u16_strwidth_DEPENDENCIES) $(EXTRA_test_u16_strwidth_DEPENDENCIES) 
 	@rm -f test-u16-strwidth$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strwidth_OBJECTS) $(test_u16_strwidth_LDADD) $(LIBS)
 unistr/test-u16-to-u32.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-to-u32$(EXEEXT): $(test_u16_to_u32_OBJECTS) $(test_u16_to_u32_DEPENDENCIES) 
+
+test-u16-to-u32$(EXEEXT): $(test_u16_to_u32_OBJECTS) $(test_u16_to_u32_DEPENDENCIES) $(EXTRA_test_u16_to_u32_DEPENDENCIES) 
 	@rm -f test-u16-to-u32$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_to_u32_OBJECTS) $(test_u16_to_u32_LDADD) $(LIBS)
 unistr/test-u16-to-u8.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-to-u8$(EXEEXT): $(test_u16_to_u8_OBJECTS) $(test_u16_to_u8_DEPENDENCIES) 
+
+test-u16-to-u8$(EXEEXT): $(test_u16_to_u8_OBJECTS) $(test_u16_to_u8_DEPENDENCIES) $(EXTRA_test_u16_to_u8_DEPENDENCIES) 
 	@rm -f test-u16-to-u8$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_to_u8_OBJECTS) $(test_u16_to_u8_LDADD) $(LIBS)
 unicase/test-u16-tolower.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u16-tolower$(EXEEXT): $(test_u16_tolower_OBJECTS) $(test_u16_tolower_DEPENDENCIES) 
+
+test-u16-tolower$(EXEEXT): $(test_u16_tolower_OBJECTS) $(test_u16_tolower_DEPENDENCIES) $(EXTRA_test_u16_tolower_DEPENDENCIES) 
 	@rm -f test-u16-tolower$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_tolower_OBJECTS) $(test_u16_tolower_LDADD) $(LIBS)
 unicase/test-u16-totitle.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u16-totitle$(EXEEXT): $(test_u16_totitle_OBJECTS) $(test_u16_totitle_DEPENDENCIES) 
+
+test-u16-totitle$(EXEEXT): $(test_u16_totitle_OBJECTS) $(test_u16_totitle_DEPENDENCIES) $(EXTRA_test_u16_totitle_DEPENDENCIES) 
 	@rm -f test-u16-totitle$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_totitle_OBJECTS) $(test_u16_totitle_LDADD) $(LIBS)
 unicase/test-u16-toupper.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u16-toupper$(EXEEXT): $(test_u16_toupper_OBJECTS) $(test_u16_toupper_DEPENDENCIES) 
+
+test-u16-toupper$(EXEEXT): $(test_u16_toupper_OBJECTS) $(test_u16_toupper_DEPENDENCIES) $(EXTRA_test_u16_toupper_DEPENDENCIES) 
 	@rm -f test-u16-toupper$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_toupper_OBJECTS) $(test_u16_toupper_LDADD) $(LIBS)
 unistr/test-u16-uctomb.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u16-uctomb$(EXEEXT): $(test_u16_uctomb_OBJECTS) $(test_u16_uctomb_DEPENDENCIES) 
+
+test-u16-uctomb$(EXEEXT): $(test_u16_uctomb_OBJECTS) $(test_u16_uctomb_DEPENDENCIES) $(EXTRA_test_u16_uctomb_DEPENDENCIES) 
 	@rm -f test-u16-uctomb$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_uctomb_OBJECTS) $(test_u16_uctomb_LDADD) $(LIBS)
 unistdio/test-u16-vasnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u16-vasnprintf1$(EXEEXT): $(test_u16_vasnprintf1_OBJECTS) $(test_u16_vasnprintf1_DEPENDENCIES) 
+
+test-u16-vasnprintf1$(EXEEXT): $(test_u16_vasnprintf1_OBJECTS) $(test_u16_vasnprintf1_DEPENDENCIES) $(EXTRA_test_u16_vasnprintf1_DEPENDENCIES) 
 	@rm -f test-u16-vasnprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_vasnprintf1_OBJECTS) $(test_u16_vasnprintf1_LDADD) $(LIBS)
 unistdio/test-u16-vasnprintf2.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u16-vasnprintf2$(EXEEXT): $(test_u16_vasnprintf2_OBJECTS) $(test_u16_vasnprintf2_DEPENDENCIES) 
+
+test-u16-vasnprintf2$(EXEEXT): $(test_u16_vasnprintf2_OBJECTS) $(test_u16_vasnprintf2_DEPENDENCIES) $(EXTRA_test_u16_vasnprintf2_DEPENDENCIES) 
 	@rm -f test-u16-vasnprintf2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_vasnprintf2_OBJECTS) $(test_u16_vasnprintf2_LDADD) $(LIBS)
 unistdio/test-u16-vasnprintf3.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u16-vasnprintf3$(EXEEXT): $(test_u16_vasnprintf3_OBJECTS) $(test_u16_vasnprintf3_DEPENDENCIES) 
+
+test-u16-vasnprintf3$(EXEEXT): $(test_u16_vasnprintf3_OBJECTS) $(test_u16_vasnprintf3_DEPENDENCIES) $(EXTRA_test_u16_vasnprintf3_DEPENDENCIES) 
 	@rm -f test-u16-vasnprintf3$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_vasnprintf3_OBJECTS) $(test_u16_vasnprintf3_LDADD) $(LIBS)
 unistdio/test-u16-vasprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u16-vasprintf1$(EXEEXT): $(test_u16_vasprintf1_OBJECTS) $(test_u16_vasprintf1_DEPENDENCIES) 
+
+test-u16-vasprintf1$(EXEEXT): $(test_u16_vasprintf1_OBJECTS) $(test_u16_vasprintf1_DEPENDENCIES) $(EXTRA_test_u16_vasprintf1_DEPENDENCIES) 
 	@rm -f test-u16-vasprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_vasprintf1_OBJECTS) $(test_u16_vasprintf1_LDADD) $(LIBS)
 unistdio/test-u16-vsnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u16-vsnprintf1$(EXEEXT): $(test_u16_vsnprintf1_OBJECTS) $(test_u16_vsnprintf1_DEPENDENCIES) 
+
+test-u16-vsnprintf1$(EXEEXT): $(test_u16_vsnprintf1_OBJECTS) $(test_u16_vsnprintf1_DEPENDENCIES) $(EXTRA_test_u16_vsnprintf1_DEPENDENCIES) 
 	@rm -f test-u16-vsnprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_vsnprintf1_OBJECTS) $(test_u16_vsnprintf1_LDADD) $(LIBS)
 unistdio/test-u16-vsprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u16-vsprintf1$(EXEEXT): $(test_u16_vsprintf1_OBJECTS) $(test_u16_vsprintf1_DEPENDENCIES) 
+
+test-u16-vsprintf1$(EXEEXT): $(test_u16_vsprintf1_OBJECTS) $(test_u16_vsprintf1_DEPENDENCIES) $(EXTRA_test_u16_vsprintf1_DEPENDENCIES) 
 	@rm -f test-u16-vsprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_vsprintf1_OBJECTS) $(test_u16_vsprintf1_LDADD) $(LIBS)
 uniwidth/test-u16-width.$(OBJEXT): uniwidth/$(am__dirstamp) \
 	uniwidth/$(DEPDIR)/$(am__dirstamp)
-test-u16-width$(EXEEXT): $(test_u16_width_OBJECTS) $(test_u16_width_DEPENDENCIES) 
+
+test-u16-width$(EXEEXT): $(test_u16_width_OBJECTS) $(test_u16_width_DEPENDENCIES) $(EXTRA_test_u16_width_DEPENDENCIES) 
 	@rm -f test-u16-width$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_width_OBJECTS) $(test_u16_width_LDADD) $(LIBS)
 unilbrk/test-u16-width-linebreaks.$(OBJEXT): unilbrk/$(am__dirstamp) \
 	unilbrk/$(DEPDIR)/$(am__dirstamp)
-test-u16-width-linebreaks$(EXEEXT): $(test_u16_width_linebreaks_OBJECTS) $(test_u16_width_linebreaks_DEPENDENCIES) 
+
+test-u16-width-linebreaks$(EXEEXT): $(test_u16_width_linebreaks_OBJECTS) $(test_u16_width_linebreaks_DEPENDENCIES) $(EXTRA_test_u16_width_linebreaks_DEPENDENCIES) 
 	@rm -f test-u16-width-linebreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_width_linebreaks_OBJECTS) $(test_u16_width_linebreaks_LDADD) $(LIBS)
 uniwbrk/$(am__dirstamp):
@@ -6445,724 +8078,964 @@ uniwbrk/$(DEPDIR)/$(am__dirstamp):
 	@: > uniwbrk/$(DEPDIR)/$(am__dirstamp)
 uniwbrk/test-u16-wordbreaks.$(OBJEXT): uniwbrk/$(am__dirstamp) \
 	uniwbrk/$(DEPDIR)/$(am__dirstamp)
-test-u16-wordbreaks$(EXEEXT): $(test_u16_wordbreaks_OBJECTS) $(test_u16_wordbreaks_DEPENDENCIES) 
+
+test-u16-wordbreaks$(EXEEXT): $(test_u16_wordbreaks_OBJECTS) $(test_u16_wordbreaks_DEPENDENCIES) $(EXTRA_test_u16_wordbreaks_DEPENDENCIES) 
 	@rm -f test-u16-wordbreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_wordbreaks_OBJECTS) $(test_u16_wordbreaks_LDADD) $(LIBS)
 unistdio/test-u32-asnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u32-asnprintf1$(EXEEXT): $(test_u32_asnprintf1_OBJECTS) $(test_u32_asnprintf1_DEPENDENCIES) 
+
+test-u32-asnprintf1$(EXEEXT): $(test_u32_asnprintf1_OBJECTS) $(test_u32_asnprintf1_DEPENDENCIES) $(EXTRA_test_u32_asnprintf1_DEPENDENCIES) 
 	@rm -f test-u32-asnprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_asnprintf1_OBJECTS) $(test_u32_asnprintf1_LDADD) $(LIBS)
 unicase/test-u32-casecmp.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u32-casecmp$(EXEEXT): $(test_u32_casecmp_OBJECTS) $(test_u32_casecmp_DEPENDENCIES) 
+
+test-u32-casecmp$(EXEEXT): $(test_u32_casecmp_OBJECTS) $(test_u32_casecmp_DEPENDENCIES) $(EXTRA_test_u32_casecmp_DEPENDENCIES) 
 	@rm -f test-u32-casecmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_casecmp_OBJECTS) $(test_u32_casecmp_LDADD) $(LIBS)
 unicase/test-u32-casecoll.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u32-casecoll$(EXEEXT): $(test_u32_casecoll_OBJECTS) $(test_u32_casecoll_DEPENDENCIES) 
+
+test-u32-casecoll$(EXEEXT): $(test_u32_casecoll_OBJECTS) $(test_u32_casecoll_DEPENDENCIES) $(EXTRA_test_u32_casecoll_DEPENDENCIES) 
 	@rm -f test-u32-casecoll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_casecoll_OBJECTS) $(test_u32_casecoll_LDADD) $(LIBS)
 unicase/test-u32-casefold.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u32-casefold$(EXEEXT): $(test_u32_casefold_OBJECTS) $(test_u32_casefold_DEPENDENCIES) 
+
+test-u32-casefold$(EXEEXT): $(test_u32_casefold_OBJECTS) $(test_u32_casefold_DEPENDENCIES) $(EXTRA_test_u32_casefold_DEPENDENCIES) 
 	@rm -f test-u32-casefold$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_casefold_OBJECTS) $(test_u32_casefold_LDADD) $(LIBS)
 unistr/test-u32-check.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-check$(EXEEXT): $(test_u32_check_OBJECTS) $(test_u32_check_DEPENDENCIES) 
+
+test-u32-check$(EXEEXT): $(test_u32_check_OBJECTS) $(test_u32_check_DEPENDENCIES) $(EXTRA_test_u32_check_DEPENDENCIES) 
 	@rm -f test-u32-check$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_check_OBJECTS) $(test_u32_check_LDADD) $(LIBS)
 unistr/test-u32-chr.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-chr$(EXEEXT): $(test_u32_chr_OBJECTS) $(test_u32_chr_DEPENDENCIES) 
+
+test-u32-chr$(EXEEXT): $(test_u32_chr_OBJECTS) $(test_u32_chr_DEPENDENCIES) $(EXTRA_test_u32_chr_DEPENDENCIES) 
 	@rm -f test-u32-chr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_chr_OBJECTS) $(test_u32_chr_LDADD) $(LIBS)
 unistr/test-u32-cmp.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-cmp$(EXEEXT): $(test_u32_cmp_OBJECTS) $(test_u32_cmp_DEPENDENCIES) 
+
+test-u32-cmp$(EXEEXT): $(test_u32_cmp_OBJECTS) $(test_u32_cmp_DEPENDENCIES) $(EXTRA_test_u32_cmp_DEPENDENCIES) 
 	@rm -f test-u32-cmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_cmp_OBJECTS) $(test_u32_cmp_LDADD) $(LIBS)
 unistr/test-u32-cmp2.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-cmp2$(EXEEXT): $(test_u32_cmp2_OBJECTS) $(test_u32_cmp2_DEPENDENCIES) 
+
+test-u32-cmp2$(EXEEXT): $(test_u32_cmp2_OBJECTS) $(test_u32_cmp2_DEPENDENCIES) $(EXTRA_test_u32_cmp2_DEPENDENCIES) 
 	@rm -f test-u32-cmp2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_cmp2_OBJECTS) $(test_u32_cmp2_LDADD) $(LIBS)
 uniconv/test-u32-conv-from-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
-test-u32-conv-from-enc$(EXEEXT): $(test_u32_conv_from_enc_OBJECTS) $(test_u32_conv_from_enc_DEPENDENCIES) 
+
+test-u32-conv-from-enc$(EXEEXT): $(test_u32_conv_from_enc_OBJECTS) $(test_u32_conv_from_enc_DEPENDENCIES) $(EXTRA_test_u32_conv_from_enc_DEPENDENCIES) 
 	@rm -f test-u32-conv-from-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_conv_from_enc_OBJECTS) $(test_u32_conv_from_enc_LDADD) $(LIBS)
 uniconv/test-u32-conv-to-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
-test-u32-conv-to-enc$(EXEEXT): $(test_u32_conv_to_enc_OBJECTS) $(test_u32_conv_to_enc_DEPENDENCIES) 
+
+test-u32-conv-to-enc$(EXEEXT): $(test_u32_conv_to_enc_OBJECTS) $(test_u32_conv_to_enc_DEPENDENCIES) $(EXTRA_test_u32_conv_to_enc_DEPENDENCIES) 
 	@rm -f test-u32-conv-to-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_conv_to_enc_OBJECTS) $(test_u32_conv_to_enc_LDADD) $(LIBS)
 unistr/test-u32-cpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-cpy$(EXEEXT): $(test_u32_cpy_OBJECTS) $(test_u32_cpy_DEPENDENCIES) 
+
+test-u32-cpy$(EXEEXT): $(test_u32_cpy_OBJECTS) $(test_u32_cpy_DEPENDENCIES) $(EXTRA_test_u32_cpy_DEPENDENCIES) 
 	@rm -f test-u32-cpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_cpy_OBJECTS) $(test_u32_cpy_LDADD) $(LIBS)
 unistr/test-u32-cpy-alloc.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-cpy-alloc$(EXEEXT): $(test_u32_cpy_alloc_OBJECTS) $(test_u32_cpy_alloc_DEPENDENCIES) 
+
+test-u32-cpy-alloc$(EXEEXT): $(test_u32_cpy_alloc_OBJECTS) $(test_u32_cpy_alloc_DEPENDENCIES) $(EXTRA_test_u32_cpy_alloc_DEPENDENCIES) 
 	@rm -f test-u32-cpy-alloc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_cpy_alloc_OBJECTS) $(test_u32_cpy_alloc_LDADD) $(LIBS)
+unigbrk/test-u32-grapheme-breaks.$(OBJEXT): unigbrk/$(am__dirstamp) \
+	unigbrk/$(DEPDIR)/$(am__dirstamp)
+
+test-u32-grapheme-breaks$(EXEEXT): $(test_u32_grapheme_breaks_OBJECTS) $(test_u32_grapheme_breaks_DEPENDENCIES) $(EXTRA_test_u32_grapheme_breaks_DEPENDENCIES) 
+	@rm -f test-u32-grapheme-breaks$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_grapheme_breaks_OBJECTS) $(test_u32_grapheme_breaks_LDADD) $(LIBS)
+unigbrk/test-u32-grapheme-next.$(OBJEXT): unigbrk/$(am__dirstamp) \
+	unigbrk/$(DEPDIR)/$(am__dirstamp)
+
+test-u32-grapheme-next$(EXEEXT): $(test_u32_grapheme_next_OBJECTS) $(test_u32_grapheme_next_DEPENDENCIES) $(EXTRA_test_u32_grapheme_next_DEPENDENCIES) 
+	@rm -f test-u32-grapheme-next$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_grapheme_next_OBJECTS) $(test_u32_grapheme_next_LDADD) $(LIBS)
+unigbrk/test-u32-grapheme-prev.$(OBJEXT): unigbrk/$(am__dirstamp) \
+	unigbrk/$(DEPDIR)/$(am__dirstamp)
+
+test-u32-grapheme-prev$(EXEEXT): $(test_u32_grapheme_prev_OBJECTS) $(test_u32_grapheme_prev_DEPENDENCIES) $(EXTRA_test_u32_grapheme_prev_DEPENDENCIES) 
+	@rm -f test-u32-grapheme-prev$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_grapheme_prev_OBJECTS) $(test_u32_grapheme_prev_LDADD) $(LIBS)
 unicase/test-u32-is-cased.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u32-is-cased$(EXEEXT): $(test_u32_is_cased_OBJECTS) $(test_u32_is_cased_DEPENDENCIES) 
+
+test-u32-is-cased$(EXEEXT): $(test_u32_is_cased_OBJECTS) $(test_u32_is_cased_DEPENDENCIES) $(EXTRA_test_u32_is_cased_DEPENDENCIES) 
 	@rm -f test-u32-is-cased$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_is_cased_OBJECTS) $(test_u32_is_cased_LDADD) $(LIBS)
 unicase/test-u32-is-casefolded.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u32-is-casefolded$(EXEEXT): $(test_u32_is_casefolded_OBJECTS) $(test_u32_is_casefolded_DEPENDENCIES) 
+
+test-u32-is-casefolded$(EXEEXT): $(test_u32_is_casefolded_OBJECTS) $(test_u32_is_casefolded_DEPENDENCIES) $(EXTRA_test_u32_is_casefolded_DEPENDENCIES) 
 	@rm -f test-u32-is-casefolded$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_is_casefolded_OBJECTS) $(test_u32_is_casefolded_LDADD) $(LIBS)
 unicase/test-u32-is-lowercase.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u32-is-lowercase$(EXEEXT): $(test_u32_is_lowercase_OBJECTS) $(test_u32_is_lowercase_DEPENDENCIES) 
+
+test-u32-is-lowercase$(EXEEXT): $(test_u32_is_lowercase_OBJECTS) $(test_u32_is_lowercase_DEPENDENCIES) $(EXTRA_test_u32_is_lowercase_DEPENDENCIES) 
 	@rm -f test-u32-is-lowercase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_is_lowercase_OBJECTS) $(test_u32_is_lowercase_LDADD) $(LIBS)
 unicase/test-u32-is-titlecase.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u32-is-titlecase$(EXEEXT): $(test_u32_is_titlecase_OBJECTS) $(test_u32_is_titlecase_DEPENDENCIES) 
+
+test-u32-is-titlecase$(EXEEXT): $(test_u32_is_titlecase_OBJECTS) $(test_u32_is_titlecase_DEPENDENCIES) $(EXTRA_test_u32_is_titlecase_DEPENDENCIES) 
 	@rm -f test-u32-is-titlecase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_is_titlecase_OBJECTS) $(test_u32_is_titlecase_LDADD) $(LIBS)
 unicase/test-u32-is-uppercase.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u32-is-uppercase$(EXEEXT): $(test_u32_is_uppercase_OBJECTS) $(test_u32_is_uppercase_DEPENDENCIES) 
+
+test-u32-is-uppercase$(EXEEXT): $(test_u32_is_uppercase_OBJECTS) $(test_u32_is_uppercase_DEPENDENCIES) $(EXTRA_test_u32_is_uppercase_DEPENDENCIES) 
 	@rm -f test-u32-is-uppercase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_is_uppercase_OBJECTS) $(test_u32_is_uppercase_LDADD) $(LIBS)
 unistr/test-u32-mblen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-mblen$(EXEEXT): $(test_u32_mblen_OBJECTS) $(test_u32_mblen_DEPENDENCIES) 
+
+test-u32-mblen$(EXEEXT): $(test_u32_mblen_OBJECTS) $(test_u32_mblen_DEPENDENCIES) $(EXTRA_test_u32_mblen_DEPENDENCIES) 
 	@rm -f test-u32-mblen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_mblen_OBJECTS) $(test_u32_mblen_LDADD) $(LIBS)
 unistr/test-u32-mbsnlen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-mbsnlen$(EXEEXT): $(test_u32_mbsnlen_OBJECTS) $(test_u32_mbsnlen_DEPENDENCIES) 
+
+test-u32-mbsnlen$(EXEEXT): $(test_u32_mbsnlen_OBJECTS) $(test_u32_mbsnlen_DEPENDENCIES) $(EXTRA_test_u32_mbsnlen_DEPENDENCIES) 
 	@rm -f test-u32-mbsnlen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_mbsnlen_OBJECTS) $(test_u32_mbsnlen_LDADD) $(LIBS)
 unistr/test-u32-mbtouc.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-mbtouc$(EXEEXT): $(test_u32_mbtouc_OBJECTS) $(test_u32_mbtouc_DEPENDENCIES) 
+
+test-u32-mbtouc$(EXEEXT): $(test_u32_mbtouc_OBJECTS) $(test_u32_mbtouc_DEPENDENCIES) $(EXTRA_test_u32_mbtouc_DEPENDENCIES) 
 	@rm -f test-u32-mbtouc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_mbtouc_OBJECTS) $(test_u32_mbtouc_LDADD) $(LIBS)
 unistr/test-u32-mbtouc-unsafe.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-mbtouc-unsafe$(EXEEXT): $(test_u32_mbtouc_unsafe_OBJECTS) $(test_u32_mbtouc_unsafe_DEPENDENCIES) 
+
+test-u32-mbtouc-unsafe$(EXEEXT): $(test_u32_mbtouc_unsafe_OBJECTS) $(test_u32_mbtouc_unsafe_DEPENDENCIES) $(EXTRA_test_u32_mbtouc_unsafe_DEPENDENCIES) 
 	@rm -f test-u32-mbtouc-unsafe$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_mbtouc_unsafe_OBJECTS) $(test_u32_mbtouc_unsafe_LDADD) $(LIBS)
 unistr/test-u32-mbtoucr.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-mbtoucr$(EXEEXT): $(test_u32_mbtoucr_OBJECTS) $(test_u32_mbtoucr_DEPENDENCIES) 
+
+test-u32-mbtoucr$(EXEEXT): $(test_u32_mbtoucr_OBJECTS) $(test_u32_mbtoucr_DEPENDENCIES) $(EXTRA_test_u32_mbtoucr_DEPENDENCIES) 
 	@rm -f test-u32-mbtoucr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_mbtoucr_OBJECTS) $(test_u32_mbtoucr_LDADD) $(LIBS)
 unistr/test-u32-move.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-move$(EXEEXT): $(test_u32_move_OBJECTS) $(test_u32_move_DEPENDENCIES) 
+
+test-u32-move$(EXEEXT): $(test_u32_move_OBJECTS) $(test_u32_move_DEPENDENCIES) $(EXTRA_test_u32_move_DEPENDENCIES) 
 	@rm -f test-u32-move$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_move_OBJECTS) $(test_u32_move_LDADD) $(LIBS)
 unistr/test-u32-next.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-next$(EXEEXT): $(test_u32_next_OBJECTS) $(test_u32_next_DEPENDENCIES) 
+
+test-u32-next$(EXEEXT): $(test_u32_next_OBJECTS) $(test_u32_next_DEPENDENCIES) $(EXTRA_test_u32_next_DEPENDENCIES) 
 	@rm -f test-u32-next$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_next_OBJECTS) $(test_u32_next_LDADD) $(LIBS)
 uninorm/test-u32-nfc-big.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
 uninorm/test-u32-normalize-big.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-u32-nfc-big$(EXEEXT): $(test_u32_nfc_big_OBJECTS) $(test_u32_nfc_big_DEPENDENCIES) 
+
+test-u32-nfc-big$(EXEEXT): $(test_u32_nfc_big_OBJECTS) $(test_u32_nfc_big_DEPENDENCIES) $(EXTRA_test_u32_nfc_big_DEPENDENCIES) 
 	@rm -f test-u32-nfc-big$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_nfc_big_OBJECTS) $(test_u32_nfc_big_LDADD) $(LIBS)
 uninorm/test-u32-nfd-big.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-u32-nfd-big$(EXEEXT): $(test_u32_nfd_big_OBJECTS) $(test_u32_nfd_big_DEPENDENCIES) 
+
+test-u32-nfd-big$(EXEEXT): $(test_u32_nfd_big_OBJECTS) $(test_u32_nfd_big_DEPENDENCIES) $(EXTRA_test_u32_nfd_big_DEPENDENCIES) 
 	@rm -f test-u32-nfd-big$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_nfd_big_OBJECTS) $(test_u32_nfd_big_LDADD) $(LIBS)
 uninorm/test-u32-nfkc-big.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-u32-nfkc-big$(EXEEXT): $(test_u32_nfkc_big_OBJECTS) $(test_u32_nfkc_big_DEPENDENCIES) 
+
+test-u32-nfkc-big$(EXEEXT): $(test_u32_nfkc_big_OBJECTS) $(test_u32_nfkc_big_DEPENDENCIES) $(EXTRA_test_u32_nfkc_big_DEPENDENCIES) 
 	@rm -f test-u32-nfkc-big$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_nfkc_big_OBJECTS) $(test_u32_nfkc_big_LDADD) $(LIBS)
 uninorm/test-u32-nfkd-big.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-u32-nfkd-big$(EXEEXT): $(test_u32_nfkd_big_OBJECTS) $(test_u32_nfkd_big_DEPENDENCIES) 
+
+test-u32-nfkd-big$(EXEEXT): $(test_u32_nfkd_big_OBJECTS) $(test_u32_nfkd_big_DEPENDENCIES) $(EXTRA_test_u32_nfkd_big_DEPENDENCIES) 
 	@rm -f test-u32-nfkd-big$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_nfkd_big_OBJECTS) $(test_u32_nfkd_big_LDADD) $(LIBS)
 uninorm/test-u32-normcmp.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-u32-normcmp$(EXEEXT): $(test_u32_normcmp_OBJECTS) $(test_u32_normcmp_DEPENDENCIES) 
+
+test-u32-normcmp$(EXEEXT): $(test_u32_normcmp_OBJECTS) $(test_u32_normcmp_DEPENDENCIES) $(EXTRA_test_u32_normcmp_DEPENDENCIES) 
 	@rm -f test-u32-normcmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_normcmp_OBJECTS) $(test_u32_normcmp_LDADD) $(LIBS)
 uninorm/test-u32-normcoll.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-u32-normcoll$(EXEEXT): $(test_u32_normcoll_OBJECTS) $(test_u32_normcoll_DEPENDENCIES) 
+
+test-u32-normcoll$(EXEEXT): $(test_u32_normcoll_OBJECTS) $(test_u32_normcoll_DEPENDENCIES) $(EXTRA_test_u32_normcoll_DEPENDENCIES) 
 	@rm -f test-u32-normcoll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_normcoll_OBJECTS) $(test_u32_normcoll_LDADD) $(LIBS)
 unilbrk/test-u32-possible-linebreaks.$(OBJEXT):  \
 	unilbrk/$(am__dirstamp) unilbrk/$(DEPDIR)/$(am__dirstamp)
-test-u32-possible-linebreaks$(EXEEXT): $(test_u32_possible_linebreaks_OBJECTS) $(test_u32_possible_linebreaks_DEPENDENCIES) 
+
+test-u32-possible-linebreaks$(EXEEXT): $(test_u32_possible_linebreaks_OBJECTS) $(test_u32_possible_linebreaks_DEPENDENCIES) $(EXTRA_test_u32_possible_linebreaks_DEPENDENCIES) 
 	@rm -f test-u32-possible-linebreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_possible_linebreaks_OBJECTS) $(test_u32_possible_linebreaks_LDADD) $(LIBS)
 unistr/test-u32-prev.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-prev$(EXEEXT): $(test_u32_prev_OBJECTS) $(test_u32_prev_DEPENDENCIES) 
+
+test-u32-prev$(EXEEXT): $(test_u32_prev_OBJECTS) $(test_u32_prev_DEPENDENCIES) $(EXTRA_test_u32_prev_DEPENDENCIES) 
 	@rm -f test-u32-prev$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_prev_OBJECTS) $(test_u32_prev_LDADD) $(LIBS)
 unistr/test-u32-set.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-set$(EXEEXT): $(test_u32_set_OBJECTS) $(test_u32_set_DEPENDENCIES) 
+
+test-u32-set$(EXEEXT): $(test_u32_set_OBJECTS) $(test_u32_set_DEPENDENCIES) $(EXTRA_test_u32_set_DEPENDENCIES) 
 	@rm -f test-u32-set$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_set_OBJECTS) $(test_u32_set_LDADD) $(LIBS)
 unistr/test-u32-stpcpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-stpcpy$(EXEEXT): $(test_u32_stpcpy_OBJECTS) $(test_u32_stpcpy_DEPENDENCIES) 
+
+test-u32-stpcpy$(EXEEXT): $(test_u32_stpcpy_OBJECTS) $(test_u32_stpcpy_DEPENDENCIES) $(EXTRA_test_u32_stpcpy_DEPENDENCIES) 
 	@rm -f test-u32-stpcpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_stpcpy_OBJECTS) $(test_u32_stpcpy_LDADD) $(LIBS)
 unistr/test-u32-stpncpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-stpncpy$(EXEEXT): $(test_u32_stpncpy_OBJECTS) $(test_u32_stpncpy_DEPENDENCIES) 
+
+test-u32-stpncpy$(EXEEXT): $(test_u32_stpncpy_OBJECTS) $(test_u32_stpncpy_DEPENDENCIES) $(EXTRA_test_u32_stpncpy_DEPENDENCIES) 
 	@rm -f test-u32-stpncpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_stpncpy_OBJECTS) $(test_u32_stpncpy_LDADD) $(LIBS)
 unistr/test-u32-strcat.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-strcat$(EXEEXT): $(test_u32_strcat_OBJECTS) $(test_u32_strcat_DEPENDENCIES) 
+
+test-u32-strcat$(EXEEXT): $(test_u32_strcat_OBJECTS) $(test_u32_strcat_DEPENDENCIES) $(EXTRA_test_u32_strcat_DEPENDENCIES) 
 	@rm -f test-u32-strcat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strcat_OBJECTS) $(test_u32_strcat_LDADD) $(LIBS)
+unistr/test-u32-strchr.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+
+test-u32-strchr$(EXEEXT): $(test_u32_strchr_OBJECTS) $(test_u32_strchr_DEPENDENCIES) $(EXTRA_test_u32_strchr_DEPENDENCIES) 
+	@rm -f test-u32-strchr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strchr_OBJECTS) $(test_u32_strchr_LDADD) $(LIBS)
 unistr/test-u32-strcmp.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-strcmp$(EXEEXT): $(test_u32_strcmp_OBJECTS) $(test_u32_strcmp_DEPENDENCIES) 
+
+test-u32-strcmp$(EXEEXT): $(test_u32_strcmp_OBJECTS) $(test_u32_strcmp_DEPENDENCIES) $(EXTRA_test_u32_strcmp_DEPENDENCIES) 
 	@rm -f test-u32-strcmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strcmp_OBJECTS) $(test_u32_strcmp_LDADD) $(LIBS)
 unistr/test-u32-strcoll.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-strcoll$(EXEEXT): $(test_u32_strcoll_OBJECTS) $(test_u32_strcoll_DEPENDENCIES) 
+
+test-u32-strcoll$(EXEEXT): $(test_u32_strcoll_OBJECTS) $(test_u32_strcoll_DEPENDENCIES) $(EXTRA_test_u32_strcoll_DEPENDENCIES) 
 	@rm -f test-u32-strcoll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strcoll_OBJECTS) $(test_u32_strcoll_LDADD) $(LIBS)
 uniconv/test-u32-strconv-from-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
-test-u32-strconv-from-enc$(EXEEXT): $(test_u32_strconv_from_enc_OBJECTS) $(test_u32_strconv_from_enc_DEPENDENCIES) 
+
+test-u32-strconv-from-enc$(EXEEXT): $(test_u32_strconv_from_enc_OBJECTS) $(test_u32_strconv_from_enc_DEPENDENCIES) $(EXTRA_test_u32_strconv_from_enc_DEPENDENCIES) 
 	@rm -f test-u32-strconv-from-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strconv_from_enc_OBJECTS) $(test_u32_strconv_from_enc_LDADD) $(LIBS)
 uniconv/test-u32-strconv-to-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
-test-u32-strconv-to-enc$(EXEEXT): $(test_u32_strconv_to_enc_OBJECTS) $(test_u32_strconv_to_enc_DEPENDENCIES) 
+
+test-u32-strconv-to-enc$(EXEEXT): $(test_u32_strconv_to_enc_OBJECTS) $(test_u32_strconv_to_enc_DEPENDENCIES) $(EXTRA_test_u32_strconv_to_enc_DEPENDENCIES) 
 	@rm -f test-u32-strconv-to-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strconv_to_enc_OBJECTS) $(test_u32_strconv_to_enc_LDADD) $(LIBS)
 unistr/test-u32-strcpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-strcpy$(EXEEXT): $(test_u32_strcpy_OBJECTS) $(test_u32_strcpy_DEPENDENCIES) 
+
+test-u32-strcpy$(EXEEXT): $(test_u32_strcpy_OBJECTS) $(test_u32_strcpy_DEPENDENCIES) $(EXTRA_test_u32_strcpy_DEPENDENCIES) 
 	@rm -f test-u32-strcpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strcpy_OBJECTS) $(test_u32_strcpy_LDADD) $(LIBS)
 unistr/test-u32-strdup.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-strdup$(EXEEXT): $(test_u32_strdup_OBJECTS) $(test_u32_strdup_DEPENDENCIES) 
+
+test-u32-strdup$(EXEEXT): $(test_u32_strdup_OBJECTS) $(test_u32_strdup_DEPENDENCIES) $(EXTRA_test_u32_strdup_DEPENDENCIES) 
 	@rm -f test-u32-strdup$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strdup_OBJECTS) $(test_u32_strdup_LDADD) $(LIBS)
 unistr/test-u32-strlen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-strlen$(EXEEXT): $(test_u32_strlen_OBJECTS) $(test_u32_strlen_DEPENDENCIES) 
+
+test-u32-strlen$(EXEEXT): $(test_u32_strlen_OBJECTS) $(test_u32_strlen_DEPENDENCIES) $(EXTRA_test_u32_strlen_DEPENDENCIES) 
 	@rm -f test-u32-strlen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strlen_OBJECTS) $(test_u32_strlen_LDADD) $(LIBS)
 unistr/test-u32-strmblen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-strmblen$(EXEEXT): $(test_u32_strmblen_OBJECTS) $(test_u32_strmblen_DEPENDENCIES) 
+
+test-u32-strmblen$(EXEEXT): $(test_u32_strmblen_OBJECTS) $(test_u32_strmblen_DEPENDENCIES) $(EXTRA_test_u32_strmblen_DEPENDENCIES) 
 	@rm -f test-u32-strmblen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strmblen_OBJECTS) $(test_u32_strmblen_LDADD) $(LIBS)
 unistr/test-u32-strmbtouc.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-strmbtouc$(EXEEXT): $(test_u32_strmbtouc_OBJECTS) $(test_u32_strmbtouc_DEPENDENCIES) 
+
+test-u32-strmbtouc$(EXEEXT): $(test_u32_strmbtouc_OBJECTS) $(test_u32_strmbtouc_DEPENDENCIES) $(EXTRA_test_u32_strmbtouc_DEPENDENCIES) 
 	@rm -f test-u32-strmbtouc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strmbtouc_OBJECTS) $(test_u32_strmbtouc_LDADD) $(LIBS)
 unistr/test-u32-strncat.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-strncat$(EXEEXT): $(test_u32_strncat_OBJECTS) $(test_u32_strncat_DEPENDENCIES) 
+
+test-u32-strncat$(EXEEXT): $(test_u32_strncat_OBJECTS) $(test_u32_strncat_DEPENDENCIES) $(EXTRA_test_u32_strncat_DEPENDENCIES) 
 	@rm -f test-u32-strncat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strncat_OBJECTS) $(test_u32_strncat_LDADD) $(LIBS)
 unistr/test-u32-strncmp.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-strncmp$(EXEEXT): $(test_u32_strncmp_OBJECTS) $(test_u32_strncmp_DEPENDENCIES) 
+
+test-u32-strncmp$(EXEEXT): $(test_u32_strncmp_OBJECTS) $(test_u32_strncmp_DEPENDENCIES) $(EXTRA_test_u32_strncmp_DEPENDENCIES) 
 	@rm -f test-u32-strncmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strncmp_OBJECTS) $(test_u32_strncmp_LDADD) $(LIBS)
 unistr/test-u32-strncpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-strncpy$(EXEEXT): $(test_u32_strncpy_OBJECTS) $(test_u32_strncpy_DEPENDENCIES) 
+
+test-u32-strncpy$(EXEEXT): $(test_u32_strncpy_OBJECTS) $(test_u32_strncpy_DEPENDENCIES) $(EXTRA_test_u32_strncpy_DEPENDENCIES) 
 	@rm -f test-u32-strncpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strncpy_OBJECTS) $(test_u32_strncpy_LDADD) $(LIBS)
 unistr/test-u32-strnlen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-strnlen$(EXEEXT): $(test_u32_strnlen_OBJECTS) $(test_u32_strnlen_DEPENDENCIES) 
+
+test-u32-strnlen$(EXEEXT): $(test_u32_strnlen_OBJECTS) $(test_u32_strnlen_DEPENDENCIES) $(EXTRA_test_u32_strnlen_DEPENDENCIES) 
 	@rm -f test-u32-strnlen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strnlen_OBJECTS) $(test_u32_strnlen_LDADD) $(LIBS)
+unistr/test-u32-strstr.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+
+test-u32-strstr$(EXEEXT): $(test_u32_strstr_OBJECTS) $(test_u32_strstr_DEPENDENCIES) $(EXTRA_test_u32_strstr_DEPENDENCIES) 
+	@rm -f test-u32-strstr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strstr_OBJECTS) $(test_u32_strstr_LDADD) $(LIBS)
+unistr/test-u32-strtok.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+
+test-u32-strtok$(EXEEXT): $(test_u32_strtok_OBJECTS) $(test_u32_strtok_DEPENDENCIES) $(EXTRA_test_u32_strtok_DEPENDENCIES) 
+	@rm -f test-u32-strtok$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strtok_OBJECTS) $(test_u32_strtok_LDADD) $(LIBS)
 uniwidth/test-u32-strwidth.$(OBJEXT): uniwidth/$(am__dirstamp) \
 	uniwidth/$(DEPDIR)/$(am__dirstamp)
-test-u32-strwidth$(EXEEXT): $(test_u32_strwidth_OBJECTS) $(test_u32_strwidth_DEPENDENCIES) 
+
+test-u32-strwidth$(EXEEXT): $(test_u32_strwidth_OBJECTS) $(test_u32_strwidth_DEPENDENCIES) $(EXTRA_test_u32_strwidth_DEPENDENCIES) 
 	@rm -f test-u32-strwidth$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strwidth_OBJECTS) $(test_u32_strwidth_LDADD) $(LIBS)
 unistr/test-u32-to-u16.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-to-u16$(EXEEXT): $(test_u32_to_u16_OBJECTS) $(test_u32_to_u16_DEPENDENCIES) 
+
+test-u32-to-u16$(EXEEXT): $(test_u32_to_u16_OBJECTS) $(test_u32_to_u16_DEPENDENCIES) $(EXTRA_test_u32_to_u16_DEPENDENCIES) 
 	@rm -f test-u32-to-u16$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_to_u16_OBJECTS) $(test_u32_to_u16_LDADD) $(LIBS)
 unistr/test-u32-to-u8.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-to-u8$(EXEEXT): $(test_u32_to_u8_OBJECTS) $(test_u32_to_u8_DEPENDENCIES) 
+
+test-u32-to-u8$(EXEEXT): $(test_u32_to_u8_OBJECTS) $(test_u32_to_u8_DEPENDENCIES) $(EXTRA_test_u32_to_u8_DEPENDENCIES) 
 	@rm -f test-u32-to-u8$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_to_u8_OBJECTS) $(test_u32_to_u8_LDADD) $(LIBS)
 unicase/test-u32-tolower.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u32-tolower$(EXEEXT): $(test_u32_tolower_OBJECTS) $(test_u32_tolower_DEPENDENCIES) 
+
+test-u32-tolower$(EXEEXT): $(test_u32_tolower_OBJECTS) $(test_u32_tolower_DEPENDENCIES) $(EXTRA_test_u32_tolower_DEPENDENCIES) 
 	@rm -f test-u32-tolower$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_tolower_OBJECTS) $(test_u32_tolower_LDADD) $(LIBS)
 unicase/test-u32-totitle.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u32-totitle$(EXEEXT): $(test_u32_totitle_OBJECTS) $(test_u32_totitle_DEPENDENCIES) 
+
+test-u32-totitle$(EXEEXT): $(test_u32_totitle_OBJECTS) $(test_u32_totitle_DEPENDENCIES) $(EXTRA_test_u32_totitle_DEPENDENCIES) 
 	@rm -f test-u32-totitle$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_totitle_OBJECTS) $(test_u32_totitle_LDADD) $(LIBS)
 unicase/test-u32-toupper.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u32-toupper$(EXEEXT): $(test_u32_toupper_OBJECTS) $(test_u32_toupper_DEPENDENCIES) 
+
+test-u32-toupper$(EXEEXT): $(test_u32_toupper_OBJECTS) $(test_u32_toupper_DEPENDENCIES) $(EXTRA_test_u32_toupper_DEPENDENCIES) 
 	@rm -f test-u32-toupper$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_toupper_OBJECTS) $(test_u32_toupper_LDADD) $(LIBS)
 unistr/test-u32-uctomb.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u32-uctomb$(EXEEXT): $(test_u32_uctomb_OBJECTS) $(test_u32_uctomb_DEPENDENCIES) 
+
+test-u32-uctomb$(EXEEXT): $(test_u32_uctomb_OBJECTS) $(test_u32_uctomb_DEPENDENCIES) $(EXTRA_test_u32_uctomb_DEPENDENCIES) 
 	@rm -f test-u32-uctomb$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_uctomb_OBJECTS) $(test_u32_uctomb_LDADD) $(LIBS)
 unistdio/test-u32-vasnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u32-vasnprintf1$(EXEEXT): $(test_u32_vasnprintf1_OBJECTS) $(test_u32_vasnprintf1_DEPENDENCIES) 
+
+test-u32-vasnprintf1$(EXEEXT): $(test_u32_vasnprintf1_OBJECTS) $(test_u32_vasnprintf1_DEPENDENCIES) $(EXTRA_test_u32_vasnprintf1_DEPENDENCIES) 
 	@rm -f test-u32-vasnprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_vasnprintf1_OBJECTS) $(test_u32_vasnprintf1_LDADD) $(LIBS)
 unistdio/test-u32-vasnprintf2.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u32-vasnprintf2$(EXEEXT): $(test_u32_vasnprintf2_OBJECTS) $(test_u32_vasnprintf2_DEPENDENCIES) 
+
+test-u32-vasnprintf2$(EXEEXT): $(test_u32_vasnprintf2_OBJECTS) $(test_u32_vasnprintf2_DEPENDENCIES) $(EXTRA_test_u32_vasnprintf2_DEPENDENCIES) 
 	@rm -f test-u32-vasnprintf2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_vasnprintf2_OBJECTS) $(test_u32_vasnprintf2_LDADD) $(LIBS)
 unistdio/test-u32-vasnprintf3.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u32-vasnprintf3$(EXEEXT): $(test_u32_vasnprintf3_OBJECTS) $(test_u32_vasnprintf3_DEPENDENCIES) 
+
+test-u32-vasnprintf3$(EXEEXT): $(test_u32_vasnprintf3_OBJECTS) $(test_u32_vasnprintf3_DEPENDENCIES) $(EXTRA_test_u32_vasnprintf3_DEPENDENCIES) 
 	@rm -f test-u32-vasnprintf3$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_vasnprintf3_OBJECTS) $(test_u32_vasnprintf3_LDADD) $(LIBS)
 unistdio/test-u32-vasprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u32-vasprintf1$(EXEEXT): $(test_u32_vasprintf1_OBJECTS) $(test_u32_vasprintf1_DEPENDENCIES) 
+
+test-u32-vasprintf1$(EXEEXT): $(test_u32_vasprintf1_OBJECTS) $(test_u32_vasprintf1_DEPENDENCIES) $(EXTRA_test_u32_vasprintf1_DEPENDENCIES) 
 	@rm -f test-u32-vasprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_vasprintf1_OBJECTS) $(test_u32_vasprintf1_LDADD) $(LIBS)
 unistdio/test-u32-vsnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u32-vsnprintf1$(EXEEXT): $(test_u32_vsnprintf1_OBJECTS) $(test_u32_vsnprintf1_DEPENDENCIES) 
+
+test-u32-vsnprintf1$(EXEEXT): $(test_u32_vsnprintf1_OBJECTS) $(test_u32_vsnprintf1_DEPENDENCIES) $(EXTRA_test_u32_vsnprintf1_DEPENDENCIES) 
 	@rm -f test-u32-vsnprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_vsnprintf1_OBJECTS) $(test_u32_vsnprintf1_LDADD) $(LIBS)
 unistdio/test-u32-vsprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u32-vsprintf1$(EXEEXT): $(test_u32_vsprintf1_OBJECTS) $(test_u32_vsprintf1_DEPENDENCIES) 
+
+test-u32-vsprintf1$(EXEEXT): $(test_u32_vsprintf1_OBJECTS) $(test_u32_vsprintf1_DEPENDENCIES) $(EXTRA_test_u32_vsprintf1_DEPENDENCIES) 
 	@rm -f test-u32-vsprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_vsprintf1_OBJECTS) $(test_u32_vsprintf1_LDADD) $(LIBS)
 uniwidth/test-u32-width.$(OBJEXT): uniwidth/$(am__dirstamp) \
 	uniwidth/$(DEPDIR)/$(am__dirstamp)
-test-u32-width$(EXEEXT): $(test_u32_width_OBJECTS) $(test_u32_width_DEPENDENCIES) 
+
+test-u32-width$(EXEEXT): $(test_u32_width_OBJECTS) $(test_u32_width_DEPENDENCIES) $(EXTRA_test_u32_width_DEPENDENCIES) 
 	@rm -f test-u32-width$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_width_OBJECTS) $(test_u32_width_LDADD) $(LIBS)
 unilbrk/test-u32-width-linebreaks.$(OBJEXT): unilbrk/$(am__dirstamp) \
 	unilbrk/$(DEPDIR)/$(am__dirstamp)
-test-u32-width-linebreaks$(EXEEXT): $(test_u32_width_linebreaks_OBJECTS) $(test_u32_width_linebreaks_DEPENDENCIES) 
+
+test-u32-width-linebreaks$(EXEEXT): $(test_u32_width_linebreaks_OBJECTS) $(test_u32_width_linebreaks_DEPENDENCIES) $(EXTRA_test_u32_width_linebreaks_DEPENDENCIES) 
 	@rm -f test-u32-width-linebreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_width_linebreaks_OBJECTS) $(test_u32_width_linebreaks_LDADD) $(LIBS)
 uniwbrk/test-u32-wordbreaks.$(OBJEXT): uniwbrk/$(am__dirstamp) \
 	uniwbrk/$(DEPDIR)/$(am__dirstamp)
-test-u32-wordbreaks$(EXEEXT): $(test_u32_wordbreaks_OBJECTS) $(test_u32_wordbreaks_DEPENDENCIES) 
+
+test-u32-wordbreaks$(EXEEXT): $(test_u32_wordbreaks_OBJECTS) $(test_u32_wordbreaks_DEPENDENCIES) $(EXTRA_test_u32_wordbreaks_DEPENDENCIES) 
 	@rm -f test-u32-wordbreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_wordbreaks_OBJECTS) $(test_u32_wordbreaks_LDADD) $(LIBS)
 unistdio/test-u8-asnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u8-asnprintf1$(EXEEXT): $(test_u8_asnprintf1_OBJECTS) $(test_u8_asnprintf1_DEPENDENCIES) 
+
+test-u8-asnprintf1$(EXEEXT): $(test_u8_asnprintf1_OBJECTS) $(test_u8_asnprintf1_DEPENDENCIES) $(EXTRA_test_u8_asnprintf1_DEPENDENCIES) 
 	@rm -f test-u8-asnprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_asnprintf1_OBJECTS) $(test_u8_asnprintf1_LDADD) $(LIBS)
 unicase/test-u8-casecmp.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u8-casecmp$(EXEEXT): $(test_u8_casecmp_OBJECTS) $(test_u8_casecmp_DEPENDENCIES) 
+
+test-u8-casecmp$(EXEEXT): $(test_u8_casecmp_OBJECTS) $(test_u8_casecmp_DEPENDENCIES) $(EXTRA_test_u8_casecmp_DEPENDENCIES) 
 	@rm -f test-u8-casecmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_casecmp_OBJECTS) $(test_u8_casecmp_LDADD) $(LIBS)
 unicase/test-u8-casecoll.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u8-casecoll$(EXEEXT): $(test_u8_casecoll_OBJECTS) $(test_u8_casecoll_DEPENDENCIES) 
+
+test-u8-casecoll$(EXEEXT): $(test_u8_casecoll_OBJECTS) $(test_u8_casecoll_DEPENDENCIES) $(EXTRA_test_u8_casecoll_DEPENDENCIES) 
 	@rm -f test-u8-casecoll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_casecoll_OBJECTS) $(test_u8_casecoll_LDADD) $(LIBS)
 unicase/test-u8-casefold.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u8-casefold$(EXEEXT): $(test_u8_casefold_OBJECTS) $(test_u8_casefold_DEPENDENCIES) 
+
+test-u8-casefold$(EXEEXT): $(test_u8_casefold_OBJECTS) $(test_u8_casefold_DEPENDENCIES) $(EXTRA_test_u8_casefold_DEPENDENCIES) 
 	@rm -f test-u8-casefold$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_casefold_OBJECTS) $(test_u8_casefold_LDADD) $(LIBS)
 unistr/test-u8-check.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-check$(EXEEXT): $(test_u8_check_OBJECTS) $(test_u8_check_DEPENDENCIES) 
+
+test-u8-check$(EXEEXT): $(test_u8_check_OBJECTS) $(test_u8_check_DEPENDENCIES) $(EXTRA_test_u8_check_DEPENDENCIES) 
 	@rm -f test-u8-check$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_check_OBJECTS) $(test_u8_check_LDADD) $(LIBS)
 unistr/test-u8-chr.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-chr$(EXEEXT): $(test_u8_chr_OBJECTS) $(test_u8_chr_DEPENDENCIES) 
+
+test-u8-chr$(EXEEXT): $(test_u8_chr_OBJECTS) $(test_u8_chr_DEPENDENCIES) $(EXTRA_test_u8_chr_DEPENDENCIES) 
 	@rm -f test-u8-chr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_chr_OBJECTS) $(test_u8_chr_LDADD) $(LIBS)
 unistr/test-u8-cmp.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-cmp$(EXEEXT): $(test_u8_cmp_OBJECTS) $(test_u8_cmp_DEPENDENCIES) 
+
+test-u8-cmp$(EXEEXT): $(test_u8_cmp_OBJECTS) $(test_u8_cmp_DEPENDENCIES) $(EXTRA_test_u8_cmp_DEPENDENCIES) 
 	@rm -f test-u8-cmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_cmp_OBJECTS) $(test_u8_cmp_LDADD) $(LIBS)
 unistr/test-u8-cmp2.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-cmp2$(EXEEXT): $(test_u8_cmp2_OBJECTS) $(test_u8_cmp2_DEPENDENCIES) 
+
+test-u8-cmp2$(EXEEXT): $(test_u8_cmp2_OBJECTS) $(test_u8_cmp2_DEPENDENCIES) $(EXTRA_test_u8_cmp2_DEPENDENCIES) 
 	@rm -f test-u8-cmp2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_cmp2_OBJECTS) $(test_u8_cmp2_LDADD) $(LIBS)
 uniconv/test-u8-conv-from-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
-test-u8-conv-from-enc$(EXEEXT): $(test_u8_conv_from_enc_OBJECTS) $(test_u8_conv_from_enc_DEPENDENCIES) 
+
+test-u8-conv-from-enc$(EXEEXT): $(test_u8_conv_from_enc_OBJECTS) $(test_u8_conv_from_enc_DEPENDENCIES) $(EXTRA_test_u8_conv_from_enc_DEPENDENCIES) 
 	@rm -f test-u8-conv-from-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_conv_from_enc_OBJECTS) $(test_u8_conv_from_enc_LDADD) $(LIBS)
 uniconv/test-u8-conv-to-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
-test-u8-conv-to-enc$(EXEEXT): $(test_u8_conv_to_enc_OBJECTS) $(test_u8_conv_to_enc_DEPENDENCIES) 
+
+test-u8-conv-to-enc$(EXEEXT): $(test_u8_conv_to_enc_OBJECTS) $(test_u8_conv_to_enc_DEPENDENCIES) $(EXTRA_test_u8_conv_to_enc_DEPENDENCIES) 
 	@rm -f test-u8-conv-to-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_conv_to_enc_OBJECTS) $(test_u8_conv_to_enc_LDADD) $(LIBS)
 unistr/test-u8-cpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-cpy$(EXEEXT): $(test_u8_cpy_OBJECTS) $(test_u8_cpy_DEPENDENCIES) 
+
+test-u8-cpy$(EXEEXT): $(test_u8_cpy_OBJECTS) $(test_u8_cpy_DEPENDENCIES) $(EXTRA_test_u8_cpy_DEPENDENCIES) 
 	@rm -f test-u8-cpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_cpy_OBJECTS) $(test_u8_cpy_LDADD) $(LIBS)
 unistr/test-u8-cpy-alloc.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-cpy-alloc$(EXEEXT): $(test_u8_cpy_alloc_OBJECTS) $(test_u8_cpy_alloc_DEPENDENCIES) 
+
+test-u8-cpy-alloc$(EXEEXT): $(test_u8_cpy_alloc_OBJECTS) $(test_u8_cpy_alloc_DEPENDENCIES) $(EXTRA_test_u8_cpy_alloc_DEPENDENCIES) 
 	@rm -f test-u8-cpy-alloc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_cpy_alloc_OBJECTS) $(test_u8_cpy_alloc_LDADD) $(LIBS)
+unigbrk/test-u8-grapheme-breaks.$(OBJEXT): unigbrk/$(am__dirstamp) \
+	unigbrk/$(DEPDIR)/$(am__dirstamp)
+
+test-u8-grapheme-breaks$(EXEEXT): $(test_u8_grapheme_breaks_OBJECTS) $(test_u8_grapheme_breaks_DEPENDENCIES) $(EXTRA_test_u8_grapheme_breaks_DEPENDENCIES) 
+	@rm -f test-u8-grapheme-breaks$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_grapheme_breaks_OBJECTS) $(test_u8_grapheme_breaks_LDADD) $(LIBS)
+unigbrk/test-u8-grapheme-next.$(OBJEXT): unigbrk/$(am__dirstamp) \
+	unigbrk/$(DEPDIR)/$(am__dirstamp)
+
+test-u8-grapheme-next$(EXEEXT): $(test_u8_grapheme_next_OBJECTS) $(test_u8_grapheme_next_DEPENDENCIES) $(EXTRA_test_u8_grapheme_next_DEPENDENCIES) 
+	@rm -f test-u8-grapheme-next$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_grapheme_next_OBJECTS) $(test_u8_grapheme_next_LDADD) $(LIBS)
+unigbrk/test-u8-grapheme-prev.$(OBJEXT): unigbrk/$(am__dirstamp) \
+	unigbrk/$(DEPDIR)/$(am__dirstamp)
+
+test-u8-grapheme-prev$(EXEEXT): $(test_u8_grapheme_prev_OBJECTS) $(test_u8_grapheme_prev_DEPENDENCIES) $(EXTRA_test_u8_grapheme_prev_DEPENDENCIES) 
+	@rm -f test-u8-grapheme-prev$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_grapheme_prev_OBJECTS) $(test_u8_grapheme_prev_LDADD) $(LIBS)
 unicase/test-u8-is-cased.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u8-is-cased$(EXEEXT): $(test_u8_is_cased_OBJECTS) $(test_u8_is_cased_DEPENDENCIES) 
+
+test-u8-is-cased$(EXEEXT): $(test_u8_is_cased_OBJECTS) $(test_u8_is_cased_DEPENDENCIES) $(EXTRA_test_u8_is_cased_DEPENDENCIES) 
 	@rm -f test-u8-is-cased$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_is_cased_OBJECTS) $(test_u8_is_cased_LDADD) $(LIBS)
 unicase/test-u8-is-casefolded.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u8-is-casefolded$(EXEEXT): $(test_u8_is_casefolded_OBJECTS) $(test_u8_is_casefolded_DEPENDENCIES) 
+
+test-u8-is-casefolded$(EXEEXT): $(test_u8_is_casefolded_OBJECTS) $(test_u8_is_casefolded_DEPENDENCIES) $(EXTRA_test_u8_is_casefolded_DEPENDENCIES) 
 	@rm -f test-u8-is-casefolded$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_is_casefolded_OBJECTS) $(test_u8_is_casefolded_LDADD) $(LIBS)
 unicase/test-u8-is-lowercase.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u8-is-lowercase$(EXEEXT): $(test_u8_is_lowercase_OBJECTS) $(test_u8_is_lowercase_DEPENDENCIES) 
+
+test-u8-is-lowercase$(EXEEXT): $(test_u8_is_lowercase_OBJECTS) $(test_u8_is_lowercase_DEPENDENCIES) $(EXTRA_test_u8_is_lowercase_DEPENDENCIES) 
 	@rm -f test-u8-is-lowercase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_is_lowercase_OBJECTS) $(test_u8_is_lowercase_LDADD) $(LIBS)
 unicase/test-u8-is-titlecase.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u8-is-titlecase$(EXEEXT): $(test_u8_is_titlecase_OBJECTS) $(test_u8_is_titlecase_DEPENDENCIES) 
+
+test-u8-is-titlecase$(EXEEXT): $(test_u8_is_titlecase_OBJECTS) $(test_u8_is_titlecase_DEPENDENCIES) $(EXTRA_test_u8_is_titlecase_DEPENDENCIES) 
 	@rm -f test-u8-is-titlecase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_is_titlecase_OBJECTS) $(test_u8_is_titlecase_LDADD) $(LIBS)
 unicase/test-u8-is-uppercase.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u8-is-uppercase$(EXEEXT): $(test_u8_is_uppercase_OBJECTS) $(test_u8_is_uppercase_DEPENDENCIES) 
+
+test-u8-is-uppercase$(EXEEXT): $(test_u8_is_uppercase_OBJECTS) $(test_u8_is_uppercase_DEPENDENCIES) $(EXTRA_test_u8_is_uppercase_DEPENDENCIES) 
 	@rm -f test-u8-is-uppercase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_is_uppercase_OBJECTS) $(test_u8_is_uppercase_LDADD) $(LIBS)
 unistr/test-u8-mblen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-mblen$(EXEEXT): $(test_u8_mblen_OBJECTS) $(test_u8_mblen_DEPENDENCIES) 
+
+test-u8-mblen$(EXEEXT): $(test_u8_mblen_OBJECTS) $(test_u8_mblen_DEPENDENCIES) $(EXTRA_test_u8_mblen_DEPENDENCIES) 
 	@rm -f test-u8-mblen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_mblen_OBJECTS) $(test_u8_mblen_LDADD) $(LIBS)
 unistr/test-u8-mbsnlen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-mbsnlen$(EXEEXT): $(test_u8_mbsnlen_OBJECTS) $(test_u8_mbsnlen_DEPENDENCIES) 
+
+test-u8-mbsnlen$(EXEEXT): $(test_u8_mbsnlen_OBJECTS) $(test_u8_mbsnlen_DEPENDENCIES) $(EXTRA_test_u8_mbsnlen_DEPENDENCIES) 
 	@rm -f test-u8-mbsnlen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_mbsnlen_OBJECTS) $(test_u8_mbsnlen_LDADD) $(LIBS)
 unistr/test-u8-mbtouc.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-mbtouc$(EXEEXT): $(test_u8_mbtouc_OBJECTS) $(test_u8_mbtouc_DEPENDENCIES) 
+
+test-u8-mbtouc$(EXEEXT): $(test_u8_mbtouc_OBJECTS) $(test_u8_mbtouc_DEPENDENCIES) $(EXTRA_test_u8_mbtouc_DEPENDENCIES) 
 	@rm -f test-u8-mbtouc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_mbtouc_OBJECTS) $(test_u8_mbtouc_LDADD) $(LIBS)
 unistr/test-u8-mbtouc-unsafe.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-mbtouc-unsafe$(EXEEXT): $(test_u8_mbtouc_unsafe_OBJECTS) $(test_u8_mbtouc_unsafe_DEPENDENCIES) 
+
+test-u8-mbtouc-unsafe$(EXEEXT): $(test_u8_mbtouc_unsafe_OBJECTS) $(test_u8_mbtouc_unsafe_DEPENDENCIES) $(EXTRA_test_u8_mbtouc_unsafe_DEPENDENCIES) 
 	@rm -f test-u8-mbtouc-unsafe$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_mbtouc_unsafe_OBJECTS) $(test_u8_mbtouc_unsafe_LDADD) $(LIBS)
 unistr/test-u8-mbtoucr.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-mbtoucr$(EXEEXT): $(test_u8_mbtoucr_OBJECTS) $(test_u8_mbtoucr_DEPENDENCIES) 
+
+test-u8-mbtoucr$(EXEEXT): $(test_u8_mbtoucr_OBJECTS) $(test_u8_mbtoucr_DEPENDENCIES) $(EXTRA_test_u8_mbtoucr_DEPENDENCIES) 
 	@rm -f test-u8-mbtoucr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_mbtoucr_OBJECTS) $(test_u8_mbtoucr_LDADD) $(LIBS)
 unistr/test-u8-move.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-move$(EXEEXT): $(test_u8_move_OBJECTS) $(test_u8_move_DEPENDENCIES) 
+
+test-u8-move$(EXEEXT): $(test_u8_move_OBJECTS) $(test_u8_move_DEPENDENCIES) $(EXTRA_test_u8_move_DEPENDENCIES) 
 	@rm -f test-u8-move$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_move_OBJECTS) $(test_u8_move_LDADD) $(LIBS)
 unistr/test-u8-next.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-next$(EXEEXT): $(test_u8_next_OBJECTS) $(test_u8_next_DEPENDENCIES) 
+
+test-u8-next$(EXEEXT): $(test_u8_next_OBJECTS) $(test_u8_next_DEPENDENCIES) $(EXTRA_test_u8_next_DEPENDENCIES) 
 	@rm -f test-u8-next$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_next_OBJECTS) $(test_u8_next_LDADD) $(LIBS)
 uninorm/test-u8-normcmp.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-u8-normcmp$(EXEEXT): $(test_u8_normcmp_OBJECTS) $(test_u8_normcmp_DEPENDENCIES) 
+
+test-u8-normcmp$(EXEEXT): $(test_u8_normcmp_OBJECTS) $(test_u8_normcmp_DEPENDENCIES) $(EXTRA_test_u8_normcmp_DEPENDENCIES) 
 	@rm -f test-u8-normcmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_normcmp_OBJECTS) $(test_u8_normcmp_LDADD) $(LIBS)
 uninorm/test-u8-normcoll.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-u8-normcoll$(EXEEXT): $(test_u8_normcoll_OBJECTS) $(test_u8_normcoll_DEPENDENCIES) 
+
+test-u8-normcoll$(EXEEXT): $(test_u8_normcoll_OBJECTS) $(test_u8_normcoll_DEPENDENCIES) $(EXTRA_test_u8_normcoll_DEPENDENCIES) 
 	@rm -f test-u8-normcoll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_normcoll_OBJECTS) $(test_u8_normcoll_LDADD) $(LIBS)
 unilbrk/test-u8-possible-linebreaks.$(OBJEXT):  \
 	unilbrk/$(am__dirstamp) unilbrk/$(DEPDIR)/$(am__dirstamp)
-test-u8-possible-linebreaks$(EXEEXT): $(test_u8_possible_linebreaks_OBJECTS) $(test_u8_possible_linebreaks_DEPENDENCIES) 
+
+test-u8-possible-linebreaks$(EXEEXT): $(test_u8_possible_linebreaks_OBJECTS) $(test_u8_possible_linebreaks_DEPENDENCIES) $(EXTRA_test_u8_possible_linebreaks_DEPENDENCIES) 
 	@rm -f test-u8-possible-linebreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_possible_linebreaks_OBJECTS) $(test_u8_possible_linebreaks_LDADD) $(LIBS)
 unistr/test-u8-prev.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-prev$(EXEEXT): $(test_u8_prev_OBJECTS) $(test_u8_prev_DEPENDENCIES) 
+
+test-u8-prev$(EXEEXT): $(test_u8_prev_OBJECTS) $(test_u8_prev_DEPENDENCIES) $(EXTRA_test_u8_prev_DEPENDENCIES) 
 	@rm -f test-u8-prev$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_prev_OBJECTS) $(test_u8_prev_LDADD) $(LIBS)
 unistr/test-u8-set.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-set$(EXEEXT): $(test_u8_set_OBJECTS) $(test_u8_set_DEPENDENCIES) 
+
+test-u8-set$(EXEEXT): $(test_u8_set_OBJECTS) $(test_u8_set_DEPENDENCIES) $(EXTRA_test_u8_set_DEPENDENCIES) 
 	@rm -f test-u8-set$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_set_OBJECTS) $(test_u8_set_LDADD) $(LIBS)
 unistr/test-u8-stpcpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-stpcpy$(EXEEXT): $(test_u8_stpcpy_OBJECTS) $(test_u8_stpcpy_DEPENDENCIES) 
+
+test-u8-stpcpy$(EXEEXT): $(test_u8_stpcpy_OBJECTS) $(test_u8_stpcpy_DEPENDENCIES) $(EXTRA_test_u8_stpcpy_DEPENDENCIES) 
 	@rm -f test-u8-stpcpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_stpcpy_OBJECTS) $(test_u8_stpcpy_LDADD) $(LIBS)
 unistr/test-u8-stpncpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-stpncpy$(EXEEXT): $(test_u8_stpncpy_OBJECTS) $(test_u8_stpncpy_DEPENDENCIES) 
+
+test-u8-stpncpy$(EXEEXT): $(test_u8_stpncpy_OBJECTS) $(test_u8_stpncpy_DEPENDENCIES) $(EXTRA_test_u8_stpncpy_DEPENDENCIES) 
 	@rm -f test-u8-stpncpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_stpncpy_OBJECTS) $(test_u8_stpncpy_LDADD) $(LIBS)
 unistr/test-u8-strcat.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-strcat$(EXEEXT): $(test_u8_strcat_OBJECTS) $(test_u8_strcat_DEPENDENCIES) 
+
+test-u8-strcat$(EXEEXT): $(test_u8_strcat_OBJECTS) $(test_u8_strcat_DEPENDENCIES) $(EXTRA_test_u8_strcat_DEPENDENCIES) 
 	@rm -f test-u8-strcat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strcat_OBJECTS) $(test_u8_strcat_LDADD) $(LIBS)
+unistr/test-u8-strchr.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+
+test-u8-strchr$(EXEEXT): $(test_u8_strchr_OBJECTS) $(test_u8_strchr_DEPENDENCIES) $(EXTRA_test_u8_strchr_DEPENDENCIES) 
+	@rm -f test-u8-strchr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strchr_OBJECTS) $(test_u8_strchr_LDADD) $(LIBS)
 unistr/test-u8-strcmp.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-strcmp$(EXEEXT): $(test_u8_strcmp_OBJECTS) $(test_u8_strcmp_DEPENDENCIES) 
+
+test-u8-strcmp$(EXEEXT): $(test_u8_strcmp_OBJECTS) $(test_u8_strcmp_DEPENDENCIES) $(EXTRA_test_u8_strcmp_DEPENDENCIES) 
 	@rm -f test-u8-strcmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strcmp_OBJECTS) $(test_u8_strcmp_LDADD) $(LIBS)
 unistr/test-u8-strcoll.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-strcoll$(EXEEXT): $(test_u8_strcoll_OBJECTS) $(test_u8_strcoll_DEPENDENCIES) 
+
+test-u8-strcoll$(EXEEXT): $(test_u8_strcoll_OBJECTS) $(test_u8_strcoll_DEPENDENCIES) $(EXTRA_test_u8_strcoll_DEPENDENCIES) 
 	@rm -f test-u8-strcoll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strcoll_OBJECTS) $(test_u8_strcoll_LDADD) $(LIBS)
 uniconv/test-u8-strconv-from-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
-test-u8-strconv-from-enc$(EXEEXT): $(test_u8_strconv_from_enc_OBJECTS) $(test_u8_strconv_from_enc_DEPENDENCIES) 
+
+test-u8-strconv-from-enc$(EXEEXT): $(test_u8_strconv_from_enc_OBJECTS) $(test_u8_strconv_from_enc_DEPENDENCIES) $(EXTRA_test_u8_strconv_from_enc_DEPENDENCIES) 
 	@rm -f test-u8-strconv-from-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strconv_from_enc_OBJECTS) $(test_u8_strconv_from_enc_LDADD) $(LIBS)
 uniconv/test-u8-strconv-to-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
-test-u8-strconv-to-enc$(EXEEXT): $(test_u8_strconv_to_enc_OBJECTS) $(test_u8_strconv_to_enc_DEPENDENCIES) 
+
+test-u8-strconv-to-enc$(EXEEXT): $(test_u8_strconv_to_enc_OBJECTS) $(test_u8_strconv_to_enc_DEPENDENCIES) $(EXTRA_test_u8_strconv_to_enc_DEPENDENCIES) 
 	@rm -f test-u8-strconv-to-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strconv_to_enc_OBJECTS) $(test_u8_strconv_to_enc_LDADD) $(LIBS)
 unistr/test-u8-strcpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-strcpy$(EXEEXT): $(test_u8_strcpy_OBJECTS) $(test_u8_strcpy_DEPENDENCIES) 
+
+test-u8-strcpy$(EXEEXT): $(test_u8_strcpy_OBJECTS) $(test_u8_strcpy_DEPENDENCIES) $(EXTRA_test_u8_strcpy_DEPENDENCIES) 
 	@rm -f test-u8-strcpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strcpy_OBJECTS) $(test_u8_strcpy_LDADD) $(LIBS)
 unistr/test-u8-strdup.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-strdup$(EXEEXT): $(test_u8_strdup_OBJECTS) $(test_u8_strdup_DEPENDENCIES) 
+
+test-u8-strdup$(EXEEXT): $(test_u8_strdup_OBJECTS) $(test_u8_strdup_DEPENDENCIES) $(EXTRA_test_u8_strdup_DEPENDENCIES) 
 	@rm -f test-u8-strdup$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strdup_OBJECTS) $(test_u8_strdup_LDADD) $(LIBS)
 unistr/test-u8-strlen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-strlen$(EXEEXT): $(test_u8_strlen_OBJECTS) $(test_u8_strlen_DEPENDENCIES) 
+
+test-u8-strlen$(EXEEXT): $(test_u8_strlen_OBJECTS) $(test_u8_strlen_DEPENDENCIES) $(EXTRA_test_u8_strlen_DEPENDENCIES) 
 	@rm -f test-u8-strlen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strlen_OBJECTS) $(test_u8_strlen_LDADD) $(LIBS)
 unistr/test-u8-strmblen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-strmblen$(EXEEXT): $(test_u8_strmblen_OBJECTS) $(test_u8_strmblen_DEPENDENCIES) 
+
+test-u8-strmblen$(EXEEXT): $(test_u8_strmblen_OBJECTS) $(test_u8_strmblen_DEPENDENCIES) $(EXTRA_test_u8_strmblen_DEPENDENCIES) 
 	@rm -f test-u8-strmblen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strmblen_OBJECTS) $(test_u8_strmblen_LDADD) $(LIBS)
 unistr/test-u8-strmbtouc.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-strmbtouc$(EXEEXT): $(test_u8_strmbtouc_OBJECTS) $(test_u8_strmbtouc_DEPENDENCIES) 
+
+test-u8-strmbtouc$(EXEEXT): $(test_u8_strmbtouc_OBJECTS) $(test_u8_strmbtouc_DEPENDENCIES) $(EXTRA_test_u8_strmbtouc_DEPENDENCIES) 
 	@rm -f test-u8-strmbtouc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strmbtouc_OBJECTS) $(test_u8_strmbtouc_LDADD) $(LIBS)
 unistr/test-u8-strncat.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-strncat$(EXEEXT): $(test_u8_strncat_OBJECTS) $(test_u8_strncat_DEPENDENCIES) 
+
+test-u8-strncat$(EXEEXT): $(test_u8_strncat_OBJECTS) $(test_u8_strncat_DEPENDENCIES) $(EXTRA_test_u8_strncat_DEPENDENCIES) 
 	@rm -f test-u8-strncat$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strncat_OBJECTS) $(test_u8_strncat_LDADD) $(LIBS)
 unistr/test-u8-strncmp.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-strncmp$(EXEEXT): $(test_u8_strncmp_OBJECTS) $(test_u8_strncmp_DEPENDENCIES) 
+
+test-u8-strncmp$(EXEEXT): $(test_u8_strncmp_OBJECTS) $(test_u8_strncmp_DEPENDENCIES) $(EXTRA_test_u8_strncmp_DEPENDENCIES) 
 	@rm -f test-u8-strncmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strncmp_OBJECTS) $(test_u8_strncmp_LDADD) $(LIBS)
 unistr/test-u8-strncpy.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-strncpy$(EXEEXT): $(test_u8_strncpy_OBJECTS) $(test_u8_strncpy_DEPENDENCIES) 
+
+test-u8-strncpy$(EXEEXT): $(test_u8_strncpy_OBJECTS) $(test_u8_strncpy_DEPENDENCIES) $(EXTRA_test_u8_strncpy_DEPENDENCIES) 
 	@rm -f test-u8-strncpy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strncpy_OBJECTS) $(test_u8_strncpy_LDADD) $(LIBS)
 unistr/test-u8-strnlen.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-strnlen$(EXEEXT): $(test_u8_strnlen_OBJECTS) $(test_u8_strnlen_DEPENDENCIES) 
+
+test-u8-strnlen$(EXEEXT): $(test_u8_strnlen_OBJECTS) $(test_u8_strnlen_DEPENDENCIES) $(EXTRA_test_u8_strnlen_DEPENDENCIES) 
 	@rm -f test-u8-strnlen$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strnlen_OBJECTS) $(test_u8_strnlen_LDADD) $(LIBS)
+unistr/test-u8-strstr.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+
+test-u8-strstr$(EXEEXT): $(test_u8_strstr_OBJECTS) $(test_u8_strstr_DEPENDENCIES) $(EXTRA_test_u8_strstr_DEPENDENCIES) 
+	@rm -f test-u8-strstr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strstr_OBJECTS) $(test_u8_strstr_LDADD) $(LIBS)
+unistr/test-u8-strtok.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+
+test-u8-strtok$(EXEEXT): $(test_u8_strtok_OBJECTS) $(test_u8_strtok_DEPENDENCIES) $(EXTRA_test_u8_strtok_DEPENDENCIES) 
+	@rm -f test-u8-strtok$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strtok_OBJECTS) $(test_u8_strtok_LDADD) $(LIBS)
 uniwidth/test-u8-strwidth.$(OBJEXT): uniwidth/$(am__dirstamp) \
 	uniwidth/$(DEPDIR)/$(am__dirstamp)
-test-u8-strwidth$(EXEEXT): $(test_u8_strwidth_OBJECTS) $(test_u8_strwidth_DEPENDENCIES) 
+
+test-u8-strwidth$(EXEEXT): $(test_u8_strwidth_OBJECTS) $(test_u8_strwidth_DEPENDENCIES) $(EXTRA_test_u8_strwidth_DEPENDENCIES) 
 	@rm -f test-u8-strwidth$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strwidth_OBJECTS) $(test_u8_strwidth_LDADD) $(LIBS)
 unistr/test-u8-to-u16.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-to-u16$(EXEEXT): $(test_u8_to_u16_OBJECTS) $(test_u8_to_u16_DEPENDENCIES) 
+
+test-u8-to-u16$(EXEEXT): $(test_u8_to_u16_OBJECTS) $(test_u8_to_u16_DEPENDENCIES) $(EXTRA_test_u8_to_u16_DEPENDENCIES) 
 	@rm -f test-u8-to-u16$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_to_u16_OBJECTS) $(test_u8_to_u16_LDADD) $(LIBS)
 unistr/test-u8-to-u32.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-to-u32$(EXEEXT): $(test_u8_to_u32_OBJECTS) $(test_u8_to_u32_DEPENDENCIES) 
+
+test-u8-to-u32$(EXEEXT): $(test_u8_to_u32_OBJECTS) $(test_u8_to_u32_DEPENDENCIES) $(EXTRA_test_u8_to_u32_DEPENDENCIES) 
 	@rm -f test-u8-to-u32$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_to_u32_OBJECTS) $(test_u8_to_u32_LDADD) $(LIBS)
 unicase/test-u8-tolower.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u8-tolower$(EXEEXT): $(test_u8_tolower_OBJECTS) $(test_u8_tolower_DEPENDENCIES) 
+
+test-u8-tolower$(EXEEXT): $(test_u8_tolower_OBJECTS) $(test_u8_tolower_DEPENDENCIES) $(EXTRA_test_u8_tolower_DEPENDENCIES) 
 	@rm -f test-u8-tolower$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_tolower_OBJECTS) $(test_u8_tolower_LDADD) $(LIBS)
 unicase/test-u8-totitle.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u8-totitle$(EXEEXT): $(test_u8_totitle_OBJECTS) $(test_u8_totitle_DEPENDENCIES) 
+
+test-u8-totitle$(EXEEXT): $(test_u8_totitle_OBJECTS) $(test_u8_totitle_DEPENDENCIES) $(EXTRA_test_u8_totitle_DEPENDENCIES) 
 	@rm -f test-u8-totitle$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_totitle_OBJECTS) $(test_u8_totitle_LDADD) $(LIBS)
 unicase/test-u8-toupper.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-u8-toupper$(EXEEXT): $(test_u8_toupper_OBJECTS) $(test_u8_toupper_DEPENDENCIES) 
+
+test-u8-toupper$(EXEEXT): $(test_u8_toupper_OBJECTS) $(test_u8_toupper_DEPENDENCIES) $(EXTRA_test_u8_toupper_DEPENDENCIES) 
 	@rm -f test-u8-toupper$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_toupper_OBJECTS) $(test_u8_toupper_LDADD) $(LIBS)
 unistr/test-u8-uctomb.$(OBJEXT): unistr/$(am__dirstamp) \
 	unistr/$(DEPDIR)/$(am__dirstamp)
-test-u8-uctomb$(EXEEXT): $(test_u8_uctomb_OBJECTS) $(test_u8_uctomb_DEPENDENCIES) 
+
+test-u8-uctomb$(EXEEXT): $(test_u8_uctomb_OBJECTS) $(test_u8_uctomb_DEPENDENCIES) $(EXTRA_test_u8_uctomb_DEPENDENCIES) 
 	@rm -f test-u8-uctomb$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_uctomb_OBJECTS) $(test_u8_uctomb_LDADD) $(LIBS)
 unistdio/test-u8-vasnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u8-vasnprintf1$(EXEEXT): $(test_u8_vasnprintf1_OBJECTS) $(test_u8_vasnprintf1_DEPENDENCIES) 
+
+test-u8-vasnprintf1$(EXEEXT): $(test_u8_vasnprintf1_OBJECTS) $(test_u8_vasnprintf1_DEPENDENCIES) $(EXTRA_test_u8_vasnprintf1_DEPENDENCIES) 
 	@rm -f test-u8-vasnprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_vasnprintf1_OBJECTS) $(test_u8_vasnprintf1_LDADD) $(LIBS)
 unistdio/test-u8-vasnprintf2.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u8-vasnprintf2$(EXEEXT): $(test_u8_vasnprintf2_OBJECTS) $(test_u8_vasnprintf2_DEPENDENCIES) 
+
+test-u8-vasnprintf2$(EXEEXT): $(test_u8_vasnprintf2_OBJECTS) $(test_u8_vasnprintf2_DEPENDENCIES) $(EXTRA_test_u8_vasnprintf2_DEPENDENCIES) 
 	@rm -f test-u8-vasnprintf2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_vasnprintf2_OBJECTS) $(test_u8_vasnprintf2_LDADD) $(LIBS)
 unistdio/test-u8-vasnprintf3.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u8-vasnprintf3$(EXEEXT): $(test_u8_vasnprintf3_OBJECTS) $(test_u8_vasnprintf3_DEPENDENCIES) 
+
+test-u8-vasnprintf3$(EXEEXT): $(test_u8_vasnprintf3_OBJECTS) $(test_u8_vasnprintf3_DEPENDENCIES) $(EXTRA_test_u8_vasnprintf3_DEPENDENCIES) 
 	@rm -f test-u8-vasnprintf3$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_vasnprintf3_OBJECTS) $(test_u8_vasnprintf3_LDADD) $(LIBS)
 unistdio/test-u8-vasprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u8-vasprintf1$(EXEEXT): $(test_u8_vasprintf1_OBJECTS) $(test_u8_vasprintf1_DEPENDENCIES) 
+
+test-u8-vasprintf1$(EXEEXT): $(test_u8_vasprintf1_OBJECTS) $(test_u8_vasprintf1_DEPENDENCIES) $(EXTRA_test_u8_vasprintf1_DEPENDENCIES) 
 	@rm -f test-u8-vasprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_vasprintf1_OBJECTS) $(test_u8_vasprintf1_LDADD) $(LIBS)
 unistdio/test-u8-vsnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u8-vsnprintf1$(EXEEXT): $(test_u8_vsnprintf1_OBJECTS) $(test_u8_vsnprintf1_DEPENDENCIES) 
+
+test-u8-vsnprintf1$(EXEEXT): $(test_u8_vsnprintf1_OBJECTS) $(test_u8_vsnprintf1_DEPENDENCIES) $(EXTRA_test_u8_vsnprintf1_DEPENDENCIES) 
 	@rm -f test-u8-vsnprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_vsnprintf1_OBJECTS) $(test_u8_vsnprintf1_LDADD) $(LIBS)
 unistdio/test-u8-vsprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-u8-vsprintf1$(EXEEXT): $(test_u8_vsprintf1_OBJECTS) $(test_u8_vsprintf1_DEPENDENCIES) 
+
+test-u8-vsprintf1$(EXEEXT): $(test_u8_vsprintf1_OBJECTS) $(test_u8_vsprintf1_DEPENDENCIES) $(EXTRA_test_u8_vsprintf1_DEPENDENCIES) 
 	@rm -f test-u8-vsprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_vsprintf1_OBJECTS) $(test_u8_vsprintf1_LDADD) $(LIBS)
 uniwidth/test-u8-width.$(OBJEXT): uniwidth/$(am__dirstamp) \
 	uniwidth/$(DEPDIR)/$(am__dirstamp)
-test-u8-width$(EXEEXT): $(test_u8_width_OBJECTS) $(test_u8_width_DEPENDENCIES) 
+
+test-u8-width$(EXEEXT): $(test_u8_width_OBJECTS) $(test_u8_width_DEPENDENCIES) $(EXTRA_test_u8_width_DEPENDENCIES) 
 	@rm -f test-u8-width$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_width_OBJECTS) $(test_u8_width_LDADD) $(LIBS)
 unilbrk/test-u8-width-linebreaks.$(OBJEXT): unilbrk/$(am__dirstamp) \
 	unilbrk/$(DEPDIR)/$(am__dirstamp)
-test-u8-width-linebreaks$(EXEEXT): $(test_u8_width_linebreaks_OBJECTS) $(test_u8_width_linebreaks_DEPENDENCIES) 
+
+test-u8-width-linebreaks$(EXEEXT): $(test_u8_width_linebreaks_OBJECTS) $(test_u8_width_linebreaks_DEPENDENCIES) $(EXTRA_test_u8_width_linebreaks_DEPENDENCIES) 
 	@rm -f test-u8-width-linebreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_width_linebreaks_OBJECTS) $(test_u8_width_linebreaks_LDADD) $(LIBS)
 uniwbrk/test-u8-wordbreaks.$(OBJEXT): uniwbrk/$(am__dirstamp) \
 	uniwbrk/$(DEPDIR)/$(am__dirstamp)
-test-u8-wordbreaks$(EXEEXT): $(test_u8_wordbreaks_OBJECTS) $(test_u8_wordbreaks_DEPENDENCIES) 
+
+test-u8-wordbreaks$(EXEEXT): $(test_u8_wordbreaks_OBJECTS) $(test_u8_wordbreaks_DEPENDENCIES) $(EXTRA_test_u8_wordbreaks_DEPENDENCIES) 
 	@rm -f test-u8-wordbreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_wordbreaks_OBJECTS) $(test_u8_wordbreaks_LDADD) $(LIBS)
+unigbrk/test-uc-gbrk-prop.$(OBJEXT): unigbrk/$(am__dirstamp) \
+	unigbrk/$(DEPDIR)/$(am__dirstamp)
+
+test-uc-gbrk-prop$(EXEEXT): $(test_uc_gbrk_prop_OBJECTS) $(test_uc_gbrk_prop_DEPENDENCIES) $(EXTRA_test_uc_gbrk_prop_DEPENDENCIES) 
+	@rm -f test-uc-gbrk-prop$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_uc_gbrk_prop_OBJECTS) $(test_uc_gbrk_prop_LDADD) $(LIBS)
+unigbrk/test-uc-is-grapheme-break.$(OBJEXT): unigbrk/$(am__dirstamp) \
+	unigbrk/$(DEPDIR)/$(am__dirstamp)
+
+test-uc-is-grapheme-break$(EXEEXT): $(test_uc_is_grapheme_break_OBJECTS) $(test_uc_is_grapheme_break_DEPENDENCIES) $(EXTRA_test_uc_is_grapheme_break_DEPENDENCIES) 
+	@rm -f test-uc-is-grapheme-break$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_uc_is_grapheme_break_OBJECTS) $(test_uc_is_grapheme_break_LDADD) $(LIBS)
+uniwbrk/test-uc-wordbreaks.$(OBJEXT): uniwbrk/$(am__dirstamp) \
+	uniwbrk/$(DEPDIR)/$(am__dirstamp)
+
+test-uc-wordbreaks$(EXEEXT): $(test_uc_wordbreaks_OBJECTS) $(test_uc_wordbreaks_DEPENDENCIES) $(EXTRA_test_uc_wordbreaks_DEPENDENCIES) 
+	@rm -f test-uc-wordbreaks$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_uc_wordbreaks_OBJECTS) $(test_uc_wordbreaks_LDADD) $(LIBS)
 unicase/test-uc_tolower.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-uc_tolower$(EXEEXT): $(test_uc_tolower_OBJECTS) $(test_uc_tolower_DEPENDENCIES) 
+
+test-uc_tolower$(EXEEXT): $(test_uc_tolower_OBJECTS) $(test_uc_tolower_DEPENDENCIES) $(EXTRA_test_uc_tolower_DEPENDENCIES) 
 	@rm -f test-uc_tolower$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_uc_tolower_OBJECTS) $(test_uc_tolower_LDADD) $(LIBS)
 unicase/test-uc_totitle.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-uc_totitle$(EXEEXT): $(test_uc_totitle_OBJECTS) $(test_uc_totitle_DEPENDENCIES) 
+
+test-uc_totitle$(EXEEXT): $(test_uc_totitle_OBJECTS) $(test_uc_totitle_DEPENDENCIES) $(EXTRA_test_uc_totitle_DEPENDENCIES) 
 	@rm -f test-uc_totitle$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_uc_totitle_OBJECTS) $(test_uc_totitle_LDADD) $(LIBS)
 unicase/test-uc_toupper.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-uc_toupper$(EXEEXT): $(test_uc_toupper_OBJECTS) $(test_uc_toupper_DEPENDENCIES) 
+
+test-uc_toupper$(EXEEXT): $(test_uc_toupper_OBJECTS) $(test_uc_toupper_DEPENDENCIES) $(EXTRA_test_uc_toupper_DEPENDENCIES) 
 	@rm -f test-uc_toupper$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_uc_toupper_OBJECTS) $(test_uc_toupper_LDADD) $(LIBS)
 uniwidth/test-uc_width.$(OBJEXT): uniwidth/$(am__dirstamp) \
 	uniwidth/$(DEPDIR)/$(am__dirstamp)
-test-uc_width$(EXEEXT): $(test_uc_width_OBJECTS) $(test_uc_width_DEPENDENCIES) 
+
+test-uc_width$(EXEEXT): $(test_uc_width_OBJECTS) $(test_uc_width_DEPENDENCIES) $(EXTRA_test_uc_width_DEPENDENCIES) 
 	@rm -f test-uc_width$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_uc_width_OBJECTS) $(test_uc_width_LDADD) $(LIBS)
 uniwidth/test-uc_width2.$(OBJEXT): uniwidth/$(am__dirstamp) \
 	uniwidth/$(DEPDIR)/$(am__dirstamp)
-test-uc_width2$(EXEEXT): $(test_uc_width2_OBJECTS) $(test_uc_width2_DEPENDENCIES) 
+
+test-uc_width2$(EXEEXT): $(test_uc_width2_OBJECTS) $(test_uc_width2_DEPENDENCIES) $(EXTRA_test_uc_width2_DEPENDENCIES) 
 	@rm -f test-uc_width2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_uc_width2_OBJECTS) $(test_uc_width2_LDADD) $(LIBS)
 unistdio/test-ulc-asnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-ulc-asnprintf1$(EXEEXT): $(test_ulc_asnprintf1_OBJECTS) $(test_ulc_asnprintf1_DEPENDENCIES) 
+
+test-ulc-asnprintf1$(EXEEXT): $(test_ulc_asnprintf1_OBJECTS) $(test_ulc_asnprintf1_DEPENDENCIES) $(EXTRA_test_ulc_asnprintf1_DEPENDENCIES) 
 	@rm -f test-ulc-asnprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ulc_asnprintf1_OBJECTS) $(test_ulc_asnprintf1_LDADD) $(LIBS)
 unicase/test-ulc-casecmp.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-ulc-casecmp$(EXEEXT): $(test_ulc_casecmp_OBJECTS) $(test_ulc_casecmp_DEPENDENCIES) 
+
+test-ulc-casecmp$(EXEEXT): $(test_ulc_casecmp_OBJECTS) $(test_ulc_casecmp_DEPENDENCIES) $(EXTRA_test_ulc_casecmp_DEPENDENCIES) 
 	@rm -f test-ulc-casecmp$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ulc_casecmp_OBJECTS) $(test_ulc_casecmp_LDADD) $(LIBS)
 unicase/test-ulc-casecoll.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
-test-ulc-casecoll$(EXEEXT): $(test_ulc_casecoll_OBJECTS) $(test_ulc_casecoll_DEPENDENCIES) 
+
+test-ulc-casecoll$(EXEEXT): $(test_ulc_casecoll_OBJECTS) $(test_ulc_casecoll_DEPENDENCIES) $(EXTRA_test_ulc_casecoll_DEPENDENCIES) 
 	@rm -f test-ulc-casecoll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ulc_casecoll_OBJECTS) $(test_ulc_casecoll_LDADD) $(LIBS)
+unigbrk/test-ulc-grapheme-breaks.$(OBJEXT): unigbrk/$(am__dirstamp) \
+	unigbrk/$(DEPDIR)/$(am__dirstamp)
+
+test-ulc-grapheme-breaks$(EXEEXT): $(test_ulc_grapheme_breaks_OBJECTS) $(test_ulc_grapheme_breaks_DEPENDENCIES) $(EXTRA_test_ulc_grapheme_breaks_DEPENDENCIES) 
+	@rm -f test-ulc-grapheme-breaks$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_ulc_grapheme_breaks_OBJECTS) $(test_ulc_grapheme_breaks_LDADD) $(LIBS)
 unilbrk/test-ulc-possible-linebreaks.$(OBJEXT):  \
 	unilbrk/$(am__dirstamp) unilbrk/$(DEPDIR)/$(am__dirstamp)
-test-ulc-possible-linebreaks$(EXEEXT): $(test_ulc_possible_linebreaks_OBJECTS) $(test_ulc_possible_linebreaks_DEPENDENCIES) 
+
+test-ulc-possible-linebreaks$(EXEEXT): $(test_ulc_possible_linebreaks_OBJECTS) $(test_ulc_possible_linebreaks_DEPENDENCIES) $(EXTRA_test_ulc_possible_linebreaks_DEPENDENCIES) 
 	@rm -f test-ulc-possible-linebreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ulc_possible_linebreaks_OBJECTS) $(test_ulc_possible_linebreaks_LDADD) $(LIBS)
 unistdio/test-ulc-vasnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-ulc-vasnprintf1$(EXEEXT): $(test_ulc_vasnprintf1_OBJECTS) $(test_ulc_vasnprintf1_DEPENDENCIES) 
+
+test-ulc-vasnprintf1$(EXEEXT): $(test_ulc_vasnprintf1_OBJECTS) $(test_ulc_vasnprintf1_DEPENDENCIES) $(EXTRA_test_ulc_vasnprintf1_DEPENDENCIES) 
 	@rm -f test-ulc-vasnprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ulc_vasnprintf1_OBJECTS) $(test_ulc_vasnprintf1_LDADD) $(LIBS)
 unistdio/test-ulc-vasnprintf2.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-ulc-vasnprintf2$(EXEEXT): $(test_ulc_vasnprintf2_OBJECTS) $(test_ulc_vasnprintf2_DEPENDENCIES) 
+
+test-ulc-vasnprintf2$(EXEEXT): $(test_ulc_vasnprintf2_OBJECTS) $(test_ulc_vasnprintf2_DEPENDENCIES) $(EXTRA_test_ulc_vasnprintf2_DEPENDENCIES) 
 	@rm -f test-ulc-vasnprintf2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ulc_vasnprintf2_OBJECTS) $(test_ulc_vasnprintf2_LDADD) $(LIBS)
 unistdio/test-ulc-vasnprintf3.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-ulc-vasnprintf3$(EXEEXT): $(test_ulc_vasnprintf3_OBJECTS) $(test_ulc_vasnprintf3_DEPENDENCIES) 
+
+test-ulc-vasnprintf3$(EXEEXT): $(test_ulc_vasnprintf3_OBJECTS) $(test_ulc_vasnprintf3_DEPENDENCIES) $(EXTRA_test_ulc_vasnprintf3_DEPENDENCIES) 
 	@rm -f test-ulc-vasnprintf3$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ulc_vasnprintf3_OBJECTS) $(test_ulc_vasnprintf3_LDADD) $(LIBS)
 unistdio/test-ulc-vasprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-ulc-vasprintf1$(EXEEXT): $(test_ulc_vasprintf1_OBJECTS) $(test_ulc_vasprintf1_DEPENDENCIES) 
+
+test-ulc-vasprintf1$(EXEEXT): $(test_ulc_vasprintf1_OBJECTS) $(test_ulc_vasprintf1_DEPENDENCIES) $(EXTRA_test_ulc_vasprintf1_DEPENDENCIES) 
 	@rm -f test-ulc-vasprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ulc_vasprintf1_OBJECTS) $(test_ulc_vasprintf1_LDADD) $(LIBS)
 unistdio/test-ulc-vsnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-ulc-vsnprintf1$(EXEEXT): $(test_ulc_vsnprintf1_OBJECTS) $(test_ulc_vsnprintf1_DEPENDENCIES) 
+
+test-ulc-vsnprintf1$(EXEEXT): $(test_ulc_vsnprintf1_OBJECTS) $(test_ulc_vsnprintf1_DEPENDENCIES) $(EXTRA_test_ulc_vsnprintf1_DEPENDENCIES) 
 	@rm -f test-ulc-vsnprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ulc_vsnprintf1_OBJECTS) $(test_ulc_vsnprintf1_LDADD) $(LIBS)
 unistdio/test-ulc-vsprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
-test-ulc-vsprintf1$(EXEEXT): $(test_ulc_vsprintf1_OBJECTS) $(test_ulc_vsprintf1_DEPENDENCIES) 
+
+test-ulc-vsprintf1$(EXEEXT): $(test_ulc_vsprintf1_OBJECTS) $(test_ulc_vsprintf1_DEPENDENCIES) $(EXTRA_test_ulc_vsprintf1_DEPENDENCIES) 
 	@rm -f test-ulc-vsprintf1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ulc_vsprintf1_OBJECTS) $(test_ulc_vsprintf1_LDADD) $(LIBS)
 unilbrk/test-ulc-width-linebreaks.$(OBJEXT): unilbrk/$(am__dirstamp) \
 	unilbrk/$(DEPDIR)/$(am__dirstamp)
-test-ulc-width-linebreaks$(EXEEXT): $(test_ulc_width_linebreaks_OBJECTS) $(test_ulc_width_linebreaks_DEPENDENCIES) 
+
+test-ulc-width-linebreaks$(EXEEXT): $(test_ulc_width_linebreaks_OBJECTS) $(test_ulc_width_linebreaks_DEPENDENCIES) $(EXTRA_test_ulc_width_linebreaks_DEPENDENCIES) 
 	@rm -f test-ulc-width-linebreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ulc_width_linebreaks_OBJECTS) $(test_ulc_width_linebreaks_LDADD) $(LIBS)
 uniwbrk/test-ulc-wordbreaks.$(OBJEXT): uniwbrk/$(am__dirstamp) \
 	uniwbrk/$(DEPDIR)/$(am__dirstamp)
-test-ulc-wordbreaks$(EXEEXT): $(test_ulc_wordbreaks_OBJECTS) $(test_ulc_wordbreaks_DEPENDENCIES) 
+
+test-ulc-wordbreaks$(EXEEXT): $(test_ulc_wordbreaks_OBJECTS) $(test_ulc_wordbreaks_DEPENDENCIES) $(EXTRA_test_ulc_wordbreaks_DEPENDENCIES) 
 	@rm -f test-ulc-wordbreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_ulc_wordbreaks_OBJECTS) $(test_ulc_wordbreaks_LDADD) $(LIBS)
 uniname/$(am__dirstamp):
@@ -7173,476 +9046,156 @@ uniname/$(DEPDIR)/$(am__dirstamp):
 	@: > uniname/$(DEPDIR)/$(am__dirstamp)
 uniname/test-uninames.$(OBJEXT): uniname/$(am__dirstamp) \
 	uniname/$(DEPDIR)/$(am__dirstamp)
-test-uninames$(EXEEXT): $(test_uninames_OBJECTS) $(test_uninames_DEPENDENCIES) 
+
+test-uninames$(EXEEXT): $(test_uninames_OBJECTS) $(test_uninames_DEPENDENCIES) $(EXTRA_test_uninames_DEPENDENCIES) 
 	@rm -f test-uninames$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_uninames_OBJECTS) $(test_uninames_LDADD) $(LIBS)
 uninorm/test-uninorm-filter-nfc.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
-test-uninorm-filter-nfc$(EXEEXT): $(test_uninorm_filter_nfc_OBJECTS) $(test_uninorm_filter_nfc_DEPENDENCIES) 
+
+test-uninorm-filter-nfc$(EXEEXT): $(test_uninorm_filter_nfc_OBJECTS) $(test_uninorm_filter_nfc_DEPENDENCIES) $(EXTRA_test_uninorm_filter_nfc_DEPENDENCIES) 
 	@rm -f test-uninorm-filter-nfc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_uninorm_filter_nfc_OBJECTS) $(test_uninorm_filter_nfc_LDADD) $(LIBS)
-test-unistd$(EXEEXT): $(test_unistd_OBJECTS) $(test_unistd_DEPENDENCIES) 
+
+test-unistd$(EXEEXT): $(test_unistd_OBJECTS) $(test_unistd_DEPENDENCIES) $(EXTRA_test_unistd_DEPENDENCIES) 
 	@rm -f test-unistd$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_unistd_OBJECTS) $(test_unistd_LDADD) $(LIBS)
-test-unsetenv$(EXEEXT): $(test_unsetenv_OBJECTS) $(test_unsetenv_DEPENDENCIES) 
+
+test-unsetenv$(EXEEXT): $(test_unsetenv_OBJECTS) $(test_unsetenv_DEPENDENCIES) $(EXTRA_test_unsetenv_DEPENDENCIES) 
 	@rm -f test-unsetenv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_unsetenv_OBJECTS) $(test_unsetenv_LDADD) $(LIBS)
-test-wchar$(EXEEXT): $(test_wchar_OBJECTS) $(test_wchar_DEPENDENCIES) 
+
+test-verify$(EXEEXT): $(test_verify_OBJECTS) $(test_verify_DEPENDENCIES) $(EXTRA_test_verify_DEPENDENCIES) 
+	@rm -f test-verify$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_verify_OBJECTS) $(test_verify_LDADD) $(LIBS)
+
+test-wchar$(EXEEXT): $(test_wchar_OBJECTS) $(test_wchar_DEPENDENCIES) $(EXTRA_test_wchar_DEPENDENCIES) 
 	@rm -f test-wchar$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_wchar_OBJECTS) $(test_wchar_LDADD) $(LIBS)
-test-wctype$(EXEEXT): $(test_wctype_OBJECTS) $(test_wctype_DEPENDENCIES) 
-	@rm -f test-wctype$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_wctype_OBJECTS) $(test_wctype_LDADD) $(LIBS)
-test-wcwidth$(EXEEXT): $(test_wcwidth_OBJECTS) $(test_wcwidth_DEPENDENCIES) 
+
+test-wcrtomb$(EXEEXT): $(test_wcrtomb_OBJECTS) $(test_wcrtomb_DEPENDENCIES) $(EXTRA_test_wcrtomb_DEPENDENCIES) 
+	@rm -f test-wcrtomb$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_wcrtomb_OBJECTS) $(test_wcrtomb_LDADD) $(LIBS)
+
+test-wcrtomb-w32$(EXEEXT): $(test_wcrtomb_w32_OBJECTS) $(test_wcrtomb_w32_DEPENDENCIES) $(EXTRA_test_wcrtomb_w32_DEPENDENCIES) 
+	@rm -f test-wcrtomb-w32$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_wcrtomb_w32_OBJECTS) $(test_wcrtomb_w32_LDADD) $(LIBS)
+
+test-wctype-h$(EXEEXT): $(test_wctype_h_OBJECTS) $(test_wctype_h_DEPENDENCIES) $(EXTRA_test_wctype_h_DEPENDENCIES) 
+	@rm -f test-wctype-h$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_wctype_h_OBJECTS) $(test_wctype_h_LDADD) $(LIBS)
+
+test-wcwidth$(EXEEXT): $(test_wcwidth_OBJECTS) $(test_wcwidth_DEPENDENCIES) $(EXTRA_test_wcwidth_DEPENDENCIES) 
 	@rm -f test-wcwidth$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_wcwidth_OBJECTS) $(test_wcwidth_LDADD) $(LIBS)
-test-xalloc-die$(EXEEXT): $(test_xalloc_die_OBJECTS) $(test_xalloc_die_DEPENDENCIES) 
+
+test-xalloc-die$(EXEEXT): $(test_xalloc_die_OBJECTS) $(test_xalloc_die_DEPENDENCIES) $(EXTRA_test_xalloc_die_DEPENDENCIES) 
 	@rm -f test-xalloc-die$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_xalloc_die_OBJECTS) $(test_xalloc_die_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f glthread/thread.$(OBJEXT)
-	-rm -f unicase/test-cased.$(OBJEXT)
-	-rm -f unicase/test-ignorable.$(OBJEXT)
-	-rm -f unicase/test-locale-language.$(OBJEXT)
-	-rm -f unicase/test-u16-casecmp.$(OBJEXT)
-	-rm -f unicase/test-u16-casecoll.$(OBJEXT)
-	-rm -f unicase/test-u16-casefold.$(OBJEXT)
-	-rm -f unicase/test-u16-is-cased.$(OBJEXT)
-	-rm -f unicase/test-u16-is-casefolded.$(OBJEXT)
-	-rm -f unicase/test-u16-is-lowercase.$(OBJEXT)
-	-rm -f unicase/test-u16-is-titlecase.$(OBJEXT)
-	-rm -f unicase/test-u16-is-uppercase.$(OBJEXT)
-	-rm -f unicase/test-u16-tolower.$(OBJEXT)
-	-rm -f unicase/test-u16-totitle.$(OBJEXT)
-	-rm -f unicase/test-u16-toupper.$(OBJEXT)
-	-rm -f unicase/test-u32-casecmp.$(OBJEXT)
-	-rm -f unicase/test-u32-casecoll.$(OBJEXT)
-	-rm -f unicase/test-u32-casefold.$(OBJEXT)
-	-rm -f unicase/test-u32-is-cased.$(OBJEXT)
-	-rm -f unicase/test-u32-is-casefolded.$(OBJEXT)
-	-rm -f unicase/test-u32-is-lowercase.$(OBJEXT)
-	-rm -f unicase/test-u32-is-titlecase.$(OBJEXT)
-	-rm -f unicase/test-u32-is-uppercase.$(OBJEXT)
-	-rm -f unicase/test-u32-tolower.$(OBJEXT)
-	-rm -f unicase/test-u32-totitle.$(OBJEXT)
-	-rm -f unicase/test-u32-toupper.$(OBJEXT)
-	-rm -f unicase/test-u8-casecmp.$(OBJEXT)
-	-rm -f unicase/test-u8-casecoll.$(OBJEXT)
-	-rm -f unicase/test-u8-casefold.$(OBJEXT)
-	-rm -f unicase/test-u8-is-cased.$(OBJEXT)
-	-rm -f unicase/test-u8-is-casefolded.$(OBJEXT)
-	-rm -f unicase/test-u8-is-lowercase.$(OBJEXT)
-	-rm -f unicase/test-u8-is-titlecase.$(OBJEXT)
-	-rm -f unicase/test-u8-is-uppercase.$(OBJEXT)
-	-rm -f unicase/test-u8-tolower.$(OBJEXT)
-	-rm -f unicase/test-u8-totitle.$(OBJEXT)
-	-rm -f unicase/test-u8-toupper.$(OBJEXT)
-	-rm -f unicase/test-uc_tolower.$(OBJEXT)
-	-rm -f unicase/test-uc_totitle.$(OBJEXT)
-	-rm -f unicase/test-uc_toupper.$(OBJEXT)
-	-rm -f unicase/test-ulc-casecmp.$(OBJEXT)
-	-rm -f unicase/test-ulc-casecoll.$(OBJEXT)
-	-rm -f uniconv/test-u16-conv-from-enc.$(OBJEXT)
-	-rm -f uniconv/test-u16-conv-to-enc.$(OBJEXT)
-	-rm -f uniconv/test-u16-strconv-from-enc.$(OBJEXT)
-	-rm -f uniconv/test-u16-strconv-to-enc.$(OBJEXT)
-	-rm -f uniconv/test-u32-conv-from-enc.$(OBJEXT)
-	-rm -f uniconv/test-u32-conv-to-enc.$(OBJEXT)
-	-rm -f uniconv/test-u32-strconv-from-enc.$(OBJEXT)
-	-rm -f uniconv/test-u32-strconv-to-enc.$(OBJEXT)
-	-rm -f uniconv/test-u8-conv-from-enc.$(OBJEXT)
-	-rm -f uniconv/test-u8-conv-to-enc.$(OBJEXT)
-	-rm -f uniconv/test-u8-strconv-from-enc.$(OBJEXT)
-	-rm -f uniconv/test-u8-strconv-to-enc.$(OBJEXT)
-	-rm -f unictype/test-bidi_byname.$(OBJEXT)
-	-rm -f unictype/test-bidi_name.$(OBJEXT)
-	-rm -f unictype/test-bidi_of.$(OBJEXT)
-	-rm -f unictype/test-bidi_test.$(OBJEXT)
-	-rm -f unictype/test-block_list.$(OBJEXT)
-	-rm -f unictype/test-block_of.$(OBJEXT)
-	-rm -f unictype/test-block_test.$(OBJEXT)
-	-rm -f unictype/test-categ_C.$(OBJEXT)
-	-rm -f unictype/test-categ_Cc.$(OBJEXT)
-	-rm -f unictype/test-categ_Cf.$(OBJEXT)
-	-rm -f unictype/test-categ_Cn.$(OBJEXT)
-	-rm -f unictype/test-categ_Co.$(OBJEXT)
-	-rm -f unictype/test-categ_Cs.$(OBJEXT)
-	-rm -f unictype/test-categ_L.$(OBJEXT)
-	-rm -f unictype/test-categ_Ll.$(OBJEXT)
-	-rm -f unictype/test-categ_Lm.$(OBJEXT)
-	-rm -f unictype/test-categ_Lo.$(OBJEXT)
-	-rm -f unictype/test-categ_Lt.$(OBJEXT)
-	-rm -f unictype/test-categ_Lu.$(OBJEXT)
-	-rm -f unictype/test-categ_M.$(OBJEXT)
-	-rm -f unictype/test-categ_Mc.$(OBJEXT)
-	-rm -f unictype/test-categ_Me.$(OBJEXT)
-	-rm -f unictype/test-categ_Mn.$(OBJEXT)
-	-rm -f unictype/test-categ_N.$(OBJEXT)
-	-rm -f unictype/test-categ_Nd.$(OBJEXT)
-	-rm -f unictype/test-categ_Nl.$(OBJEXT)
-	-rm -f unictype/test-categ_No.$(OBJEXT)
-	-rm -f unictype/test-categ_P.$(OBJEXT)
-	-rm -f unictype/test-categ_Pc.$(OBJEXT)
-	-rm -f unictype/test-categ_Pd.$(OBJEXT)
-	-rm -f unictype/test-categ_Pe.$(OBJEXT)
-	-rm -f unictype/test-categ_Pf.$(OBJEXT)
-	-rm -f unictype/test-categ_Pi.$(OBJEXT)
-	-rm -f unictype/test-categ_Po.$(OBJEXT)
-	-rm -f unictype/test-categ_Ps.$(OBJEXT)
-	-rm -f unictype/test-categ_S.$(OBJEXT)
-	-rm -f unictype/test-categ_Sc.$(OBJEXT)
-	-rm -f unictype/test-categ_Sk.$(OBJEXT)
-	-rm -f unictype/test-categ_Sm.$(OBJEXT)
-	-rm -f unictype/test-categ_So.$(OBJEXT)
-	-rm -f unictype/test-categ_Z.$(OBJEXT)
-	-rm -f unictype/test-categ_Zl.$(OBJEXT)
-	-rm -f unictype/test-categ_Zp.$(OBJEXT)
-	-rm -f unictype/test-categ_Zs.$(OBJEXT)
-	-rm -f unictype/test-categ_and.$(OBJEXT)
-	-rm -f unictype/test-categ_and_not.$(OBJEXT)
-	-rm -f unictype/test-categ_byname.$(OBJEXT)
-	-rm -f unictype/test-categ_name.$(OBJEXT)
-	-rm -f unictype/test-categ_none.$(OBJEXT)
-	-rm -f unictype/test-categ_of.$(OBJEXT)
-	-rm -f unictype/test-categ_or.$(OBJEXT)
-	-rm -f unictype/test-categ_test_withtable.$(OBJEXT)
-	-rm -f unictype/test-combining.$(OBJEXT)
-	-rm -f unictype/test-ctype_alnum.$(OBJEXT)
-	-rm -f unictype/test-ctype_alpha.$(OBJEXT)
-	-rm -f unictype/test-ctype_blank.$(OBJEXT)
-	-rm -f unictype/test-ctype_cntrl.$(OBJEXT)
-	-rm -f unictype/test-ctype_digit.$(OBJEXT)
-	-rm -f unictype/test-ctype_graph.$(OBJEXT)
-	-rm -f unictype/test-ctype_lower.$(OBJEXT)
-	-rm -f unictype/test-ctype_print.$(OBJEXT)
-	-rm -f unictype/test-ctype_punct.$(OBJEXT)
-	-rm -f unictype/test-ctype_space.$(OBJEXT)
-	-rm -f unictype/test-ctype_upper.$(OBJEXT)
-	-rm -f unictype/test-ctype_xdigit.$(OBJEXT)
-	-rm -f unictype/test-decdigit.$(OBJEXT)
-	-rm -f unictype/test-digit.$(OBJEXT)
-	-rm -f unictype/test-mirror.$(OBJEXT)
-	-rm -f unictype/test-numeric.$(OBJEXT)
-	-rm -f unictype/test-pr_alphabetic.$(OBJEXT)
-	-rm -f unictype/test-pr_ascii_hex_digit.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_arabic_digit.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_arabic_right_to_left.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_block_separator.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_boundary_neutral.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_common_separator.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_control.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_embedding_or_override.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_eur_num_separator.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_eur_num_terminator.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_european_digit.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_hebrew_right_to_left.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_left_to_right.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_non_spacing_mark.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_other_neutral.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_pdf.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_segment_separator.$(OBJEXT)
-	-rm -f unictype/test-pr_bidi_whitespace.$(OBJEXT)
-	-rm -f unictype/test-pr_byname.$(OBJEXT)
-	-rm -f unictype/test-pr_combining.$(OBJEXT)
-	-rm -f unictype/test-pr_composite.$(OBJEXT)
-	-rm -f unictype/test-pr_currency_symbol.$(OBJEXT)
-	-rm -f unictype/test-pr_dash.$(OBJEXT)
-	-rm -f unictype/test-pr_decimal_digit.$(OBJEXT)
-	-rm -f unictype/test-pr_default_ignorable_code_point.$(OBJEXT)
-	-rm -f unictype/test-pr_deprecated.$(OBJEXT)
-	-rm -f unictype/test-pr_diacritic.$(OBJEXT)
-	-rm -f unictype/test-pr_extender.$(OBJEXT)
-	-rm -f unictype/test-pr_format_control.$(OBJEXT)
-	-rm -f unictype/test-pr_grapheme_base.$(OBJEXT)
-	-rm -f unictype/test-pr_grapheme_extend.$(OBJEXT)
-	-rm -f unictype/test-pr_grapheme_link.$(OBJEXT)
-	-rm -f unictype/test-pr_hex_digit.$(OBJEXT)
-	-rm -f unictype/test-pr_hyphen.$(OBJEXT)
-	-rm -f unictype/test-pr_id_continue.$(OBJEXT)
-	-rm -f unictype/test-pr_id_start.$(OBJEXT)
-	-rm -f unictype/test-pr_ideographic.$(OBJEXT)
-	-rm -f unictype/test-pr_ids_binary_operator.$(OBJEXT)
-	-rm -f unictype/test-pr_ids_trinary_operator.$(OBJEXT)
-	-rm -f unictype/test-pr_ignorable_control.$(OBJEXT)
-	-rm -f unictype/test-pr_iso_control.$(OBJEXT)
-	-rm -f unictype/test-pr_join_control.$(OBJEXT)
-	-rm -f unictype/test-pr_left_of_pair.$(OBJEXT)
-	-rm -f unictype/test-pr_line_separator.$(OBJEXT)
-	-rm -f unictype/test-pr_logical_order_exception.$(OBJEXT)
-	-rm -f unictype/test-pr_lowercase.$(OBJEXT)
-	-rm -f unictype/test-pr_math.$(OBJEXT)
-	-rm -f unictype/test-pr_non_break.$(OBJEXT)
-	-rm -f unictype/test-pr_not_a_character.$(OBJEXT)
-	-rm -f unictype/test-pr_numeric.$(OBJEXT)
-	-rm -f unictype/test-pr_other_alphabetic.$(OBJEXT)
-	-rm -f unictype/test-pr_other_default_ignorable_code_point.$(OBJEXT)
-	-rm -f unictype/test-pr_other_grapheme_extend.$(OBJEXT)
-	-rm -f unictype/test-pr_other_id_continue.$(OBJEXT)
-	-rm -f unictype/test-pr_other_id_start.$(OBJEXT)
-	-rm -f unictype/test-pr_other_lowercase.$(OBJEXT)
-	-rm -f unictype/test-pr_other_math.$(OBJEXT)
-	-rm -f unictype/test-pr_other_uppercase.$(OBJEXT)
-	-rm -f unictype/test-pr_paired_punctuation.$(OBJEXT)
-	-rm -f unictype/test-pr_paragraph_separator.$(OBJEXT)
-	-rm -f unictype/test-pr_pattern_syntax.$(OBJEXT)
-	-rm -f unictype/test-pr_pattern_white_space.$(OBJEXT)
-	-rm -f unictype/test-pr_private_use.$(OBJEXT)
-	-rm -f unictype/test-pr_punctuation.$(OBJEXT)
-	-rm -f unictype/test-pr_quotation_mark.$(OBJEXT)
-	-rm -f unictype/test-pr_radical.$(OBJEXT)
-	-rm -f unictype/test-pr_sentence_terminal.$(OBJEXT)
-	-rm -f unictype/test-pr_soft_dotted.$(OBJEXT)
-	-rm -f unictype/test-pr_space.$(OBJEXT)
-	-rm -f unictype/test-pr_terminal_punctuation.$(OBJEXT)
-	-rm -f unictype/test-pr_test.$(OBJEXT)
-	-rm -f unictype/test-pr_titlecase.$(OBJEXT)
-	-rm -f unictype/test-pr_unassigned_code_value.$(OBJEXT)
-	-rm -f unictype/test-pr_unified_ideograph.$(OBJEXT)
-	-rm -f unictype/test-pr_uppercase.$(OBJEXT)
-	-rm -f unictype/test-pr_variation_selector.$(OBJEXT)
-	-rm -f unictype/test-pr_white_space.$(OBJEXT)
-	-rm -f unictype/test-pr_xid_continue.$(OBJEXT)
-	-rm -f unictype/test-pr_xid_start.$(OBJEXT)
-	-rm -f unictype/test-pr_zero_width.$(OBJEXT)
-	-rm -f unictype/test-scripts.$(OBJEXT)
-	-rm -f unictype/test-sy_c_ident.$(OBJEXT)
-	-rm -f unictype/test-sy_c_whitespace.$(OBJEXT)
-	-rm -f unictype/test-sy_java_ident.$(OBJEXT)
-	-rm -f unictype/test-sy_java_whitespace.$(OBJEXT)
-	-rm -f unilbrk/test-u16-possible-linebreaks.$(OBJEXT)
-	-rm -f unilbrk/test-u16-width-linebreaks.$(OBJEXT)
-	-rm -f unilbrk/test-u32-possible-linebreaks.$(OBJEXT)
-	-rm -f unilbrk/test-u32-width-linebreaks.$(OBJEXT)
-	-rm -f unilbrk/test-u8-possible-linebreaks.$(OBJEXT)
-	-rm -f unilbrk/test-u8-width-linebreaks.$(OBJEXT)
-	-rm -f unilbrk/test-ulc-possible-linebreaks.$(OBJEXT)
-	-rm -f unilbrk/test-ulc-width-linebreaks.$(OBJEXT)
-	-rm -f uniname/test-uninames.$(OBJEXT)
-	-rm -f uninorm/test-canonical-decomposition.$(OBJEXT)
-	-rm -f uninorm/test-compat-decomposition.$(OBJEXT)
-	-rm -f uninorm/test-composition.$(OBJEXT)
-	-rm -f uninorm/test-decomposing-form.$(OBJEXT)
-	-rm -f uninorm/test-decomposition.$(OBJEXT)
-	-rm -f uninorm/test-nfc.$(OBJEXT)
-	-rm -f uninorm/test-nfd.$(OBJEXT)
-	-rm -f uninorm/test-nfkc.$(OBJEXT)
-	-rm -f uninorm/test-nfkd.$(OBJEXT)
-	-rm -f uninorm/test-u16-nfc.$(OBJEXT)
-	-rm -f uninorm/test-u16-nfd.$(OBJEXT)
-	-rm -f uninorm/test-u16-nfkc.$(OBJEXT)
-	-rm -f uninorm/test-u16-nfkd.$(OBJEXT)
-	-rm -f uninorm/test-u16-normcmp.$(OBJEXT)
-	-rm -f uninorm/test-u16-normcoll.$(OBJEXT)
-	-rm -f uninorm/test-u32-nfc-big.$(OBJEXT)
-	-rm -f uninorm/test-u32-nfc.$(OBJEXT)
-	-rm -f uninorm/test-u32-nfd-big.$(OBJEXT)
-	-rm -f uninorm/test-u32-nfd.$(OBJEXT)
-	-rm -f uninorm/test-u32-nfkc-big.$(OBJEXT)
-	-rm -f uninorm/test-u32-nfkc.$(OBJEXT)
-	-rm -f uninorm/test-u32-nfkd-big.$(OBJEXT)
-	-rm -f uninorm/test-u32-nfkd.$(OBJEXT)
-	-rm -f uninorm/test-u32-normalize-big.$(OBJEXT)
-	-rm -f uninorm/test-u32-normcmp.$(OBJEXT)
-	-rm -f uninorm/test-u32-normcoll.$(OBJEXT)
-	-rm -f uninorm/test-u8-nfc.$(OBJEXT)
-	-rm -f uninorm/test-u8-nfd.$(OBJEXT)
-	-rm -f uninorm/test-u8-nfkc.$(OBJEXT)
-	-rm -f uninorm/test-u8-nfkd.$(OBJEXT)
-	-rm -f uninorm/test-u8-normcmp.$(OBJEXT)
-	-rm -f uninorm/test-u8-normcoll.$(OBJEXT)
-	-rm -f uninorm/test-uninorm-filter-nfc.$(OBJEXT)
-	-rm -f unistdio/test-u16-asnprintf1.$(OBJEXT)
-	-rm -f unistdio/test-u16-vasnprintf1.$(OBJEXT)
-	-rm -f unistdio/test-u16-vasnprintf2.$(OBJEXT)
-	-rm -f unistdio/test-u16-vasnprintf3.$(OBJEXT)
-	-rm -f unistdio/test-u16-vasprintf1.$(OBJEXT)
-	-rm -f unistdio/test-u16-vsnprintf1.$(OBJEXT)
-	-rm -f unistdio/test-u16-vsprintf1.$(OBJEXT)
-	-rm -f unistdio/test-u32-asnprintf1.$(OBJEXT)
-	-rm -f unistdio/test-u32-vasnprintf1.$(OBJEXT)
-	-rm -f unistdio/test-u32-vasnprintf2.$(OBJEXT)
-	-rm -f unistdio/test-u32-vasnprintf3.$(OBJEXT)
-	-rm -f unistdio/test-u32-vasprintf1.$(OBJEXT)
-	-rm -f unistdio/test-u32-vsnprintf1.$(OBJEXT)
-	-rm -f unistdio/test-u32-vsprintf1.$(OBJEXT)
-	-rm -f unistdio/test-u8-asnprintf1.$(OBJEXT)
-	-rm -f unistdio/test-u8-vasnprintf1.$(OBJEXT)
-	-rm -f unistdio/test-u8-vasnprintf2.$(OBJEXT)
-	-rm -f unistdio/test-u8-vasnprintf3.$(OBJEXT)
-	-rm -f unistdio/test-u8-vasprintf1.$(OBJEXT)
-	-rm -f unistdio/test-u8-vsnprintf1.$(OBJEXT)
-	-rm -f unistdio/test-u8-vsprintf1.$(OBJEXT)
-	-rm -f unistdio/test-ulc-asnprintf1.$(OBJEXT)
-	-rm -f unistdio/test-ulc-vasnprintf1.$(OBJEXT)
-	-rm -f unistdio/test-ulc-vasnprintf2.$(OBJEXT)
-	-rm -f unistdio/test-ulc-vasnprintf3.$(OBJEXT)
-	-rm -f unistdio/test-ulc-vasprintf1.$(OBJEXT)
-	-rm -f unistdio/test-ulc-vsnprintf1.$(OBJEXT)
-	-rm -f unistdio/test-ulc-vsprintf1.$(OBJEXT)
-	-rm -f unistr/test-u16-check.$(OBJEXT)
-	-rm -f unistr/test-u16-chr.$(OBJEXT)
-	-rm -f unistr/test-u16-cmp.$(OBJEXT)
-	-rm -f unistr/test-u16-cmp2.$(OBJEXT)
-	-rm -f unistr/test-u16-cpy-alloc.$(OBJEXT)
-	-rm -f unistr/test-u16-cpy.$(OBJEXT)
-	-rm -f unistr/test-u16-mblen.$(OBJEXT)
-	-rm -f unistr/test-u16-mbsnlen.$(OBJEXT)
-	-rm -f unistr/test-u16-mbtouc-unsafe.$(OBJEXT)
-	-rm -f unistr/test-u16-mbtouc.$(OBJEXT)
-	-rm -f unistr/test-u16-mbtoucr.$(OBJEXT)
-	-rm -f unistr/test-u16-move.$(OBJEXT)
-	-rm -f unistr/test-u16-next.$(OBJEXT)
-	-rm -f unistr/test-u16-prev.$(OBJEXT)
-	-rm -f unistr/test-u16-set.$(OBJEXT)
-	-rm -f unistr/test-u16-stpcpy.$(OBJEXT)
-	-rm -f unistr/test-u16-stpncpy.$(OBJEXT)
-	-rm -f unistr/test-u16-strcat.$(OBJEXT)
-	-rm -f unistr/test-u16-strcmp.$(OBJEXT)
-	-rm -f unistr/test-u16-strcoll.$(OBJEXT)
-	-rm -f unistr/test-u16-strcpy.$(OBJEXT)
-	-rm -f unistr/test-u16-strdup.$(OBJEXT)
-	-rm -f unistr/test-u16-strlen.$(OBJEXT)
-	-rm -f unistr/test-u16-strmblen.$(OBJEXT)
-	-rm -f unistr/test-u16-strmbtouc.$(OBJEXT)
-	-rm -f unistr/test-u16-strncat.$(OBJEXT)
-	-rm -f unistr/test-u16-strncmp.$(OBJEXT)
-	-rm -f unistr/test-u16-strncpy.$(OBJEXT)
-	-rm -f unistr/test-u16-strnlen.$(OBJEXT)
-	-rm -f unistr/test-u16-to-u32.$(OBJEXT)
-	-rm -f unistr/test-u16-to-u8.$(OBJEXT)
-	-rm -f unistr/test-u16-uctomb.$(OBJEXT)
-	-rm -f unistr/test-u32-check.$(OBJEXT)
-	-rm -f unistr/test-u32-chr.$(OBJEXT)
-	-rm -f unistr/test-u32-cmp.$(OBJEXT)
-	-rm -f unistr/test-u32-cmp2.$(OBJEXT)
-	-rm -f unistr/test-u32-cpy-alloc.$(OBJEXT)
-	-rm -f unistr/test-u32-cpy.$(OBJEXT)
-	-rm -f unistr/test-u32-mblen.$(OBJEXT)
-	-rm -f unistr/test-u32-mbsnlen.$(OBJEXT)
-	-rm -f unistr/test-u32-mbtouc-unsafe.$(OBJEXT)
-	-rm -f unistr/test-u32-mbtouc.$(OBJEXT)
-	-rm -f unistr/test-u32-mbtoucr.$(OBJEXT)
-	-rm -f unistr/test-u32-move.$(OBJEXT)
-	-rm -f unistr/test-u32-next.$(OBJEXT)
-	-rm -f unistr/test-u32-prev.$(OBJEXT)
-	-rm -f unistr/test-u32-set.$(OBJEXT)
-	-rm -f unistr/test-u32-stpcpy.$(OBJEXT)
-	-rm -f unistr/test-u32-stpncpy.$(OBJEXT)
-	-rm -f unistr/test-u32-strcat.$(OBJEXT)
-	-rm -f unistr/test-u32-strcmp.$(OBJEXT)
-	-rm -f unistr/test-u32-strcoll.$(OBJEXT)
-	-rm -f unistr/test-u32-strcpy.$(OBJEXT)
-	-rm -f unistr/test-u32-strdup.$(OBJEXT)
-	-rm -f unistr/test-u32-strlen.$(OBJEXT)
-	-rm -f unistr/test-u32-strmblen.$(OBJEXT)
-	-rm -f unistr/test-u32-strmbtouc.$(OBJEXT)
-	-rm -f unistr/test-u32-strncat.$(OBJEXT)
-	-rm -f unistr/test-u32-strncmp.$(OBJEXT)
-	-rm -f unistr/test-u32-strncpy.$(OBJEXT)
-	-rm -f unistr/test-u32-strnlen.$(OBJEXT)
-	-rm -f unistr/test-u32-to-u16.$(OBJEXT)
-	-rm -f unistr/test-u32-to-u8.$(OBJEXT)
-	-rm -f unistr/test-u32-uctomb.$(OBJEXT)
-	-rm -f unistr/test-u8-check.$(OBJEXT)
-	-rm -f unistr/test-u8-chr.$(OBJEXT)
-	-rm -f unistr/test-u8-cmp.$(OBJEXT)
-	-rm -f unistr/test-u8-cmp2.$(OBJEXT)
-	-rm -f unistr/test-u8-cpy-alloc.$(OBJEXT)
-	-rm -f unistr/test-u8-cpy.$(OBJEXT)
-	-rm -f unistr/test-u8-mblen.$(OBJEXT)
-	-rm -f unistr/test-u8-mbsnlen.$(OBJEXT)
-	-rm -f unistr/test-u8-mbtouc-unsafe.$(OBJEXT)
-	-rm -f unistr/test-u8-mbtouc.$(OBJEXT)
-	-rm -f unistr/test-u8-mbtoucr.$(OBJEXT)
-	-rm -f unistr/test-u8-move.$(OBJEXT)
-	-rm -f unistr/test-u8-next.$(OBJEXT)
-	-rm -f unistr/test-u8-prev.$(OBJEXT)
-	-rm -f unistr/test-u8-set.$(OBJEXT)
-	-rm -f unistr/test-u8-stpcpy.$(OBJEXT)
-	-rm -f unistr/test-u8-stpncpy.$(OBJEXT)
-	-rm -f unistr/test-u8-strcat.$(OBJEXT)
-	-rm -f unistr/test-u8-strcmp.$(OBJEXT)
-	-rm -f unistr/test-u8-strcoll.$(OBJEXT)
-	-rm -f unistr/test-u8-strcpy.$(OBJEXT)
-	-rm -f unistr/test-u8-strdup.$(OBJEXT)
-	-rm -f unistr/test-u8-strlen.$(OBJEXT)
-	-rm -f unistr/test-u8-strmblen.$(OBJEXT)
-	-rm -f unistr/test-u8-strmbtouc.$(OBJEXT)
-	-rm -f unistr/test-u8-strncat.$(OBJEXT)
-	-rm -f unistr/test-u8-strncmp.$(OBJEXT)
-	-rm -f unistr/test-u8-strncpy.$(OBJEXT)
-	-rm -f unistr/test-u8-strnlen.$(OBJEXT)
-	-rm -f unistr/test-u8-to-u16.$(OBJEXT)
-	-rm -f unistr/test-u8-to-u32.$(OBJEXT)
-	-rm -f unistr/test-u8-uctomb.$(OBJEXT)
-	-rm -f uniwbrk/test-u16-wordbreaks.$(OBJEXT)
-	-rm -f uniwbrk/test-u32-wordbreaks.$(OBJEXT)
-	-rm -f uniwbrk/test-u8-wordbreaks.$(OBJEXT)
-	-rm -f uniwbrk/test-ulc-wordbreaks.$(OBJEXT)
-	-rm -f uniwidth/test-u16-strwidth.$(OBJEXT)
-	-rm -f uniwidth/test-u16-width.$(OBJEXT)
-	-rm -f uniwidth/test-u32-strwidth.$(OBJEXT)
-	-rm -f uniwidth/test-u32-width.$(OBJEXT)
-	-rm -f uniwidth/test-u8-strwidth.$(OBJEXT)
-	-rm -f uniwidth/test-u8-width.$(OBJEXT)
-	-rm -f uniwidth/test-uc_width.$(OBJEXT)
-	-rm -f uniwidth/test-uc_width2.$(OBJEXT)
+	-rm -f glthread/*.$(OBJEXT)
+	-rm -f unicase/*.$(OBJEXT)
+	-rm -f uniconv/*.$(OBJEXT)
+	-rm -f unictype/*.$(OBJEXT)
+	-rm -f unigbrk/*.$(OBJEXT)
+	-rm -f unilbrk/*.$(OBJEXT)
+	-rm -f uniname/*.$(OBJEXT)
+	-rm -f uninorm/*.$(OBJEXT)
+	-rm -f unistdio/*.$(OBJEXT)
+	-rm -f unistr/*.$(OBJEXT)
+	-rm -f uniwbrk/*.$(OBJEXT)
+	-rm -f uniwidth/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btowc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdopen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpagesize.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbtowc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-inval.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-nothrow.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progname.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/putenv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/randomd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/randoml.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setenv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setlocale.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror-override.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-alloca-opt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-array-mergesort.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-btowc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-ctype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-strcasecmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-strncasecmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-environ.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-errno.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fdopen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fgetc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-float.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fputc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fread.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-frexp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-frexpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fseterr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fwrite.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iconv-h.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iconv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-intprops.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-inttypes.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-isnand-nolibm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-isnanf-nolibm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-isnanl-nolibm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iswblank.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-langinfo.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-locale.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-localename.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-lock.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-malloca.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-math.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mbrtowc-w32.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mbrtowc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mbsinit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-memchr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-printf-frexp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-printf-frexpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setenv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setlocale1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setlocale2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-signbit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdalign.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdbool.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stddef.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdlib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strerror.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-striconveh.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-striconveha.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-string.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strncat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strstr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sys_types.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-thread_create.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-thread_self.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-unistd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-unsetenv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-verify.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wchar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wctype.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wcrtomb-w32.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wcrtomb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wctype-h.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wcwidth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-xalloc-die.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unsetenv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcrtomb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctob.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctomb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xalloc-die.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glthread/$(DEPDIR)/thread.Po@am__quote@
@@ -7700,6 +9253,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@uniconv/$(DEPDIR)/test-u8-strconv-from-enc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@uniconv/$(DEPDIR)/test-u8-strconv-to-enc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-bidi_byname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-bidi_longname.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-bidi_name.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-bidi_of.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-bidi_test.Po@am__quote@
@@ -7713,6 +9267,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_Co.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_Cs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_L.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_LC.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_Ll.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_Lm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_Lo.Po@am__quote@
@@ -7746,12 +9301,16 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_and.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_and_not.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_byname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_longname.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_name.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_none.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_of.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_or.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-categ_test_withtable.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-combining.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-combiningclass.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-combiningclass_byname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-combiningclass_longname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-combiningclass_name.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-ctype_alnum.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-ctype_alpha.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-ctype_blank.Po@am__quote@
@@ -7766,6 +9325,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-ctype_xdigit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-decdigit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-digit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-joininggroup_byname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-joininggroup_name.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-joininggroup_of.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-joiningtype_byname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-joiningtype_longname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-joiningtype_name.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-joiningtype_of.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-mirror.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-numeric.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-pr_alphabetic.Po@am__quote@
@@ -7788,6 +9354,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-pr_bidi_segment_separator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-pr_bidi_whitespace.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-pr_byname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-pr_case_ignorable.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-pr_cased.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-pr_changes_when_casefolded.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-pr_changes_when_casemapped.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-pr_changes_when_lowercased.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-pr_changes_when_titlecased.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-pr_changes_when_uppercased.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-pr_combining.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-pr_composite.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-pr_currency_symbol.Po@am__quote@
@@ -7854,6 +9427,18 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-sy_c_whitespace.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-sy_java_ident.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unictype/$(DEPDIR)/test-sy_java_whitespace.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unigbrk/$(DEPDIR)/test-u16-grapheme-breaks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unigbrk/$(DEPDIR)/test-u16-grapheme-next.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unigbrk/$(DEPDIR)/test-u16-grapheme-prev.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unigbrk/$(DEPDIR)/test-u32-grapheme-breaks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unigbrk/$(DEPDIR)/test-u32-grapheme-next.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unigbrk/$(DEPDIR)/test-u32-grapheme-prev.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unigbrk/$(DEPDIR)/test-u8-grapheme-breaks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unigbrk/$(DEPDIR)/test-u8-grapheme-next.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unigbrk/$(DEPDIR)/test-u8-grapheme-prev.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unigbrk/$(DEPDIR)/test-uc-gbrk-prop.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unigbrk/$(DEPDIR)/test-uc-is-grapheme-break.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unigbrk/$(DEPDIR)/test-ulc-grapheme-breaks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unilbrk/$(DEPDIR)/test-u16-possible-linebreaks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unilbrk/$(DEPDIR)/test-u16-width-linebreaks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unilbrk/$(DEPDIR)/test-u32-possible-linebreaks.Po@am__quote@
@@ -7942,6 +9527,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-stpcpy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-stpncpy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strcat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strchr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strcmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strcoll.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strcpy.Po@am__quote@
@@ -7953,6 +9539,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strncmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strncpy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strnlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strstr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strtok.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-to-u32.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-to-u8.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-uctomb.Po@am__quote@
@@ -7974,6 +9562,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-stpcpy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-stpncpy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strcat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strchr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strcmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strcoll.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strcpy.Po@am__quote@
@@ -7985,6 +9574,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strncmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strncpy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strnlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strstr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strtok.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-to-u16.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-to-u8.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-uctomb.Po@am__quote@
@@ -8006,6 +9597,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-stpcpy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-stpncpy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strcat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strchr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strcmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strcoll.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strcpy.Po@am__quote@
@@ -8017,12 +9609,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strncmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strncpy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strnlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strstr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strtok.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-to-u16.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-to-u32.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-uctomb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@uniwbrk/$(DEPDIR)/test-u16-wordbreaks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@uniwbrk/$(DEPDIR)/test-u32-wordbreaks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@uniwbrk/$(DEPDIR)/test-u8-wordbreaks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@uniwbrk/$(DEPDIR)/test-uc-wordbreaks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@uniwbrk/$(DEPDIR)/test-ulc-wordbreaks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@uniwidth/$(DEPDIR)/test-u16-strwidth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@uniwidth/$(DEPDIR)/test-u16-width.Po@am__quote@
@@ -8037,28 +9632,25 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -8067,22 +9659,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -8097,57 +9692,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -8163,12 +9713,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -8180,15 +9725,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -8197,101 +9738,3645 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-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 "; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  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"; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    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)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      skipped="($$skip tests were not run)"; \
+	      color_start= color_end=; \
 	    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
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_LIBRARIES) $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+test-alloca-opt.log: test-alloca-opt$(EXEEXT)
+	@p='test-alloca-opt$(EXEEXT)'; \
+	b='test-alloca-opt'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-array-mergesort.log: test-array-mergesort$(EXEEXT)
+	@p='test-array-mergesort$(EXEEXT)'; \
+	b='test-array-mergesort'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-btowc1.sh.log: test-btowc1.sh
+	@p='test-btowc1.sh'; \
+	b='test-btowc1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-btowc2.sh.log: test-btowc2.sh
+	@p='test-btowc2.sh'; \
+	b='test-btowc2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-c-ctype.log: test-c-ctype$(EXEEXT)
+	@p='test-c-ctype$(EXEEXT)'; \
+	b='test-c-ctype'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-c-strcase.sh.log: test-c-strcase.sh
+	@p='test-c-strcase.sh'; \
+	b='test-c-strcase.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-environ.log: test-environ$(EXEEXT)
+	@p='test-environ$(EXEEXT)'; \
+	b='test-environ'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-errno.log: test-errno$(EXEEXT)
+	@p='test-errno$(EXEEXT)'; \
+	b='test-errno'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-fdopen.log: test-fdopen$(EXEEXT)
+	@p='test-fdopen$(EXEEXT)'; \
+	b='test-fdopen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-fgetc.log: test-fgetc$(EXEEXT)
+	@p='test-fgetc$(EXEEXT)'; \
+	b='test-fgetc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-float.log: test-float$(EXEEXT)
+	@p='test-float$(EXEEXT)'; \
+	b='test-float'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-fputc.log: test-fputc$(EXEEXT)
+	@p='test-fputc$(EXEEXT)'; \
+	b='test-fputc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-fread.log: test-fread$(EXEEXT)
+	@p='test-fread$(EXEEXT)'; \
+	b='test-fread'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-frexp-nolibm.log: test-frexp-nolibm$(EXEEXT)
+	@p='test-frexp-nolibm$(EXEEXT)'; \
+	b='test-frexp-nolibm'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-frexpl-nolibm.log: test-frexpl-nolibm$(EXEEXT)
+	@p='test-frexpl-nolibm$(EXEEXT)'; \
+	b='test-frexpl-nolibm'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-fseterr.log: test-fseterr$(EXEEXT)
+	@p='test-fseterr$(EXEEXT)'; \
+	b='test-fseterr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-fwrite.log: test-fwrite$(EXEEXT)
+	@p='test-fwrite$(EXEEXT)'; \
+	b='test-fwrite'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-iconv-h.log: test-iconv-h$(EXEEXT)
+	@p='test-iconv-h$(EXEEXT)'; \
+	b='test-iconv-h'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-iconv.log: test-iconv$(EXEEXT)
+	@p='test-iconv$(EXEEXT)'; \
+	b='test-iconv'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-intprops.log: test-intprops$(EXEEXT)
+	@p='test-intprops$(EXEEXT)'; \
+	b='test-intprops'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-inttypes.log: test-inttypes$(EXEEXT)
+	@p='test-inttypes$(EXEEXT)'; \
+	b='test-inttypes'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-isnand-nolibm.log: test-isnand-nolibm$(EXEEXT)
+	@p='test-isnand-nolibm$(EXEEXT)'; \
+	b='test-isnand-nolibm'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-isnanf-nolibm.log: test-isnanf-nolibm$(EXEEXT)
+	@p='test-isnanf-nolibm$(EXEEXT)'; \
+	b='test-isnanf-nolibm'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-isnanl-nolibm.log: test-isnanl-nolibm$(EXEEXT)
+	@p='test-isnanl-nolibm$(EXEEXT)'; \
+	b='test-isnanl-nolibm'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-iswblank.log: test-iswblank$(EXEEXT)
+	@p='test-iswblank$(EXEEXT)'; \
+	b='test-iswblank'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-langinfo.log: test-langinfo$(EXEEXT)
+	@p='test-langinfo$(EXEEXT)'; \
+	b='test-langinfo'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-locale.log: test-locale$(EXEEXT)
+	@p='test-locale$(EXEEXT)'; \
+	b='test-locale'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-localename.log: test-localename$(EXEEXT)
+	@p='test-localename$(EXEEXT)'; \
+	b='test-localename'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-lock.log: test-lock$(EXEEXT)
+	@p='test-lock$(EXEEXT)'; \
+	b='test-lock'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-malloca.log: test-malloca$(EXEEXT)
+	@p='test-malloca$(EXEEXT)'; \
+	b='test-malloca'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-math.log: test-math$(EXEEXT)
+	@p='test-math$(EXEEXT)'; \
+	b='test-math'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-mbrtowc1.sh.log: test-mbrtowc1.sh
+	@p='test-mbrtowc1.sh'; \
+	b='test-mbrtowc1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-mbrtowc2.sh.log: test-mbrtowc2.sh
+	@p='test-mbrtowc2.sh'; \
+	b='test-mbrtowc2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-mbrtowc3.sh.log: test-mbrtowc3.sh
+	@p='test-mbrtowc3.sh'; \
+	b='test-mbrtowc3.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-mbrtowc4.sh.log: test-mbrtowc4.sh
+	@p='test-mbrtowc4.sh'; \
+	b='test-mbrtowc4.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-mbrtowc-w32-1.sh.log: test-mbrtowc-w32-1.sh
+	@p='test-mbrtowc-w32-1.sh'; \
+	b='test-mbrtowc-w32-1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-mbrtowc-w32-2.sh.log: test-mbrtowc-w32-2.sh
+	@p='test-mbrtowc-w32-2.sh'; \
+	b='test-mbrtowc-w32-2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-mbrtowc-w32-3.sh.log: test-mbrtowc-w32-3.sh
+	@p='test-mbrtowc-w32-3.sh'; \
+	b='test-mbrtowc-w32-3.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-mbrtowc-w32-4.sh.log: test-mbrtowc-w32-4.sh
+	@p='test-mbrtowc-w32-4.sh'; \
+	b='test-mbrtowc-w32-4.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-mbrtowc-w32-5.sh.log: test-mbrtowc-w32-5.sh
+	@p='test-mbrtowc-w32-5.sh'; \
+	b='test-mbrtowc-w32-5.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-mbsinit.sh.log: test-mbsinit.sh
+	@p='test-mbsinit.sh'; \
+	b='test-mbsinit.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-memchr.log: test-memchr$(EXEEXT)
+	@p='test-memchr$(EXEEXT)'; \
+	b='test-memchr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-printf-frexp.log: test-printf-frexp$(EXEEXT)
+	@p='test-printf-frexp$(EXEEXT)'; \
+	b='test-printf-frexp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-printf-frexpl.log: test-printf-frexpl$(EXEEXT)
+	@p='test-printf-frexpl$(EXEEXT)'; \
+	b='test-printf-frexpl'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-setenv.log: test-setenv$(EXEEXT)
+	@p='test-setenv$(EXEEXT)'; \
+	b='test-setenv'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-setlocale1.sh.log: test-setlocale1.sh
+	@p='test-setlocale1.sh'; \
+	b='test-setlocale1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-setlocale2.sh.log: test-setlocale2.sh
+	@p='test-setlocale2.sh'; \
+	b='test-setlocale2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-signbit.log: test-signbit$(EXEEXT)
+	@p='test-signbit$(EXEEXT)'; \
+	b='test-signbit'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-stdalign.log: test-stdalign$(EXEEXT)
+	@p='test-stdalign$(EXEEXT)'; \
+	b='test-stdalign'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-stdbool.log: test-stdbool$(EXEEXT)
+	@p='test-stdbool$(EXEEXT)'; \
+	b='test-stdbool'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-stddef.log: test-stddef$(EXEEXT)
+	@p='test-stddef$(EXEEXT)'; \
+	b='test-stddef'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-stdint.log: test-stdint$(EXEEXT)
+	@p='test-stdint$(EXEEXT)'; \
+	b='test-stdint'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-stdio.log: test-stdio$(EXEEXT)
+	@p='test-stdio$(EXEEXT)'; \
+	b='test-stdio'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-stdlib.log: test-stdlib$(EXEEXT)
+	@p='test-stdlib$(EXEEXT)'; \
+	b='test-stdlib'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-strerror.log: test-strerror$(EXEEXT)
+	@p='test-strerror$(EXEEXT)'; \
+	b='test-strerror'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-striconveh.log: test-striconveh$(EXEEXT)
+	@p='test-striconveh$(EXEEXT)'; \
+	b='test-striconveh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-striconveha.log: test-striconveha$(EXEEXT)
+	@p='test-striconveha$(EXEEXT)'; \
+	b='test-striconveha'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-string.log: test-string$(EXEEXT)
+	@p='test-string$(EXEEXT)'; \
+	b='test-string'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-strncat.log: test-strncat$(EXEEXT)
+	@p='test-strncat$(EXEEXT)'; \
+	b='test-strncat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-strstr.log: test-strstr$(EXEEXT)
+	@p='test-strstr$(EXEEXT)'; \
+	b='test-strstr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-sys_types.log: test-sys_types$(EXEEXT)
+	@p='test-sys_types$(EXEEXT)'; \
+	b='test-sys_types'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-init.sh.log: test-init.sh
+	@p='test-init.sh'; \
+	b='test-init.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-thread_self.log: test-thread_self$(EXEEXT)
+	@p='test-thread_self$(EXEEXT)'; \
+	b='test-thread_self'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-thread_create.log: test-thread_create$(EXEEXT)
+	@p='test-thread_create$(EXEEXT)'; \
+	b='test-thread_create'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-cased.log: test-cased$(EXEEXT)
+	@p='test-cased$(EXEEXT)'; \
+	b='test-cased'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ignorable.log: test-ignorable$(EXEEXT)
+	@p='test-ignorable$(EXEEXT)'; \
+	b='test-ignorable'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unicase/test-locale-language.sh.log: unicase/test-locale-language.sh
+	@p='unicase/test-locale-language.sh'; \
+	b='unicase/test-locale-language.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-uc_tolower.log: test-uc_tolower$(EXEEXT)
+	@p='test-uc_tolower$(EXEEXT)'; \
+	b='test-uc_tolower'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-uc_totitle.log: test-uc_totitle$(EXEEXT)
+	@p='test-uc_totitle$(EXEEXT)'; \
+	b='test-uc_totitle'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-uc_toupper.log: test-uc_toupper$(EXEEXT)
+	@p='test-uc_toupper$(EXEEXT)'; \
+	b='test-uc_toupper'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-casecmp.log: test-u16-casecmp$(EXEEXT)
+	@p='test-u16-casecmp$(EXEEXT)'; \
+	b='test-u16-casecmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-casecoll.log: test-u16-casecoll$(EXEEXT)
+	@p='test-u16-casecoll$(EXEEXT)'; \
+	b='test-u16-casecoll'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-casefold.log: test-u16-casefold$(EXEEXT)
+	@p='test-u16-casefold$(EXEEXT)'; \
+	b='test-u16-casefold'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-is-cased.log: test-u16-is-cased$(EXEEXT)
+	@p='test-u16-is-cased$(EXEEXT)'; \
+	b='test-u16-is-cased'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-is-casefolded.log: test-u16-is-casefolded$(EXEEXT)
+	@p='test-u16-is-casefolded$(EXEEXT)'; \
+	b='test-u16-is-casefolded'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-is-lowercase.log: test-u16-is-lowercase$(EXEEXT)
+	@p='test-u16-is-lowercase$(EXEEXT)'; \
+	b='test-u16-is-lowercase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-is-titlecase.log: test-u16-is-titlecase$(EXEEXT)
+	@p='test-u16-is-titlecase$(EXEEXT)'; \
+	b='test-u16-is-titlecase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-is-uppercase.log: test-u16-is-uppercase$(EXEEXT)
+	@p='test-u16-is-uppercase$(EXEEXT)'; \
+	b='test-u16-is-uppercase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-tolower.log: test-u16-tolower$(EXEEXT)
+	@p='test-u16-tolower$(EXEEXT)'; \
+	b='test-u16-tolower'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-totitle.log: test-u16-totitle$(EXEEXT)
+	@p='test-u16-totitle$(EXEEXT)'; \
+	b='test-u16-totitle'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-toupper.log: test-u16-toupper$(EXEEXT)
+	@p='test-u16-toupper$(EXEEXT)'; \
+	b='test-u16-toupper'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-casecmp.log: test-u32-casecmp$(EXEEXT)
+	@p='test-u32-casecmp$(EXEEXT)'; \
+	b='test-u32-casecmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-casecoll.log: test-u32-casecoll$(EXEEXT)
+	@p='test-u32-casecoll$(EXEEXT)'; \
+	b='test-u32-casecoll'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-casefold.log: test-u32-casefold$(EXEEXT)
+	@p='test-u32-casefold$(EXEEXT)'; \
+	b='test-u32-casefold'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-is-cased.log: test-u32-is-cased$(EXEEXT)
+	@p='test-u32-is-cased$(EXEEXT)'; \
+	b='test-u32-is-cased'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-is-casefolded.log: test-u32-is-casefolded$(EXEEXT)
+	@p='test-u32-is-casefolded$(EXEEXT)'; \
+	b='test-u32-is-casefolded'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-is-lowercase.log: test-u32-is-lowercase$(EXEEXT)
+	@p='test-u32-is-lowercase$(EXEEXT)'; \
+	b='test-u32-is-lowercase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-is-titlecase.log: test-u32-is-titlecase$(EXEEXT)
+	@p='test-u32-is-titlecase$(EXEEXT)'; \
+	b='test-u32-is-titlecase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-is-uppercase.log: test-u32-is-uppercase$(EXEEXT)
+	@p='test-u32-is-uppercase$(EXEEXT)'; \
+	b='test-u32-is-uppercase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-tolower.log: test-u32-tolower$(EXEEXT)
+	@p='test-u32-tolower$(EXEEXT)'; \
+	b='test-u32-tolower'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-totitle.log: test-u32-totitle$(EXEEXT)
+	@p='test-u32-totitle$(EXEEXT)'; \
+	b='test-u32-totitle'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-toupper.log: test-u32-toupper$(EXEEXT)
+	@p='test-u32-toupper$(EXEEXT)'; \
+	b='test-u32-toupper'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-casecmp.log: test-u8-casecmp$(EXEEXT)
+	@p='test-u8-casecmp$(EXEEXT)'; \
+	b='test-u8-casecmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-casecoll.log: test-u8-casecoll$(EXEEXT)
+	@p='test-u8-casecoll$(EXEEXT)'; \
+	b='test-u8-casecoll'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-casefold.log: test-u8-casefold$(EXEEXT)
+	@p='test-u8-casefold$(EXEEXT)'; \
+	b='test-u8-casefold'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-is-cased.log: test-u8-is-cased$(EXEEXT)
+	@p='test-u8-is-cased$(EXEEXT)'; \
+	b='test-u8-is-cased'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-is-casefolded.log: test-u8-is-casefolded$(EXEEXT)
+	@p='test-u8-is-casefolded$(EXEEXT)'; \
+	b='test-u8-is-casefolded'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-is-lowercase.log: test-u8-is-lowercase$(EXEEXT)
+	@p='test-u8-is-lowercase$(EXEEXT)'; \
+	b='test-u8-is-lowercase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-is-titlecase.log: test-u8-is-titlecase$(EXEEXT)
+	@p='test-u8-is-titlecase$(EXEEXT)'; \
+	b='test-u8-is-titlecase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-is-uppercase.log: test-u8-is-uppercase$(EXEEXT)
+	@p='test-u8-is-uppercase$(EXEEXT)'; \
+	b='test-u8-is-uppercase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-tolower.log: test-u8-tolower$(EXEEXT)
+	@p='test-u8-tolower$(EXEEXT)'; \
+	b='test-u8-tolower'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-totitle.log: test-u8-totitle$(EXEEXT)
+	@p='test-u8-totitle$(EXEEXT)'; \
+	b='test-u8-totitle'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-toupper.log: test-u8-toupper$(EXEEXT)
+	@p='test-u8-toupper$(EXEEXT)'; \
+	b='test-u8-toupper'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unicase/test-ulc-casecmp1.sh.log: unicase/test-ulc-casecmp1.sh
+	@p='unicase/test-ulc-casecmp1.sh'; \
+	b='unicase/test-ulc-casecmp1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unicase/test-ulc-casecmp2.sh.log: unicase/test-ulc-casecmp2.sh
+	@p='unicase/test-ulc-casecmp2.sh'; \
+	b='unicase/test-ulc-casecmp2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unicase/test-ulc-casecoll1.sh.log: unicase/test-ulc-casecoll1.sh
+	@p='unicase/test-ulc-casecoll1.sh'; \
+	b='unicase/test-ulc-casecoll1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unicase/test-ulc-casecoll2.sh.log: unicase/test-ulc-casecoll2.sh
+	@p='unicase/test-ulc-casecoll2.sh'; \
+	b='unicase/test-ulc-casecoll2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-conv-from-enc.log: test-u16-conv-from-enc$(EXEEXT)
+	@p='test-u16-conv-from-enc$(EXEEXT)'; \
+	b='test-u16-conv-from-enc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-conv-to-enc.log: test-u16-conv-to-enc$(EXEEXT)
+	@p='test-u16-conv-to-enc$(EXEEXT)'; \
+	b='test-u16-conv-to-enc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strconv-from-enc.log: test-u16-strconv-from-enc$(EXEEXT)
+	@p='test-u16-strconv-from-enc$(EXEEXT)'; \
+	b='test-u16-strconv-from-enc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strconv-to-enc.log: test-u16-strconv-to-enc$(EXEEXT)
+	@p='test-u16-strconv-to-enc$(EXEEXT)'; \
+	b='test-u16-strconv-to-enc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-conv-from-enc.log: test-u32-conv-from-enc$(EXEEXT)
+	@p='test-u32-conv-from-enc$(EXEEXT)'; \
+	b='test-u32-conv-from-enc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-conv-to-enc.log: test-u32-conv-to-enc$(EXEEXT)
+	@p='test-u32-conv-to-enc$(EXEEXT)'; \
+	b='test-u32-conv-to-enc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strconv-from-enc.log: test-u32-strconv-from-enc$(EXEEXT)
+	@p='test-u32-strconv-from-enc$(EXEEXT)'; \
+	b='test-u32-strconv-from-enc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strconv-to-enc.log: test-u32-strconv-to-enc$(EXEEXT)
+	@p='test-u32-strconv-to-enc$(EXEEXT)'; \
+	b='test-u32-strconv-to-enc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-conv-from-enc.log: test-u8-conv-from-enc$(EXEEXT)
+	@p='test-u8-conv-from-enc$(EXEEXT)'; \
+	b='test-u8-conv-from-enc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-conv-to-enc.log: test-u8-conv-to-enc$(EXEEXT)
+	@p='test-u8-conv-to-enc$(EXEEXT)'; \
+	b='test-u8-conv-to-enc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strconv-from-enc.log: test-u8-strconv-from-enc$(EXEEXT)
+	@p='test-u8-strconv-from-enc$(EXEEXT)'; \
+	b='test-u8-strconv-from-enc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strconv-to-enc.log: test-u8-strconv-to-enc$(EXEEXT)
+	@p='test-u8-strconv-to-enc$(EXEEXT)'; \
+	b='test-u8-strconv-to-enc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-bidi_byname.log: test-bidi_byname$(EXEEXT)
+	@p='test-bidi_byname$(EXEEXT)'; \
+	b='test-bidi_byname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-bidi_longname.log: test-bidi_longname$(EXEEXT)
+	@p='test-bidi_longname$(EXEEXT)'; \
+	b='test-bidi_longname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-bidi_name.log: test-bidi_name$(EXEEXT)
+	@p='test-bidi_name$(EXEEXT)'; \
+	b='test-bidi_name'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-bidi_of.log: test-bidi_of$(EXEEXT)
+	@p='test-bidi_of$(EXEEXT)'; \
+	b='test-bidi_of'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-bidi_test.log: test-bidi_test$(EXEEXT)
+	@p='test-bidi_test$(EXEEXT)'; \
+	b='test-bidi_test'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-block_list.log: test-block_list$(EXEEXT)
+	@p='test-block_list$(EXEEXT)'; \
+	b='test-block_list'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-block_of.log: test-block_of$(EXEEXT)
+	@p='test-block_of$(EXEEXT)'; \
+	b='test-block_of'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-block_test.log: test-block_test$(EXEEXT)
+	@p='test-block_test$(EXEEXT)'; \
+	b='test-block_test'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_C.log: test-categ_C$(EXEEXT)
+	@p='test-categ_C$(EXEEXT)'; \
+	b='test-categ_C'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Cc.log: test-categ_Cc$(EXEEXT)
+	@p='test-categ_Cc$(EXEEXT)'; \
+	b='test-categ_Cc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Cf.log: test-categ_Cf$(EXEEXT)
+	@p='test-categ_Cf$(EXEEXT)'; \
+	b='test-categ_Cf'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Cn.log: test-categ_Cn$(EXEEXT)
+	@p='test-categ_Cn$(EXEEXT)'; \
+	b='test-categ_Cn'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Co.log: test-categ_Co$(EXEEXT)
+	@p='test-categ_Co$(EXEEXT)'; \
+	b='test-categ_Co'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Cs.log: test-categ_Cs$(EXEEXT)
+	@p='test-categ_Cs$(EXEEXT)'; \
+	b='test-categ_Cs'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_L.log: test-categ_L$(EXEEXT)
+	@p='test-categ_L$(EXEEXT)'; \
+	b='test-categ_L'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_LC.log: test-categ_LC$(EXEEXT)
+	@p='test-categ_LC$(EXEEXT)'; \
+	b='test-categ_LC'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Ll.log: test-categ_Ll$(EXEEXT)
+	@p='test-categ_Ll$(EXEEXT)'; \
+	b='test-categ_Ll'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Lm.log: test-categ_Lm$(EXEEXT)
+	@p='test-categ_Lm$(EXEEXT)'; \
+	b='test-categ_Lm'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Lo.log: test-categ_Lo$(EXEEXT)
+	@p='test-categ_Lo$(EXEEXT)'; \
+	b='test-categ_Lo'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Lt.log: test-categ_Lt$(EXEEXT)
+	@p='test-categ_Lt$(EXEEXT)'; \
+	b='test-categ_Lt'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Lu.log: test-categ_Lu$(EXEEXT)
+	@p='test-categ_Lu$(EXEEXT)'; \
+	b='test-categ_Lu'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_M.log: test-categ_M$(EXEEXT)
+	@p='test-categ_M$(EXEEXT)'; \
+	b='test-categ_M'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Mc.log: test-categ_Mc$(EXEEXT)
+	@p='test-categ_Mc$(EXEEXT)'; \
+	b='test-categ_Mc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Me.log: test-categ_Me$(EXEEXT)
+	@p='test-categ_Me$(EXEEXT)'; \
+	b='test-categ_Me'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Mn.log: test-categ_Mn$(EXEEXT)
+	@p='test-categ_Mn$(EXEEXT)'; \
+	b='test-categ_Mn'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_N.log: test-categ_N$(EXEEXT)
+	@p='test-categ_N$(EXEEXT)'; \
+	b='test-categ_N'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Nd.log: test-categ_Nd$(EXEEXT)
+	@p='test-categ_Nd$(EXEEXT)'; \
+	b='test-categ_Nd'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Nl.log: test-categ_Nl$(EXEEXT)
+	@p='test-categ_Nl$(EXEEXT)'; \
+	b='test-categ_Nl'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_No.log: test-categ_No$(EXEEXT)
+	@p='test-categ_No$(EXEEXT)'; \
+	b='test-categ_No'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_P.log: test-categ_P$(EXEEXT)
+	@p='test-categ_P$(EXEEXT)'; \
+	b='test-categ_P'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Pc.log: test-categ_Pc$(EXEEXT)
+	@p='test-categ_Pc$(EXEEXT)'; \
+	b='test-categ_Pc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Pd.log: test-categ_Pd$(EXEEXT)
+	@p='test-categ_Pd$(EXEEXT)'; \
+	b='test-categ_Pd'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Pe.log: test-categ_Pe$(EXEEXT)
+	@p='test-categ_Pe$(EXEEXT)'; \
+	b='test-categ_Pe'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Pf.log: test-categ_Pf$(EXEEXT)
+	@p='test-categ_Pf$(EXEEXT)'; \
+	b='test-categ_Pf'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Pi.log: test-categ_Pi$(EXEEXT)
+	@p='test-categ_Pi$(EXEEXT)'; \
+	b='test-categ_Pi'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Po.log: test-categ_Po$(EXEEXT)
+	@p='test-categ_Po$(EXEEXT)'; \
+	b='test-categ_Po'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Ps.log: test-categ_Ps$(EXEEXT)
+	@p='test-categ_Ps$(EXEEXT)'; \
+	b='test-categ_Ps'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_S.log: test-categ_S$(EXEEXT)
+	@p='test-categ_S$(EXEEXT)'; \
+	b='test-categ_S'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Sc.log: test-categ_Sc$(EXEEXT)
+	@p='test-categ_Sc$(EXEEXT)'; \
+	b='test-categ_Sc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Sk.log: test-categ_Sk$(EXEEXT)
+	@p='test-categ_Sk$(EXEEXT)'; \
+	b='test-categ_Sk'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Sm.log: test-categ_Sm$(EXEEXT)
+	@p='test-categ_Sm$(EXEEXT)'; \
+	b='test-categ_Sm'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_So.log: test-categ_So$(EXEEXT)
+	@p='test-categ_So$(EXEEXT)'; \
+	b='test-categ_So'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Z.log: test-categ_Z$(EXEEXT)
+	@p='test-categ_Z$(EXEEXT)'; \
+	b='test-categ_Z'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Zl.log: test-categ_Zl$(EXEEXT)
+	@p='test-categ_Zl$(EXEEXT)'; \
+	b='test-categ_Zl'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Zp.log: test-categ_Zp$(EXEEXT)
+	@p='test-categ_Zp$(EXEEXT)'; \
+	b='test-categ_Zp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_Zs.log: test-categ_Zs$(EXEEXT)
+	@p='test-categ_Zs$(EXEEXT)'; \
+	b='test-categ_Zs'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_and_not.log: test-categ_and_not$(EXEEXT)
+	@p='test-categ_and_not$(EXEEXT)'; \
+	b='test-categ_and_not'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_and.log: test-categ_and$(EXEEXT)
+	@p='test-categ_and$(EXEEXT)'; \
+	b='test-categ_and'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_byname.log: test-categ_byname$(EXEEXT)
+	@p='test-categ_byname$(EXEEXT)'; \
+	b='test-categ_byname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_longname.log: test-categ_longname$(EXEEXT)
+	@p='test-categ_longname$(EXEEXT)'; \
+	b='test-categ_longname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_name.log: test-categ_name$(EXEEXT)
+	@p='test-categ_name$(EXEEXT)'; \
+	b='test-categ_name'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_none.log: test-categ_none$(EXEEXT)
+	@p='test-categ_none$(EXEEXT)'; \
+	b='test-categ_none'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_of.log: test-categ_of$(EXEEXT)
+	@p='test-categ_of$(EXEEXT)'; \
+	b='test-categ_of'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_or.log: test-categ_or$(EXEEXT)
+	@p='test-categ_or$(EXEEXT)'; \
+	b='test-categ_or'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-categ_test_withtable.log: test-categ_test_withtable$(EXEEXT)
+	@p='test-categ_test_withtable$(EXEEXT)'; \
+	b='test-categ_test_withtable'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-combiningclass_byname.log: test-combiningclass_byname$(EXEEXT)
+	@p='test-combiningclass_byname$(EXEEXT)'; \
+	b='test-combiningclass_byname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-combiningclass_longname.log: test-combiningclass_longname$(EXEEXT)
+	@p='test-combiningclass_longname$(EXEEXT)'; \
+	b='test-combiningclass_longname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-combiningclass_name.log: test-combiningclass_name$(EXEEXT)
+	@p='test-combiningclass_name$(EXEEXT)'; \
+	b='test-combiningclass_name'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-combiningclass.log: test-combiningclass$(EXEEXT)
+	@p='test-combiningclass$(EXEEXT)'; \
+	b='test-combiningclass'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ctype_alnum.log: test-ctype_alnum$(EXEEXT)
+	@p='test-ctype_alnum$(EXEEXT)'; \
+	b='test-ctype_alnum'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ctype_alpha.log: test-ctype_alpha$(EXEEXT)
+	@p='test-ctype_alpha$(EXEEXT)'; \
+	b='test-ctype_alpha'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ctype_blank.log: test-ctype_blank$(EXEEXT)
+	@p='test-ctype_blank$(EXEEXT)'; \
+	b='test-ctype_blank'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ctype_cntrl.log: test-ctype_cntrl$(EXEEXT)
+	@p='test-ctype_cntrl$(EXEEXT)'; \
+	b='test-ctype_cntrl'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ctype_digit.log: test-ctype_digit$(EXEEXT)
+	@p='test-ctype_digit$(EXEEXT)'; \
+	b='test-ctype_digit'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ctype_graph.log: test-ctype_graph$(EXEEXT)
+	@p='test-ctype_graph$(EXEEXT)'; \
+	b='test-ctype_graph'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ctype_lower.log: test-ctype_lower$(EXEEXT)
+	@p='test-ctype_lower$(EXEEXT)'; \
+	b='test-ctype_lower'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ctype_print.log: test-ctype_print$(EXEEXT)
+	@p='test-ctype_print$(EXEEXT)'; \
+	b='test-ctype_print'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ctype_punct.log: test-ctype_punct$(EXEEXT)
+	@p='test-ctype_punct$(EXEEXT)'; \
+	b='test-ctype_punct'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ctype_space.log: test-ctype_space$(EXEEXT)
+	@p='test-ctype_space$(EXEEXT)'; \
+	b='test-ctype_space'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ctype_upper.log: test-ctype_upper$(EXEEXT)
+	@p='test-ctype_upper$(EXEEXT)'; \
+	b='test-ctype_upper'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ctype_xdigit.log: test-ctype_xdigit$(EXEEXT)
+	@p='test-ctype_xdigit$(EXEEXT)'; \
+	b='test-ctype_xdigit'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-decdigit.log: test-decdigit$(EXEEXT)
+	@p='test-decdigit$(EXEEXT)'; \
+	b='test-decdigit'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-digit.log: test-digit$(EXEEXT)
+	@p='test-digit$(EXEEXT)'; \
+	b='test-digit'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-joininggroup_byname.log: test-joininggroup_byname$(EXEEXT)
+	@p='test-joininggroup_byname$(EXEEXT)'; \
+	b='test-joininggroup_byname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-joininggroup_name.log: test-joininggroup_name$(EXEEXT)
+	@p='test-joininggroup_name$(EXEEXT)'; \
+	b='test-joininggroup_name'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-joininggroup_of.log: test-joininggroup_of$(EXEEXT)
+	@p='test-joininggroup_of$(EXEEXT)'; \
+	b='test-joininggroup_of'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-joiningtype_byname.log: test-joiningtype_byname$(EXEEXT)
+	@p='test-joiningtype_byname$(EXEEXT)'; \
+	b='test-joiningtype_byname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-joiningtype_longname.log: test-joiningtype_longname$(EXEEXT)
+	@p='test-joiningtype_longname$(EXEEXT)'; \
+	b='test-joiningtype_longname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-joiningtype_name.log: test-joiningtype_name$(EXEEXT)
+	@p='test-joiningtype_name$(EXEEXT)'; \
+	b='test-joiningtype_name'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-joiningtype_of.log: test-joiningtype_of$(EXEEXT)
+	@p='test-joiningtype_of$(EXEEXT)'; \
+	b='test-joiningtype_of'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-mirror.log: test-mirror$(EXEEXT)
+	@p='test-mirror$(EXEEXT)'; \
+	b='test-mirror'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-numeric.log: test-numeric$(EXEEXT)
+	@p='test-numeric$(EXEEXT)'; \
+	b='test-numeric'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_alphabetic.log: test-pr_alphabetic$(EXEEXT)
+	@p='test-pr_alphabetic$(EXEEXT)'; \
+	b='test-pr_alphabetic'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_ascii_hex_digit.log: test-pr_ascii_hex_digit$(EXEEXT)
+	@p='test-pr_ascii_hex_digit$(EXEEXT)'; \
+	b='test-pr_ascii_hex_digit'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_arabic_digit.log: test-pr_bidi_arabic_digit$(EXEEXT)
+	@p='test-pr_bidi_arabic_digit$(EXEEXT)'; \
+	b='test-pr_bidi_arabic_digit'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_arabic_right_to_left.log: test-pr_bidi_arabic_right_to_left$(EXEEXT)
+	@p='test-pr_bidi_arabic_right_to_left$(EXEEXT)'; \
+	b='test-pr_bidi_arabic_right_to_left'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_block_separator.log: test-pr_bidi_block_separator$(EXEEXT)
+	@p='test-pr_bidi_block_separator$(EXEEXT)'; \
+	b='test-pr_bidi_block_separator'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_boundary_neutral.log: test-pr_bidi_boundary_neutral$(EXEEXT)
+	@p='test-pr_bidi_boundary_neutral$(EXEEXT)'; \
+	b='test-pr_bidi_boundary_neutral'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_common_separator.log: test-pr_bidi_common_separator$(EXEEXT)
+	@p='test-pr_bidi_common_separator$(EXEEXT)'; \
+	b='test-pr_bidi_common_separator'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_control.log: test-pr_bidi_control$(EXEEXT)
+	@p='test-pr_bidi_control$(EXEEXT)'; \
+	b='test-pr_bidi_control'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_embedding_or_override.log: test-pr_bidi_embedding_or_override$(EXEEXT)
+	@p='test-pr_bidi_embedding_or_override$(EXEEXT)'; \
+	b='test-pr_bidi_embedding_or_override'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_eur_num_separator.log: test-pr_bidi_eur_num_separator$(EXEEXT)
+	@p='test-pr_bidi_eur_num_separator$(EXEEXT)'; \
+	b='test-pr_bidi_eur_num_separator'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_eur_num_terminator.log: test-pr_bidi_eur_num_terminator$(EXEEXT)
+	@p='test-pr_bidi_eur_num_terminator$(EXEEXT)'; \
+	b='test-pr_bidi_eur_num_terminator'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_european_digit.log: test-pr_bidi_european_digit$(EXEEXT)
+	@p='test-pr_bidi_european_digit$(EXEEXT)'; \
+	b='test-pr_bidi_european_digit'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_hebrew_right_to_left.log: test-pr_bidi_hebrew_right_to_left$(EXEEXT)
+	@p='test-pr_bidi_hebrew_right_to_left$(EXEEXT)'; \
+	b='test-pr_bidi_hebrew_right_to_left'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_left_to_right.log: test-pr_bidi_left_to_right$(EXEEXT)
+	@p='test-pr_bidi_left_to_right$(EXEEXT)'; \
+	b='test-pr_bidi_left_to_right'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_non_spacing_mark.log: test-pr_bidi_non_spacing_mark$(EXEEXT)
+	@p='test-pr_bidi_non_spacing_mark$(EXEEXT)'; \
+	b='test-pr_bidi_non_spacing_mark'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_other_neutral.log: test-pr_bidi_other_neutral$(EXEEXT)
+	@p='test-pr_bidi_other_neutral$(EXEEXT)'; \
+	b='test-pr_bidi_other_neutral'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_pdf.log: test-pr_bidi_pdf$(EXEEXT)
+	@p='test-pr_bidi_pdf$(EXEEXT)'; \
+	b='test-pr_bidi_pdf'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_segment_separator.log: test-pr_bidi_segment_separator$(EXEEXT)
+	@p='test-pr_bidi_segment_separator$(EXEEXT)'; \
+	b='test-pr_bidi_segment_separator'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_bidi_whitespace.log: test-pr_bidi_whitespace$(EXEEXT)
+	@p='test-pr_bidi_whitespace$(EXEEXT)'; \
+	b='test-pr_bidi_whitespace'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_byname.log: test-pr_byname$(EXEEXT)
+	@p='test-pr_byname$(EXEEXT)'; \
+	b='test-pr_byname'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_case_ignorable.log: test-pr_case_ignorable$(EXEEXT)
+	@p='test-pr_case_ignorable$(EXEEXT)'; \
+	b='test-pr_case_ignorable'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_cased.log: test-pr_cased$(EXEEXT)
+	@p='test-pr_cased$(EXEEXT)'; \
+	b='test-pr_cased'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_changes_when_casefolded.log: test-pr_changes_when_casefolded$(EXEEXT)
+	@p='test-pr_changes_when_casefolded$(EXEEXT)'; \
+	b='test-pr_changes_when_casefolded'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_changes_when_casemapped.log: test-pr_changes_when_casemapped$(EXEEXT)
+	@p='test-pr_changes_when_casemapped$(EXEEXT)'; \
+	b='test-pr_changes_when_casemapped'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_changes_when_lowercased.log: test-pr_changes_when_lowercased$(EXEEXT)
+	@p='test-pr_changes_when_lowercased$(EXEEXT)'; \
+	b='test-pr_changes_when_lowercased'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_changes_when_titlecased.log: test-pr_changes_when_titlecased$(EXEEXT)
+	@p='test-pr_changes_when_titlecased$(EXEEXT)'; \
+	b='test-pr_changes_when_titlecased'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_changes_when_uppercased.log: test-pr_changes_when_uppercased$(EXEEXT)
+	@p='test-pr_changes_when_uppercased$(EXEEXT)'; \
+	b='test-pr_changes_when_uppercased'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_combining.log: test-pr_combining$(EXEEXT)
+	@p='test-pr_combining$(EXEEXT)'; \
+	b='test-pr_combining'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_composite.log: test-pr_composite$(EXEEXT)
+	@p='test-pr_composite$(EXEEXT)'; \
+	b='test-pr_composite'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_currency_symbol.log: test-pr_currency_symbol$(EXEEXT)
+	@p='test-pr_currency_symbol$(EXEEXT)'; \
+	b='test-pr_currency_symbol'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_dash.log: test-pr_dash$(EXEEXT)
+	@p='test-pr_dash$(EXEEXT)'; \
+	b='test-pr_dash'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_decimal_digit.log: test-pr_decimal_digit$(EXEEXT)
+	@p='test-pr_decimal_digit$(EXEEXT)'; \
+	b='test-pr_decimal_digit'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_default_ignorable_code_point.log: test-pr_default_ignorable_code_point$(EXEEXT)
+	@p='test-pr_default_ignorable_code_point$(EXEEXT)'; \
+	b='test-pr_default_ignorable_code_point'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_deprecated.log: test-pr_deprecated$(EXEEXT)
+	@p='test-pr_deprecated$(EXEEXT)'; \
+	b='test-pr_deprecated'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_diacritic.log: test-pr_diacritic$(EXEEXT)
+	@p='test-pr_diacritic$(EXEEXT)'; \
+	b='test-pr_diacritic'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_extender.log: test-pr_extender$(EXEEXT)
+	@p='test-pr_extender$(EXEEXT)'; \
+	b='test-pr_extender'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_format_control.log: test-pr_format_control$(EXEEXT)
+	@p='test-pr_format_control$(EXEEXT)'; \
+	b='test-pr_format_control'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_grapheme_base.log: test-pr_grapheme_base$(EXEEXT)
+	@p='test-pr_grapheme_base$(EXEEXT)'; \
+	b='test-pr_grapheme_base'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_grapheme_extend.log: test-pr_grapheme_extend$(EXEEXT)
+	@p='test-pr_grapheme_extend$(EXEEXT)'; \
+	b='test-pr_grapheme_extend'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_grapheme_link.log: test-pr_grapheme_link$(EXEEXT)
+	@p='test-pr_grapheme_link$(EXEEXT)'; \
+	b='test-pr_grapheme_link'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_hex_digit.log: test-pr_hex_digit$(EXEEXT)
+	@p='test-pr_hex_digit$(EXEEXT)'; \
+	b='test-pr_hex_digit'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_hyphen.log: test-pr_hyphen$(EXEEXT)
+	@p='test-pr_hyphen$(EXEEXT)'; \
+	b='test-pr_hyphen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_id_continue.log: test-pr_id_continue$(EXEEXT)
+	@p='test-pr_id_continue$(EXEEXT)'; \
+	b='test-pr_id_continue'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_id_start.log: test-pr_id_start$(EXEEXT)
+	@p='test-pr_id_start$(EXEEXT)'; \
+	b='test-pr_id_start'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_ideographic.log: test-pr_ideographic$(EXEEXT)
+	@p='test-pr_ideographic$(EXEEXT)'; \
+	b='test-pr_ideographic'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_ids_binary_operator.log: test-pr_ids_binary_operator$(EXEEXT)
+	@p='test-pr_ids_binary_operator$(EXEEXT)'; \
+	b='test-pr_ids_binary_operator'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_ids_trinary_operator.log: test-pr_ids_trinary_operator$(EXEEXT)
+	@p='test-pr_ids_trinary_operator$(EXEEXT)'; \
+	b='test-pr_ids_trinary_operator'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_ignorable_control.log: test-pr_ignorable_control$(EXEEXT)
+	@p='test-pr_ignorable_control$(EXEEXT)'; \
+	b='test-pr_ignorable_control'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_iso_control.log: test-pr_iso_control$(EXEEXT)
+	@p='test-pr_iso_control$(EXEEXT)'; \
+	b='test-pr_iso_control'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_join_control.log: test-pr_join_control$(EXEEXT)
+	@p='test-pr_join_control$(EXEEXT)'; \
+	b='test-pr_join_control'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_left_of_pair.log: test-pr_left_of_pair$(EXEEXT)
+	@p='test-pr_left_of_pair$(EXEEXT)'; \
+	b='test-pr_left_of_pair'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_line_separator.log: test-pr_line_separator$(EXEEXT)
+	@p='test-pr_line_separator$(EXEEXT)'; \
+	b='test-pr_line_separator'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_logical_order_exception.log: test-pr_logical_order_exception$(EXEEXT)
+	@p='test-pr_logical_order_exception$(EXEEXT)'; \
+	b='test-pr_logical_order_exception'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_lowercase.log: test-pr_lowercase$(EXEEXT)
+	@p='test-pr_lowercase$(EXEEXT)'; \
+	b='test-pr_lowercase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_math.log: test-pr_math$(EXEEXT)
+	@p='test-pr_math$(EXEEXT)'; \
+	b='test-pr_math'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_non_break.log: test-pr_non_break$(EXEEXT)
+	@p='test-pr_non_break$(EXEEXT)'; \
+	b='test-pr_non_break'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_not_a_character.log: test-pr_not_a_character$(EXEEXT)
+	@p='test-pr_not_a_character$(EXEEXT)'; \
+	b='test-pr_not_a_character'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_numeric.log: test-pr_numeric$(EXEEXT)
+	@p='test-pr_numeric$(EXEEXT)'; \
+	b='test-pr_numeric'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_other_alphabetic.log: test-pr_other_alphabetic$(EXEEXT)
+	@p='test-pr_other_alphabetic$(EXEEXT)'; \
+	b='test-pr_other_alphabetic'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_other_default_ignorable_code_point.log: test-pr_other_default_ignorable_code_point$(EXEEXT)
+	@p='test-pr_other_default_ignorable_code_point$(EXEEXT)'; \
+	b='test-pr_other_default_ignorable_code_point'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_other_grapheme_extend.log: test-pr_other_grapheme_extend$(EXEEXT)
+	@p='test-pr_other_grapheme_extend$(EXEEXT)'; \
+	b='test-pr_other_grapheme_extend'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_other_id_continue.log: test-pr_other_id_continue$(EXEEXT)
+	@p='test-pr_other_id_continue$(EXEEXT)'; \
+	b='test-pr_other_id_continue'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_other_id_start.log: test-pr_other_id_start$(EXEEXT)
+	@p='test-pr_other_id_start$(EXEEXT)'; \
+	b='test-pr_other_id_start'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_other_lowercase.log: test-pr_other_lowercase$(EXEEXT)
+	@p='test-pr_other_lowercase$(EXEEXT)'; \
+	b='test-pr_other_lowercase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_other_math.log: test-pr_other_math$(EXEEXT)
+	@p='test-pr_other_math$(EXEEXT)'; \
+	b='test-pr_other_math'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_other_uppercase.log: test-pr_other_uppercase$(EXEEXT)
+	@p='test-pr_other_uppercase$(EXEEXT)'; \
+	b='test-pr_other_uppercase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_paired_punctuation.log: test-pr_paired_punctuation$(EXEEXT)
+	@p='test-pr_paired_punctuation$(EXEEXT)'; \
+	b='test-pr_paired_punctuation'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_paragraph_separator.log: test-pr_paragraph_separator$(EXEEXT)
+	@p='test-pr_paragraph_separator$(EXEEXT)'; \
+	b='test-pr_paragraph_separator'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_pattern_syntax.log: test-pr_pattern_syntax$(EXEEXT)
+	@p='test-pr_pattern_syntax$(EXEEXT)'; \
+	b='test-pr_pattern_syntax'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_pattern_white_space.log: test-pr_pattern_white_space$(EXEEXT)
+	@p='test-pr_pattern_white_space$(EXEEXT)'; \
+	b='test-pr_pattern_white_space'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_private_use.log: test-pr_private_use$(EXEEXT)
+	@p='test-pr_private_use$(EXEEXT)'; \
+	b='test-pr_private_use'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_punctuation.log: test-pr_punctuation$(EXEEXT)
+	@p='test-pr_punctuation$(EXEEXT)'; \
+	b='test-pr_punctuation'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_quotation_mark.log: test-pr_quotation_mark$(EXEEXT)
+	@p='test-pr_quotation_mark$(EXEEXT)'; \
+	b='test-pr_quotation_mark'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_radical.log: test-pr_radical$(EXEEXT)
+	@p='test-pr_radical$(EXEEXT)'; \
+	b='test-pr_radical'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_sentence_terminal.log: test-pr_sentence_terminal$(EXEEXT)
+	@p='test-pr_sentence_terminal$(EXEEXT)'; \
+	b='test-pr_sentence_terminal'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_soft_dotted.log: test-pr_soft_dotted$(EXEEXT)
+	@p='test-pr_soft_dotted$(EXEEXT)'; \
+	b='test-pr_soft_dotted'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_space.log: test-pr_space$(EXEEXT)
+	@p='test-pr_space$(EXEEXT)'; \
+	b='test-pr_space'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_terminal_punctuation.log: test-pr_terminal_punctuation$(EXEEXT)
+	@p='test-pr_terminal_punctuation$(EXEEXT)'; \
+	b='test-pr_terminal_punctuation'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_test.log: test-pr_test$(EXEEXT)
+	@p='test-pr_test$(EXEEXT)'; \
+	b='test-pr_test'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_titlecase.log: test-pr_titlecase$(EXEEXT)
+	@p='test-pr_titlecase$(EXEEXT)'; \
+	b='test-pr_titlecase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_unassigned_code_value.log: test-pr_unassigned_code_value$(EXEEXT)
+	@p='test-pr_unassigned_code_value$(EXEEXT)'; \
+	b='test-pr_unassigned_code_value'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_unified_ideograph.log: test-pr_unified_ideograph$(EXEEXT)
+	@p='test-pr_unified_ideograph$(EXEEXT)'; \
+	b='test-pr_unified_ideograph'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_uppercase.log: test-pr_uppercase$(EXEEXT)
+	@p='test-pr_uppercase$(EXEEXT)'; \
+	b='test-pr_uppercase'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_variation_selector.log: test-pr_variation_selector$(EXEEXT)
+	@p='test-pr_variation_selector$(EXEEXT)'; \
+	b='test-pr_variation_selector'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_white_space.log: test-pr_white_space$(EXEEXT)
+	@p='test-pr_white_space$(EXEEXT)'; \
+	b='test-pr_white_space'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_xid_continue.log: test-pr_xid_continue$(EXEEXT)
+	@p='test-pr_xid_continue$(EXEEXT)'; \
+	b='test-pr_xid_continue'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_xid_start.log: test-pr_xid_start$(EXEEXT)
+	@p='test-pr_xid_start$(EXEEXT)'; \
+	b='test-pr_xid_start'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-pr_zero_width.log: test-pr_zero_width$(EXEEXT)
+	@p='test-pr_zero_width$(EXEEXT)'; \
+	b='test-pr_zero_width'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-scripts.log: test-scripts$(EXEEXT)
+	@p='test-scripts$(EXEEXT)'; \
+	b='test-scripts'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-sy_c_ident.log: test-sy_c_ident$(EXEEXT)
+	@p='test-sy_c_ident$(EXEEXT)'; \
+	b='test-sy_c_ident'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-sy_c_whitespace.log: test-sy_c_whitespace$(EXEEXT)
+	@p='test-sy_c_whitespace$(EXEEXT)'; \
+	b='test-sy_c_whitespace'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-sy_java_ident.log: test-sy_java_ident$(EXEEXT)
+	@p='test-sy_java_ident$(EXEEXT)'; \
+	b='test-sy_java_ident'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-sy_java_whitespace.log: test-sy_java_whitespace$(EXEEXT)
+	@p='test-sy_java_whitespace$(EXEEXT)'; \
+	b='test-sy_java_whitespace'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-grapheme-breaks.log: test-u16-grapheme-breaks$(EXEEXT)
+	@p='test-u16-grapheme-breaks$(EXEEXT)'; \
+	b='test-u16-grapheme-breaks'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-grapheme-next.log: test-u16-grapheme-next$(EXEEXT)
+	@p='test-u16-grapheme-next$(EXEEXT)'; \
+	b='test-u16-grapheme-next'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-grapheme-prev.log: test-u16-grapheme-prev$(EXEEXT)
+	@p='test-u16-grapheme-prev$(EXEEXT)'; \
+	b='test-u16-grapheme-prev'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-grapheme-breaks.log: test-u32-grapheme-breaks$(EXEEXT)
+	@p='test-u32-grapheme-breaks$(EXEEXT)'; \
+	b='test-u32-grapheme-breaks'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-grapheme-next.log: test-u32-grapheme-next$(EXEEXT)
+	@p='test-u32-grapheme-next$(EXEEXT)'; \
+	b='test-u32-grapheme-next'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-grapheme-prev.log: test-u32-grapheme-prev$(EXEEXT)
+	@p='test-u32-grapheme-prev$(EXEEXT)'; \
+	b='test-u32-grapheme-prev'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-grapheme-breaks.log: test-u8-grapheme-breaks$(EXEEXT)
+	@p='test-u8-grapheme-breaks$(EXEEXT)'; \
+	b='test-u8-grapheme-breaks'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-grapheme-next.log: test-u8-grapheme-next$(EXEEXT)
+	@p='test-u8-grapheme-next$(EXEEXT)'; \
+	b='test-u8-grapheme-next'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-grapheme-prev.log: test-u8-grapheme-prev$(EXEEXT)
+	@p='test-u8-grapheme-prev$(EXEEXT)'; \
+	b='test-u8-grapheme-prev'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-uc-gbrk-prop.log: test-uc-gbrk-prop$(EXEEXT)
+	@p='test-uc-gbrk-prop$(EXEEXT)'; \
+	b='test-uc-gbrk-prop'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unigbrk/test-uc-is-grapheme-break.sh.log: unigbrk/test-uc-is-grapheme-break.sh
+	@p='unigbrk/test-uc-is-grapheme-break.sh'; \
+	b='unigbrk/test-uc-is-grapheme-break.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unigbrk/test-ulc-grapheme-breaks.sh.log: unigbrk/test-ulc-grapheme-breaks.sh
+	@p='unigbrk/test-ulc-grapheme-breaks.sh'; \
+	b='unigbrk/test-ulc-grapheme-breaks.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-possible-linebreaks.log: test-u16-possible-linebreaks$(EXEEXT)
+	@p='test-u16-possible-linebreaks$(EXEEXT)'; \
+	b='test-u16-possible-linebreaks'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-width-linebreaks.log: test-u16-width-linebreaks$(EXEEXT)
+	@p='test-u16-width-linebreaks$(EXEEXT)'; \
+	b='test-u16-width-linebreaks'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-possible-linebreaks.log: test-u32-possible-linebreaks$(EXEEXT)
+	@p='test-u32-possible-linebreaks$(EXEEXT)'; \
+	b='test-u32-possible-linebreaks'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-width-linebreaks.log: test-u32-width-linebreaks$(EXEEXT)
+	@p='test-u32-width-linebreaks$(EXEEXT)'; \
+	b='test-u32-width-linebreaks'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-possible-linebreaks.log: test-u8-possible-linebreaks$(EXEEXT)
+	@p='test-u8-possible-linebreaks$(EXEEXT)'; \
+	b='test-u8-possible-linebreaks'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-width-linebreaks.log: test-u8-width-linebreaks$(EXEEXT)
+	@p='test-u8-width-linebreaks$(EXEEXT)'; \
+	b='test-u8-width-linebreaks'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ulc-possible-linebreaks.log: test-ulc-possible-linebreaks$(EXEEXT)
+	@p='test-ulc-possible-linebreaks$(EXEEXT)'; \
+	b='test-ulc-possible-linebreaks'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ulc-width-linebreaks.log: test-ulc-width-linebreaks$(EXEEXT)
+	@p='test-ulc-width-linebreaks$(EXEEXT)'; \
+	b='test-ulc-width-linebreaks'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+uniname/test-uninames.sh.log: uniname/test-uninames.sh
+	@p='uniname/test-uninames.sh'; \
+	b='uniname/test-uninames.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-canonical-decomposition.log: test-canonical-decomposition$(EXEEXT)
+	@p='test-canonical-decomposition$(EXEEXT)'; \
+	b='test-canonical-decomposition'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-compat-decomposition.log: test-compat-decomposition$(EXEEXT)
+	@p='test-compat-decomposition$(EXEEXT)'; \
+	b='test-compat-decomposition'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-composition.log: test-composition$(EXEEXT)
+	@p='test-composition$(EXEEXT)'; \
+	b='test-composition'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-decomposing-form.log: test-decomposing-form$(EXEEXT)
+	@p='test-decomposing-form$(EXEEXT)'; \
+	b='test-decomposing-form'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-decomposition.log: test-decomposition$(EXEEXT)
+	@p='test-decomposition$(EXEEXT)'; \
+	b='test-decomposition'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-uninorm-filter-nfc.log: test-uninorm-filter-nfc$(EXEEXT)
+	@p='test-uninorm-filter-nfc$(EXEEXT)'; \
+	b='test-uninorm-filter-nfc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-nfc.log: test-nfc$(EXEEXT)
+	@p='test-nfc$(EXEEXT)'; \
+	b='test-nfc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+uninorm/test-u32-nfc-big.sh.log: uninorm/test-u32-nfc-big.sh
+	@p='uninorm/test-u32-nfc-big.sh'; \
+	b='uninorm/test-u32-nfc-big.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-nfd.log: test-nfd$(EXEEXT)
+	@p='test-nfd$(EXEEXT)'; \
+	b='test-nfd'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+uninorm/test-u32-nfd-big.sh.log: uninorm/test-u32-nfd-big.sh
+	@p='uninorm/test-u32-nfd-big.sh'; \
+	b='uninorm/test-u32-nfd-big.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-nfkc.log: test-nfkc$(EXEEXT)
+	@p='test-nfkc$(EXEEXT)'; \
+	b='test-nfkc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+uninorm/test-u32-nfkc-big.sh.log: uninorm/test-u32-nfkc-big.sh
+	@p='uninorm/test-u32-nfkc-big.sh'; \
+	b='uninorm/test-u32-nfkc-big.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-nfkd.log: test-nfkd$(EXEEXT)
+	@p='test-nfkd$(EXEEXT)'; \
+	b='test-nfkd'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+uninorm/test-u32-nfkd-big.sh.log: uninorm/test-u32-nfkd-big.sh
+	@p='uninorm/test-u32-nfkd-big.sh'; \
+	b='uninorm/test-u32-nfkd-big.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-normcmp.log: test-u16-normcmp$(EXEEXT)
+	@p='test-u16-normcmp$(EXEEXT)'; \
+	b='test-u16-normcmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-normcoll.log: test-u16-normcoll$(EXEEXT)
+	@p='test-u16-normcoll$(EXEEXT)'; \
+	b='test-u16-normcoll'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-normcmp.log: test-u32-normcmp$(EXEEXT)
+	@p='test-u32-normcmp$(EXEEXT)'; \
+	b='test-u32-normcmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-normcoll.log: test-u32-normcoll$(EXEEXT)
+	@p='test-u32-normcoll$(EXEEXT)'; \
+	b='test-u32-normcoll'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-normcmp.log: test-u8-normcmp$(EXEEXT)
+	@p='test-u8-normcmp$(EXEEXT)'; \
+	b='test-u8-normcmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-normcoll.log: test-u8-normcoll$(EXEEXT)
+	@p='test-u8-normcoll$(EXEEXT)'; \
+	b='test-u8-normcoll'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-unistd.log: test-unistd$(EXEEXT)
+	@p='test-unistd$(EXEEXT)'; \
+	b='test-unistd'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-asnprintf1.log: test-u16-asnprintf1$(EXEEXT)
+	@p='test-u16-asnprintf1$(EXEEXT)'; \
+	b='test-u16-asnprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-vasnprintf1.log: test-u16-vasnprintf1$(EXEEXT)
+	@p='test-u16-vasnprintf1$(EXEEXT)'; \
+	b='test-u16-vasnprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unistdio/test-u16-vasnprintf2.sh.log: unistdio/test-u16-vasnprintf2.sh
+	@p='unistdio/test-u16-vasnprintf2.sh'; \
+	b='unistdio/test-u16-vasnprintf2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unistdio/test-u16-vasnprintf3.sh.log: unistdio/test-u16-vasnprintf3.sh
+	@p='unistdio/test-u16-vasnprintf3.sh'; \
+	b='unistdio/test-u16-vasnprintf3.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-vasprintf1.log: test-u16-vasprintf1$(EXEEXT)
+	@p='test-u16-vasprintf1$(EXEEXT)'; \
+	b='test-u16-vasprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-vsnprintf1.log: test-u16-vsnprintf1$(EXEEXT)
+	@p='test-u16-vsnprintf1$(EXEEXT)'; \
+	b='test-u16-vsnprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-vsprintf1.log: test-u16-vsprintf1$(EXEEXT)
+	@p='test-u16-vsprintf1$(EXEEXT)'; \
+	b='test-u16-vsprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-asnprintf1.log: test-u32-asnprintf1$(EXEEXT)
+	@p='test-u32-asnprintf1$(EXEEXT)'; \
+	b='test-u32-asnprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-vasnprintf1.log: test-u32-vasnprintf1$(EXEEXT)
+	@p='test-u32-vasnprintf1$(EXEEXT)'; \
+	b='test-u32-vasnprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unistdio/test-u32-vasnprintf2.sh.log: unistdio/test-u32-vasnprintf2.sh
+	@p='unistdio/test-u32-vasnprintf2.sh'; \
+	b='unistdio/test-u32-vasnprintf2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unistdio/test-u32-vasnprintf3.sh.log: unistdio/test-u32-vasnprintf3.sh
+	@p='unistdio/test-u32-vasnprintf3.sh'; \
+	b='unistdio/test-u32-vasnprintf3.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-vasprintf1.log: test-u32-vasprintf1$(EXEEXT)
+	@p='test-u32-vasprintf1$(EXEEXT)'; \
+	b='test-u32-vasprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-vsnprintf1.log: test-u32-vsnprintf1$(EXEEXT)
+	@p='test-u32-vsnprintf1$(EXEEXT)'; \
+	b='test-u32-vsnprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-vsprintf1.log: test-u32-vsprintf1$(EXEEXT)
+	@p='test-u32-vsprintf1$(EXEEXT)'; \
+	b='test-u32-vsprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-asnprintf1.log: test-u8-asnprintf1$(EXEEXT)
+	@p='test-u8-asnprintf1$(EXEEXT)'; \
+	b='test-u8-asnprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-vasnprintf1.log: test-u8-vasnprintf1$(EXEEXT)
+	@p='test-u8-vasnprintf1$(EXEEXT)'; \
+	b='test-u8-vasnprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unistdio/test-u8-vasnprintf2.sh.log: unistdio/test-u8-vasnprintf2.sh
+	@p='unistdio/test-u8-vasnprintf2.sh'; \
+	b='unistdio/test-u8-vasnprintf2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unistdio/test-u8-vasnprintf3.sh.log: unistdio/test-u8-vasnprintf3.sh
+	@p='unistdio/test-u8-vasnprintf3.sh'; \
+	b='unistdio/test-u8-vasnprintf3.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-vasprintf1.log: test-u8-vasprintf1$(EXEEXT)
+	@p='test-u8-vasprintf1$(EXEEXT)'; \
+	b='test-u8-vasprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-vsnprintf1.log: test-u8-vsnprintf1$(EXEEXT)
+	@p='test-u8-vsnprintf1$(EXEEXT)'; \
+	b='test-u8-vsnprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-vsprintf1.log: test-u8-vsprintf1$(EXEEXT)
+	@p='test-u8-vsprintf1$(EXEEXT)'; \
+	b='test-u8-vsprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ulc-asnprintf1.log: test-ulc-asnprintf1$(EXEEXT)
+	@p='test-ulc-asnprintf1$(EXEEXT)'; \
+	b='test-ulc-asnprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ulc-vasnprintf1.log: test-ulc-vasnprintf1$(EXEEXT)
+	@p='test-ulc-vasnprintf1$(EXEEXT)'; \
+	b='test-ulc-vasnprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unistdio/test-ulc-vasnprintf2.sh.log: unistdio/test-ulc-vasnprintf2.sh
+	@p='unistdio/test-ulc-vasnprintf2.sh'; \
+	b='unistdio/test-ulc-vasnprintf2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+unistdio/test-ulc-vasnprintf3.sh.log: unistdio/test-ulc-vasnprintf3.sh
+	@p='unistdio/test-ulc-vasnprintf3.sh'; \
+	b='unistdio/test-ulc-vasnprintf3.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ulc-vasprintf1.log: test-ulc-vasprintf1$(EXEEXT)
+	@p='test-ulc-vasprintf1$(EXEEXT)'; \
+	b='test-ulc-vasprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ulc-vsnprintf1.log: test-ulc-vsnprintf1$(EXEEXT)
+	@p='test-ulc-vsnprintf1$(EXEEXT)'; \
+	b='test-ulc-vsnprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ulc-vsprintf1.log: test-ulc-vsprintf1$(EXEEXT)
+	@p='test-ulc-vsprintf1$(EXEEXT)'; \
+	b='test-ulc-vsprintf1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-check.log: test-u16-check$(EXEEXT)
+	@p='test-u16-check$(EXEEXT)'; \
+	b='test-u16-check'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-chr.log: test-u16-chr$(EXEEXT)
+	@p='test-u16-chr$(EXEEXT)'; \
+	b='test-u16-chr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-cmp.log: test-u16-cmp$(EXEEXT)
+	@p='test-u16-cmp$(EXEEXT)'; \
+	b='test-u16-cmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-cmp2.log: test-u16-cmp2$(EXEEXT)
+	@p='test-u16-cmp2$(EXEEXT)'; \
+	b='test-u16-cmp2'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-cpy-alloc.log: test-u16-cpy-alloc$(EXEEXT)
+	@p='test-u16-cpy-alloc$(EXEEXT)'; \
+	b='test-u16-cpy-alloc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-cpy.log: test-u16-cpy$(EXEEXT)
+	@p='test-u16-cpy$(EXEEXT)'; \
+	b='test-u16-cpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-mblen.log: test-u16-mblen$(EXEEXT)
+	@p='test-u16-mblen$(EXEEXT)'; \
+	b='test-u16-mblen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-mbsnlen.log: test-u16-mbsnlen$(EXEEXT)
+	@p='test-u16-mbsnlen$(EXEEXT)'; \
+	b='test-u16-mbsnlen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-mbtouc.log: test-u16-mbtouc$(EXEEXT)
+	@p='test-u16-mbtouc$(EXEEXT)'; \
+	b='test-u16-mbtouc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-mbtouc-unsafe.log: test-u16-mbtouc-unsafe$(EXEEXT)
+	@p='test-u16-mbtouc-unsafe$(EXEEXT)'; \
+	b='test-u16-mbtouc-unsafe'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-mbtoucr.log: test-u16-mbtoucr$(EXEEXT)
+	@p='test-u16-mbtoucr$(EXEEXT)'; \
+	b='test-u16-mbtoucr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-move.log: test-u16-move$(EXEEXT)
+	@p='test-u16-move$(EXEEXT)'; \
+	b='test-u16-move'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-next.log: test-u16-next$(EXEEXT)
+	@p='test-u16-next$(EXEEXT)'; \
+	b='test-u16-next'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-prev.log: test-u16-prev$(EXEEXT)
+	@p='test-u16-prev$(EXEEXT)'; \
+	b='test-u16-prev'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-set.log: test-u16-set$(EXEEXT)
+	@p='test-u16-set$(EXEEXT)'; \
+	b='test-u16-set'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-stpcpy.log: test-u16-stpcpy$(EXEEXT)
+	@p='test-u16-stpcpy$(EXEEXT)'; \
+	b='test-u16-stpcpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-stpncpy.log: test-u16-stpncpy$(EXEEXT)
+	@p='test-u16-stpncpy$(EXEEXT)'; \
+	b='test-u16-stpncpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strcat.log: test-u16-strcat$(EXEEXT)
+	@p='test-u16-strcat$(EXEEXT)'; \
+	b='test-u16-strcat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strchr.log: test-u16-strchr$(EXEEXT)
+	@p='test-u16-strchr$(EXEEXT)'; \
+	b='test-u16-strchr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strcmp.log: test-u16-strcmp$(EXEEXT)
+	@p='test-u16-strcmp$(EXEEXT)'; \
+	b='test-u16-strcmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strcoll.log: test-u16-strcoll$(EXEEXT)
+	@p='test-u16-strcoll$(EXEEXT)'; \
+	b='test-u16-strcoll'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strcpy.log: test-u16-strcpy$(EXEEXT)
+	@p='test-u16-strcpy$(EXEEXT)'; \
+	b='test-u16-strcpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strdup.log: test-u16-strdup$(EXEEXT)
+	@p='test-u16-strdup$(EXEEXT)'; \
+	b='test-u16-strdup'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strlen.log: test-u16-strlen$(EXEEXT)
+	@p='test-u16-strlen$(EXEEXT)'; \
+	b='test-u16-strlen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strmblen.log: test-u16-strmblen$(EXEEXT)
+	@p='test-u16-strmblen$(EXEEXT)'; \
+	b='test-u16-strmblen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strmbtouc.log: test-u16-strmbtouc$(EXEEXT)
+	@p='test-u16-strmbtouc$(EXEEXT)'; \
+	b='test-u16-strmbtouc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strncat.log: test-u16-strncat$(EXEEXT)
+	@p='test-u16-strncat$(EXEEXT)'; \
+	b='test-u16-strncat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strncmp.log: test-u16-strncmp$(EXEEXT)
+	@p='test-u16-strncmp$(EXEEXT)'; \
+	b='test-u16-strncmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strncpy.log: test-u16-strncpy$(EXEEXT)
+	@p='test-u16-strncpy$(EXEEXT)'; \
+	b='test-u16-strncpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strnlen.log: test-u16-strnlen$(EXEEXT)
+	@p='test-u16-strnlen$(EXEEXT)'; \
+	b='test-u16-strnlen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strstr.log: test-u16-strstr$(EXEEXT)
+	@p='test-u16-strstr$(EXEEXT)'; \
+	b='test-u16-strstr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strtok.log: test-u16-strtok$(EXEEXT)
+	@p='test-u16-strtok$(EXEEXT)'; \
+	b='test-u16-strtok'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-to-u32.log: test-u16-to-u32$(EXEEXT)
+	@p='test-u16-to-u32$(EXEEXT)'; \
+	b='test-u16-to-u32'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-to-u8.log: test-u16-to-u8$(EXEEXT)
+	@p='test-u16-to-u8$(EXEEXT)'; \
+	b='test-u16-to-u8'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-uctomb.log: test-u16-uctomb$(EXEEXT)
+	@p='test-u16-uctomb$(EXEEXT)'; \
+	b='test-u16-uctomb'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-check.log: test-u32-check$(EXEEXT)
+	@p='test-u32-check$(EXEEXT)'; \
+	b='test-u32-check'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-chr.log: test-u32-chr$(EXEEXT)
+	@p='test-u32-chr$(EXEEXT)'; \
+	b='test-u32-chr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-cmp.log: test-u32-cmp$(EXEEXT)
+	@p='test-u32-cmp$(EXEEXT)'; \
+	b='test-u32-cmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-cmp2.log: test-u32-cmp2$(EXEEXT)
+	@p='test-u32-cmp2$(EXEEXT)'; \
+	b='test-u32-cmp2'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-cpy-alloc.log: test-u32-cpy-alloc$(EXEEXT)
+	@p='test-u32-cpy-alloc$(EXEEXT)'; \
+	b='test-u32-cpy-alloc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-cpy.log: test-u32-cpy$(EXEEXT)
+	@p='test-u32-cpy$(EXEEXT)'; \
+	b='test-u32-cpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-mblen.log: test-u32-mblen$(EXEEXT)
+	@p='test-u32-mblen$(EXEEXT)'; \
+	b='test-u32-mblen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-mbsnlen.log: test-u32-mbsnlen$(EXEEXT)
+	@p='test-u32-mbsnlen$(EXEEXT)'; \
+	b='test-u32-mbsnlen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-mbtouc.log: test-u32-mbtouc$(EXEEXT)
+	@p='test-u32-mbtouc$(EXEEXT)'; \
+	b='test-u32-mbtouc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-mbtouc-unsafe.log: test-u32-mbtouc-unsafe$(EXEEXT)
+	@p='test-u32-mbtouc-unsafe$(EXEEXT)'; \
+	b='test-u32-mbtouc-unsafe'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-mbtoucr.log: test-u32-mbtoucr$(EXEEXT)
+	@p='test-u32-mbtoucr$(EXEEXT)'; \
+	b='test-u32-mbtoucr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-move.log: test-u32-move$(EXEEXT)
+	@p='test-u32-move$(EXEEXT)'; \
+	b='test-u32-move'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-next.log: test-u32-next$(EXEEXT)
+	@p='test-u32-next$(EXEEXT)'; \
+	b='test-u32-next'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-prev.log: test-u32-prev$(EXEEXT)
+	@p='test-u32-prev$(EXEEXT)'; \
+	b='test-u32-prev'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-set.log: test-u32-set$(EXEEXT)
+	@p='test-u32-set$(EXEEXT)'; \
+	b='test-u32-set'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-stpcpy.log: test-u32-stpcpy$(EXEEXT)
+	@p='test-u32-stpcpy$(EXEEXT)'; \
+	b='test-u32-stpcpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-stpncpy.log: test-u32-stpncpy$(EXEEXT)
+	@p='test-u32-stpncpy$(EXEEXT)'; \
+	b='test-u32-stpncpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strcat.log: test-u32-strcat$(EXEEXT)
+	@p='test-u32-strcat$(EXEEXT)'; \
+	b='test-u32-strcat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strchr.log: test-u32-strchr$(EXEEXT)
+	@p='test-u32-strchr$(EXEEXT)'; \
+	b='test-u32-strchr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strcmp.log: test-u32-strcmp$(EXEEXT)
+	@p='test-u32-strcmp$(EXEEXT)'; \
+	b='test-u32-strcmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strcoll.log: test-u32-strcoll$(EXEEXT)
+	@p='test-u32-strcoll$(EXEEXT)'; \
+	b='test-u32-strcoll'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strcpy.log: test-u32-strcpy$(EXEEXT)
+	@p='test-u32-strcpy$(EXEEXT)'; \
+	b='test-u32-strcpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strdup.log: test-u32-strdup$(EXEEXT)
+	@p='test-u32-strdup$(EXEEXT)'; \
+	b='test-u32-strdup'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strlen.log: test-u32-strlen$(EXEEXT)
+	@p='test-u32-strlen$(EXEEXT)'; \
+	b='test-u32-strlen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strmblen.log: test-u32-strmblen$(EXEEXT)
+	@p='test-u32-strmblen$(EXEEXT)'; \
+	b='test-u32-strmblen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strmbtouc.log: test-u32-strmbtouc$(EXEEXT)
+	@p='test-u32-strmbtouc$(EXEEXT)'; \
+	b='test-u32-strmbtouc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strncat.log: test-u32-strncat$(EXEEXT)
+	@p='test-u32-strncat$(EXEEXT)'; \
+	b='test-u32-strncat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strncmp.log: test-u32-strncmp$(EXEEXT)
+	@p='test-u32-strncmp$(EXEEXT)'; \
+	b='test-u32-strncmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strncpy.log: test-u32-strncpy$(EXEEXT)
+	@p='test-u32-strncpy$(EXEEXT)'; \
+	b='test-u32-strncpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strnlen.log: test-u32-strnlen$(EXEEXT)
+	@p='test-u32-strnlen$(EXEEXT)'; \
+	b='test-u32-strnlen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strstr.log: test-u32-strstr$(EXEEXT)
+	@p='test-u32-strstr$(EXEEXT)'; \
+	b='test-u32-strstr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strtok.log: test-u32-strtok$(EXEEXT)
+	@p='test-u32-strtok$(EXEEXT)'; \
+	b='test-u32-strtok'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-to-u16.log: test-u32-to-u16$(EXEEXT)
+	@p='test-u32-to-u16$(EXEEXT)'; \
+	b='test-u32-to-u16'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-to-u8.log: test-u32-to-u8$(EXEEXT)
+	@p='test-u32-to-u8$(EXEEXT)'; \
+	b='test-u32-to-u8'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-uctomb.log: test-u32-uctomb$(EXEEXT)
+	@p='test-u32-uctomb$(EXEEXT)'; \
+	b='test-u32-uctomb'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-check.log: test-u8-check$(EXEEXT)
+	@p='test-u8-check$(EXEEXT)'; \
+	b='test-u8-check'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-chr.log: test-u8-chr$(EXEEXT)
+	@p='test-u8-chr$(EXEEXT)'; \
+	b='test-u8-chr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-cmp.log: test-u8-cmp$(EXEEXT)
+	@p='test-u8-cmp$(EXEEXT)'; \
+	b='test-u8-cmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-cmp2.log: test-u8-cmp2$(EXEEXT)
+	@p='test-u8-cmp2$(EXEEXT)'; \
+	b='test-u8-cmp2'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-cpy-alloc.log: test-u8-cpy-alloc$(EXEEXT)
+	@p='test-u8-cpy-alloc$(EXEEXT)'; \
+	b='test-u8-cpy-alloc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-cpy.log: test-u8-cpy$(EXEEXT)
+	@p='test-u8-cpy$(EXEEXT)'; \
+	b='test-u8-cpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-mblen.log: test-u8-mblen$(EXEEXT)
+	@p='test-u8-mblen$(EXEEXT)'; \
+	b='test-u8-mblen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-mbsnlen.log: test-u8-mbsnlen$(EXEEXT)
+	@p='test-u8-mbsnlen$(EXEEXT)'; \
+	b='test-u8-mbsnlen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-mbtouc.log: test-u8-mbtouc$(EXEEXT)
+	@p='test-u8-mbtouc$(EXEEXT)'; \
+	b='test-u8-mbtouc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-mbtouc-unsafe.log: test-u8-mbtouc-unsafe$(EXEEXT)
+	@p='test-u8-mbtouc-unsafe$(EXEEXT)'; \
+	b='test-u8-mbtouc-unsafe'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-mbtoucr.log: test-u8-mbtoucr$(EXEEXT)
+	@p='test-u8-mbtoucr$(EXEEXT)'; \
+	b='test-u8-mbtoucr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-move.log: test-u8-move$(EXEEXT)
+	@p='test-u8-move$(EXEEXT)'; \
+	b='test-u8-move'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-next.log: test-u8-next$(EXEEXT)
+	@p='test-u8-next$(EXEEXT)'; \
+	b='test-u8-next'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-prev.log: test-u8-prev$(EXEEXT)
+	@p='test-u8-prev$(EXEEXT)'; \
+	b='test-u8-prev'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-set.log: test-u8-set$(EXEEXT)
+	@p='test-u8-set$(EXEEXT)'; \
+	b='test-u8-set'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-stpcpy.log: test-u8-stpcpy$(EXEEXT)
+	@p='test-u8-stpcpy$(EXEEXT)'; \
+	b='test-u8-stpcpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-stpncpy.log: test-u8-stpncpy$(EXEEXT)
+	@p='test-u8-stpncpy$(EXEEXT)'; \
+	b='test-u8-stpncpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strcat.log: test-u8-strcat$(EXEEXT)
+	@p='test-u8-strcat$(EXEEXT)'; \
+	b='test-u8-strcat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strchr.log: test-u8-strchr$(EXEEXT)
+	@p='test-u8-strchr$(EXEEXT)'; \
+	b='test-u8-strchr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strcmp.log: test-u8-strcmp$(EXEEXT)
+	@p='test-u8-strcmp$(EXEEXT)'; \
+	b='test-u8-strcmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strcoll.log: test-u8-strcoll$(EXEEXT)
+	@p='test-u8-strcoll$(EXEEXT)'; \
+	b='test-u8-strcoll'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strcpy.log: test-u8-strcpy$(EXEEXT)
+	@p='test-u8-strcpy$(EXEEXT)'; \
+	b='test-u8-strcpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strdup.log: test-u8-strdup$(EXEEXT)
+	@p='test-u8-strdup$(EXEEXT)'; \
+	b='test-u8-strdup'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strlen.log: test-u8-strlen$(EXEEXT)
+	@p='test-u8-strlen$(EXEEXT)'; \
+	b='test-u8-strlen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strmblen.log: test-u8-strmblen$(EXEEXT)
+	@p='test-u8-strmblen$(EXEEXT)'; \
+	b='test-u8-strmblen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strmbtouc.log: test-u8-strmbtouc$(EXEEXT)
+	@p='test-u8-strmbtouc$(EXEEXT)'; \
+	b='test-u8-strmbtouc'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strncat.log: test-u8-strncat$(EXEEXT)
+	@p='test-u8-strncat$(EXEEXT)'; \
+	b='test-u8-strncat'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strncmp.log: test-u8-strncmp$(EXEEXT)
+	@p='test-u8-strncmp$(EXEEXT)'; \
+	b='test-u8-strncmp'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strncpy.log: test-u8-strncpy$(EXEEXT)
+	@p='test-u8-strncpy$(EXEEXT)'; \
+	b='test-u8-strncpy'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strnlen.log: test-u8-strnlen$(EXEEXT)
+	@p='test-u8-strnlen$(EXEEXT)'; \
+	b='test-u8-strnlen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strstr.log: test-u8-strstr$(EXEEXT)
+	@p='test-u8-strstr$(EXEEXT)'; \
+	b='test-u8-strstr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strtok.log: test-u8-strtok$(EXEEXT)
+	@p='test-u8-strtok$(EXEEXT)'; \
+	b='test-u8-strtok'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-to-u16.log: test-u8-to-u16$(EXEEXT)
+	@p='test-u8-to-u16$(EXEEXT)'; \
+	b='test-u8-to-u16'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-to-u32.log: test-u8-to-u32$(EXEEXT)
+	@p='test-u8-to-u32$(EXEEXT)'; \
+	b='test-u8-to-u32'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-uctomb.log: test-u8-uctomb$(EXEEXT)
+	@p='test-u8-uctomb$(EXEEXT)'; \
+	b='test-u8-uctomb'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-wordbreaks.log: test-u16-wordbreaks$(EXEEXT)
+	@p='test-u16-wordbreaks$(EXEEXT)'; \
+	b='test-u16-wordbreaks'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-wordbreaks.log: test-u32-wordbreaks$(EXEEXT)
+	@p='test-u32-wordbreaks$(EXEEXT)'; \
+	b='test-u32-wordbreaks'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+uniwbrk/test-uc-wordbreaks.sh.log: uniwbrk/test-uc-wordbreaks.sh
+	@p='uniwbrk/test-uc-wordbreaks.sh'; \
+	b='uniwbrk/test-uc-wordbreaks.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-wordbreaks.log: test-u8-wordbreaks$(EXEEXT)
+	@p='test-u8-wordbreaks$(EXEEXT)'; \
+	b='test-u8-wordbreaks'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+uniwbrk/test-ulc-wordbreaks.sh.log: uniwbrk/test-ulc-wordbreaks.sh
+	@p='uniwbrk/test-ulc-wordbreaks.sh'; \
+	b='uniwbrk/test-ulc-wordbreaks.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-strwidth.log: test-u16-strwidth$(EXEEXT)
+	@p='test-u16-strwidth$(EXEEXT)'; \
+	b='test-u16-strwidth'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u16-width.log: test-u16-width$(EXEEXT)
+	@p='test-u16-width$(EXEEXT)'; \
+	b='test-u16-width'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-strwidth.log: test-u32-strwidth$(EXEEXT)
+	@p='test-u32-strwidth$(EXEEXT)'; \
+	b='test-u32-strwidth'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u32-width.log: test-u32-width$(EXEEXT)
+	@p='test-u32-width$(EXEEXT)'; \
+	b='test-u32-width'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-strwidth.log: test-u8-strwidth$(EXEEXT)
+	@p='test-u8-strwidth$(EXEEXT)'; \
+	b='test-u8-strwidth'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-u8-width.log: test-u8-width$(EXEEXT)
+	@p='test-u8-width$(EXEEXT)'; \
+	b='test-u8-width'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-uc_width.log: test-uc_width$(EXEEXT)
+	@p='test-uc_width$(EXEEXT)'; \
+	b='test-uc_width'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+uniwidth/test-uc_width2.sh.log: uniwidth/test-uc_width2.sh
+	@p='uniwidth/test-uc_width2.sh'; \
+	b='uniwidth/test-uc_width2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-unsetenv.log: test-unsetenv$(EXEEXT)
+	@p='test-unsetenv$(EXEEXT)'; \
+	b='test-unsetenv'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-verify.log: test-verify$(EXEEXT)
+	@p='test-verify$(EXEEXT)'; \
+	b='test-verify'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-verify.sh.log: test-verify.sh
+	@p='test-verify.sh'; \
+	b='test-verify.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-wchar.log: test-wchar$(EXEEXT)
+	@p='test-wchar$(EXEEXT)'; \
+	b='test-wchar'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-wcrtomb.sh.log: test-wcrtomb.sh
+	@p='test-wcrtomb.sh'; \
+	b='test-wcrtomb.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-wcrtomb-w32-1.sh.log: test-wcrtomb-w32-1.sh
+	@p='test-wcrtomb-w32-1.sh'; \
+	b='test-wcrtomb-w32-1.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-wcrtomb-w32-2.sh.log: test-wcrtomb-w32-2.sh
+	@p='test-wcrtomb-w32-2.sh'; \
+	b='test-wcrtomb-w32-2.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-wcrtomb-w32-3.sh.log: test-wcrtomb-w32-3.sh
+	@p='test-wcrtomb-w32-3.sh'; \
+	b='test-wcrtomb-w32-3.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-wcrtomb-w32-4.sh.log: test-wcrtomb-w32-4.sh
+	@p='test-wcrtomb-w32-4.sh'; \
+	b='test-wcrtomb-w32-4.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-wcrtomb-w32-5.sh.log: test-wcrtomb-w32-5.sh
+	@p='test-wcrtomb-w32-5.sh'; \
+	b='test-wcrtomb-w32-5.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-wctype-h.log: test-wctype-h$(EXEEXT)
+	@p='test-wctype-h$(EXEEXT)'; \
+	b='test-wctype-h'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-wcwidth.log: test-wcwidth$(EXEEXT)
+	@p='test-wcwidth$(EXEEXT)'; \
+	b='test-wcwidth'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-xalloc-die.sh.log: test-xalloc-die.sh
+	@p='test-xalloc-die.sh'; \
+	b='test-xalloc-die.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -8325,13 +13410,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -8370,12 +13452,20 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -8391,6 +13481,8 @@ distclean-generic:
 	-rm -f uniconv/$(am__dirstamp)
 	-rm -f unictype/$(DEPDIR)/$(am__dirstamp)
 	-rm -f unictype/$(am__dirstamp)
+	-rm -f unigbrk/$(DEPDIR)/$(am__dirstamp)
+	-rm -f unigbrk/$(am__dirstamp)
 	-rm -f unilbrk/$(DEPDIR)/$(am__dirstamp)
 	-rm -f unilbrk/$(am__dirstamp)
 	-rm -f uniname/$(DEPDIR)/$(am__dirstamp)
@@ -8419,7 +13511,7 @@ clean-am: clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \
 	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR) glthread/$(DEPDIR) unicase/$(DEPDIR) uniconv/$(DEPDIR) unictype/$(DEPDIR) unilbrk/$(DEPDIR) uniname/$(DEPDIR) uninorm/$(DEPDIR) unistdio/$(DEPDIR) unistr/$(DEPDIR) uniwbrk/$(DEPDIR) uniwidth/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) glthread/$(DEPDIR) unicase/$(DEPDIR) uniconv/$(DEPDIR) unictype/$(DEPDIR) unigbrk/$(DEPDIR) unilbrk/$(DEPDIR) uniname/$(DEPDIR) uninorm/$(DEPDIR) unistdio/$(DEPDIR) unistr/$(DEPDIR) uniwbrk/$(DEPDIR) uniwidth/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -8465,7 +13557,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR) glthread/$(DEPDIR) unicase/$(DEPDIR) uniconv/$(DEPDIR) unictype/$(DEPDIR) unilbrk/$(DEPDIR) uniname/$(DEPDIR) uninorm/$(DEPDIR) unistdio/$(DEPDIR) unistr/$(DEPDIR) uniwbrk/$(DEPDIR) uniwidth/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) glthread/$(DEPDIR) unicase/$(DEPDIR) uniconv/$(DEPDIR) unictype/$(DEPDIR) unigbrk/$(DEPDIR) unilbrk/$(DEPDIR) uniname/$(DEPDIR) uninorm/$(DEPDIR) unistdio/$(DEPDIR) unistr/$(DEPDIR) uniwbrk/$(DEPDIR) uniwidth/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -8484,80 +13576,255 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-	check-am ctags-recursive install install-am install-strip \
-	tags-recursive
+.MAKE: $(am__recursive_targets) all check check-am install install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-TESTS check-am clean \
-	clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \
-	clean-libtool clean-local clean-noinstLIBRARIES \
-	clean-noinstPROGRAMS ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am 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 installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
-	tags-recursive uninstall uninstall-am
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-TESTS check-am clean clean-checkLIBRARIES \
+	clean-checkPROGRAMS clean-generic clean-libtool clean-local \
+	clean-noinstLIBRARIES clean-noinstPROGRAMS cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am 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 installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am
 
-# The arg-nonnull.h that gets inserted into generated .h files is the same as
-# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
-arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/build-aux/arg-nonnull.h \
-	  > $@-t && \
-	mv $@-t $@
-# The c++defs.h that gets inserted into generated .h files is the same as
-# build-aux/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/build-aux/c++defs.h
+.PRECIOUS: Makefile
+
+
+# We need the following in order to create <inttypes.h> when the system
+# doesn't have one that works with the given compiler.
+inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
-	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/build-aux/c++defs.h \
-	  > $@-t && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \
+	      -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
+	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
+	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
+	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
+	      -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \
+	      -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \
+	      -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \
+	      -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \
+	      -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \
+	      -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \
+	      -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
+	      -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
+	      -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
+	      -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
+	      -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
+	      -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
+	      -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
+	      -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
+	      -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      < $(srcdir)/inttypes.in.h; \
+	} > $@-t && \
 	mv $@-t $@
 
 # We need the following in order to create <locale.h> when the system
 # doesn't have one that provides all definitions.
-locale.h: locale.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
-	      -e 's|@''GNULIB_DUPLOCALE''@|$(GNULIB_DUPLOCALE)|g' \
+	      -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \
+	      -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \
+	      -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \
 	      -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
 	      -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
+	      -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \
+	      -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
 	      -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
+	      -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/locale.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-# The unused-parameter.h that gets inserted into generated .h files is the same
-# as build-aux/unused-parameter.h, except that it has the copyright header cut
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
 # off.
-unused-parameter.h: $(top_srcdir)/build-aux/unused-parameter.h
+arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_ARG_NONNULL/,$$p' \
+	  < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \
+	  > $@-t && \
+	mv $@-t $@
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/_GL_CXXDEFS/,$$p' \
+	  < $(top_srcdir)/build-aux/snippet/c++defs.h \
+	  > $@-t && \
+	mv $@-t $@
+# The unused-parameter.h that gets inserted into generated .h files is the same
+# as build-aux/snippet/unused-parameter.h, except that it has the copyright
+# header cut off.
+unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
-	  < $(top_srcdir)/build-aux/unused-parameter.h \
+	  < $(top_srcdir)/build-aux/snippet/unused-parameter.h \
 	  > $@-t && \
 	mv $@-t $@
 # The warn-on-use.h that gets inserted into generated .h files is the same as
-# build-aux/warn-on-use.h, except that it has the copyright header cut off.
-warn-on-use.h: $(top_srcdir)/build-aux/warn-on-use.h
+# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
+# off.
+warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/build-aux/warn-on-use.h \
+	  < $(top_srcdir)/build-aux/snippet/warn-on-use.h \
 	  > $@-t && \
 	mv $@-t $@
 
+# We need the following in order to create <stdalign.h> when the system
+# doesn't have one that works.
+@GL_GENERATE_STDALIGN_H_TRUE@stdalign.h: stdalign.in.h $(top_builddir)/config.status
+@GL_GENERATE_STDALIGN_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
+@GL_GENERATE_STDALIGN_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+@GL_GENERATE_STDALIGN_H_TRUE@	  cat $(srcdir)/stdalign.in.h; \
+@GL_GENERATE_STDALIGN_H_TRUE@	} > $@-t && \
+@GL_GENERATE_STDALIGN_H_TRUE@	mv $@-t $@
+@GL_GENERATE_STDALIGN_H_FALSE@stdalign.h: $(top_builddir)/config.status
+@GL_GENERATE_STDALIGN_H_FALSE@	rm -f $@
+
+# We need the following in order to create <stdio.h> when the system
+# doesn't have one that works with the given compiler.
+stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
+	      -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \
+	      -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \
+	      -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \
+	      -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \
+	      -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \
+	      -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \
+	      -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \
+	      -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \
+	      -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \
+	      -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \
+	      -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \
+	      -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \
+	      -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \
+	      -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \
+	      -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \
+	      -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \
+	      -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \
+	      -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \
+	      -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \
+	      -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \
+	      -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \
+	      -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \
+	      -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \
+	      -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \
+	      -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
+	      -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
+	      -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
+	      -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \
+	      -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \
+	      -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \
+	      -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \
+	      -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \
+	      -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \
+	      -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \
+	      -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \
+	      -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \
+	      -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \
+	      -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \
+	      -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \
+	      -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \
+	      -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \
+	      -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \
+	      -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \
+	      -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \
+	      -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \
+	      -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \
+	      -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \
+	      -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \
+	      -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \
+	      -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \
+	      -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \
+	      -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \
+	      -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \
+	      < $(srcdir)/stdio.in.h | \
+	  sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
+	      -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
+	      -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \
+	      -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
+	      -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
+	      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
+	      -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \
+	      -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \
+	      -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
+	      -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \
+	      -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \
+	      -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \
+	      -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \
+	      -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
+	      -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
+	      -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
+	      -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
+	      -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
+	      -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \
+	      -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
+	      -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
+	      -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
+	      -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \
+	      -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \
+	      -e 's|@''REPLACE_FSEEK''@|$(REPLACE_FSEEK)|g' \
+	      -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \
+	      -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \
+	      -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \
+	      -e 's|@''REPLACE_GETDELIM''@|$(REPLACE_GETDELIM)|g' \
+	      -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \
+	      -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \
+	      -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \
+	      -e 's|@''REPLACE_POPEN''@|$(REPLACE_POPEN)|g' \
+	      -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \
+	      -e 's|@''REPLACE_REMOVE''@|$(REPLACE_REMOVE)|g' \
+	      -e 's|@''REPLACE_RENAME''@|$(REPLACE_RENAME)|g' \
+	      -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \
+	      -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
+	      -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
+	      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \
+	      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
+	      -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \
+	      -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
+	      -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \
+	      -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \
+	      -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \
+	      -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \
+	      -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
+	      -e 's|@''ASM_SYMBOL_PREFIX''@|$(ASM_SYMBOL_PREFIX)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	} > $@-t && \
+	mv $@-t $@
+
 # Clean up after Solaris cc.
 clean-local:
 	rm -rf SunWS_cache