Imported Upstream version 2.3.1
[platform/upstream/harfbuzz.git] / test / api / Makefile.in
index c08ad51..b317eb5 100644 (file)
@@ -95,14 +95,10 @@ host_triplet = @host@
 @HAVE_GLIB_TRUE@noinst_PROGRAMS = $(am__EXEEXT_4)
 @HAVE_GLIB_TRUE@@HAVE_ICU_TRUE@am__append_2 = $(ICU_CFLAGS)
 @HAVE_GLIB_TRUE@@HAVE_ICU_TRUE@am__append_3 = $(top_builddir)/src/libharfbuzz-icu.la $(ICU_LIBS)
-@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@am__append_4 = \
-@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@ test-ot-color \
-@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@ test-ot-tag \
-@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@ $(NULL)
-
-@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@am__append_5 = \
-@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@     test-ot-math \
-@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@     $(NULL)
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_PTHREAD_TRUE@am__append_4 = test-multithread
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@am__append_5 = \
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@   test-ot-math \
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@   $(NULL)
 
 @HAVE_GLIB_TRUE@@HAVE_ICU_TRUE@am__append_6 = $(ICU_CFLAGS)
 @HAVE_GLIB_TRUE@@HAVE_ICU_TRUE@am__append_7 = $(ICU_CFLAGS)
@@ -111,7 +107,8 @@ host_triplet = @host@
 @HAVE_GLIB_TRUE@TESTS = $(am__EXEEXT_4)
 #      Can't do for now: --show-reachable=yes
 @HAVE_GLIB_TRUE@am__append_10 = log-valgrind.txt symbols-tested.txt \
-@HAVE_GLIB_TRUE@       symbols-exported.txt symbols-untested.txt
+@HAVE_GLIB_TRUE@       symbols-exported.txt symbols-untested.txt \
+@HAVE_GLIB_TRUE@       symbols-tested-or-deprecated.txt
 subdir = test/api
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_link_flag.m4 \
@@ -119,8 +116,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_link_flag.m4 \
        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/gtk-doc.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
-       $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -129,16 +125,18 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__EXEEXT_1 =
-@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@am__EXEEXT_2 = test-ot-color$(EXEEXT) \
-@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@ test-ot-tag$(EXEEXT) \
-@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@ $(am__EXEEXT_1)
-@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@am__EXEEXT_3 = test-ot-math$(EXEEXT) \
-@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@     $(am__EXEEXT_1)
-@HAVE_GLIB_TRUE@am__EXEEXT_4 = test-blob$(EXEEXT) test-buffer$(EXEEXT) \
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_PTHREAD_TRUE@am__EXEEXT_2 = test-multithread$(EXEEXT)
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@am__EXEEXT_3 =  \
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@   test-ot-math$(EXEEXT) \
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@   $(am__EXEEXT_1)
+@HAVE_GLIB_TRUE@am__EXEEXT_4 = test-aat-layout$(EXEEXT) \
+@HAVE_GLIB_TRUE@       test-baseline$(EXEEXT) test-blob$(EXEEXT) \
+@HAVE_GLIB_TRUE@       test-buffer$(EXEEXT) \
+@HAVE_GLIB_TRUE@       test-collect-unicodes$(EXEEXT) \
 @HAVE_GLIB_TRUE@       test-common$(EXEEXT) test-font$(EXEEXT) \
-@HAVE_GLIB_TRUE@       test-object$(EXEEXT) test-set$(EXEEXT) \
+@HAVE_GLIB_TRUE@       test-map$(EXEEXT) test-object$(EXEEXT) \
+@HAVE_GLIB_TRUE@       test-ot-face$(EXEEXT) test-set$(EXEEXT) \
 @HAVE_GLIB_TRUE@       test-shape$(EXEEXT) test-subset$(EXEEXT) \
-@HAVE_GLIB_TRUE@       test-subset-codepoints$(EXEEXT) \
 @HAVE_GLIB_TRUE@       test-subset-cmap$(EXEEXT) \
 @HAVE_GLIB_TRUE@       test-subset-glyf$(EXEEXT) \
 @HAVE_GLIB_TRUE@       test-subset-hdmx$(EXEEXT) \
@@ -146,22 +144,40 @@ am__EXEEXT_1 =
 @HAVE_GLIB_TRUE@       test-subset-os2$(EXEEXT) \
 @HAVE_GLIB_TRUE@       test-subset-post$(EXEEXT) \
 @HAVE_GLIB_TRUE@       test-subset-vmtx$(EXEEXT) \
+@HAVE_GLIB_TRUE@       test-subset-cff1$(EXEEXT) \
+@HAVE_GLIB_TRUE@       test-subset-cff2$(EXEEXT) \
 @HAVE_GLIB_TRUE@       test-unicode$(EXEEXT) test-version$(EXEEXT) \
-@HAVE_GLIB_TRUE@       $(am__EXEEXT_1) $(am__EXEEXT_2) \
-@HAVE_GLIB_TRUE@       $(am__EXEEXT_3) test-c$(EXEEXT) \
-@HAVE_GLIB_TRUE@       test-cplusplus$(EXEEXT) $(am__EXEEXT_1)
+@HAVE_GLIB_TRUE@       $(am__EXEEXT_1) test-ot-color$(EXEEXT) \
+@HAVE_GLIB_TRUE@       test-ot-ligature-carets$(EXEEXT) \
+@HAVE_GLIB_TRUE@       test-ot-name$(EXEEXT) test-ot-tag$(EXEEXT) \
+@HAVE_GLIB_TRUE@       test-ot-extents-cff$(EXEEXT) $(am__EXEEXT_1) \
+@HAVE_GLIB_TRUE@       $(am__EXEEXT_2) $(am__EXEEXT_3) \
+@HAVE_GLIB_TRUE@       test-c$(EXEEXT) test-cplusplus$(EXEEXT) \
+@HAVE_GLIB_TRUE@       $(am__EXEEXT_1)
 PROGRAMS = $(noinst_PROGRAMS)
-test_blob_SOURCES = test-blob.c
-test_blob_OBJECTS = test-blob.$(OBJEXT)
-test_blob_LDADD = $(LDADD)
+test_aat_layout_SOURCES = test-aat-layout.c
+test_aat_layout_OBJECTS = test-aat-layout.$(OBJEXT)
+test_aat_layout_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
-@HAVE_GLIB_TRUE@test_blob_DEPENDENCIES =  \
+@HAVE_GLIB_TRUE@test_aat_layout_DEPENDENCIES =  \
 @HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz.la \
 @HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_1)
 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_baseline_SOURCES = test-baseline.c
+test_baseline_OBJECTS = test-baseline.$(OBJEXT)
+test_baseline_LDADD = $(LDADD)
+@HAVE_GLIB_TRUE@test_baseline_DEPENDENCIES =  \
+@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz.la \
+@HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_1)
+test_blob_SOURCES = test-blob.c
+test_blob_OBJECTS = test-blob.$(OBJEXT)
+test_blob_LDADD = $(LDADD)
+@HAVE_GLIB_TRUE@test_blob_DEPENDENCIES =  \
+@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz.la \
+@HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_1)
 test_buffer_SOURCES = test-buffer.c
 test_buffer_OBJECTS = test-buffer.$(OBJEXT)
 test_buffer_LDADD = $(LDADD)
@@ -174,6 +190,12 @@ test_c_LDADD = $(LDADD)
 @HAVE_GLIB_TRUE@test_c_DEPENDENCIES =  \
 @HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz.la \
 @HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_1)
+test_collect_unicodes_SOURCES = test-collect-unicodes.c
+test_collect_unicodes_OBJECTS = test-collect-unicodes.$(OBJEXT)
+test_collect_unicodes_LDADD = $(LDADD)
+@HAVE_GLIB_TRUE@test_collect_unicodes_DEPENDENCIES =  \
+@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz.la \
+@HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_1)
 test_common_SOURCES = test-common.c
 test_common_OBJECTS = test-common.$(OBJEXT)
 test_common_LDADD = $(LDADD)
@@ -194,6 +216,21 @@ test_font_LDADD = $(LDADD)
 @HAVE_GLIB_TRUE@test_font_DEPENDENCIES =  \
 @HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz.la \
 @HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_1)
+test_map_SOURCES = test-map.c
+test_map_OBJECTS = test-map.$(OBJEXT)
+test_map_LDADD = $(LDADD)
+@HAVE_GLIB_TRUE@test_map_DEPENDENCIES =  \
+@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz.la \
+@HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_1)
+test_multithread_SOURCES = test-multithread.c
+test_multithread_OBJECTS =  \
+       test_multithread-test-multithread.$(OBJEXT)
+@HAVE_GLIB_TRUE@am__DEPENDENCIES_2 =  \
+@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz.la \
+@HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_1)
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_PTHREAD_TRUE@test_multithread_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_PTHREAD_TRUE@        $(am__DEPENDENCIES_1) \
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_PTHREAD_TRUE@        $(am__DEPENDENCIES_1)
 test_object_SOURCES = test-object.c
 test_object_OBJECTS = test-object.$(OBJEXT)
 test_object_LDADD = $(LDADD)
@@ -206,13 +243,35 @@ test_ot_color_LDADD = $(LDADD)
 @HAVE_GLIB_TRUE@test_ot_color_DEPENDENCIES =  \
 @HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz.la \
 @HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_1)
+test_ot_extents_cff_SOURCES = test-ot-extents-cff.c
+test_ot_extents_cff_OBJECTS = test-ot-extents-cff.$(OBJEXT)
+test_ot_extents_cff_LDADD = $(LDADD)
+@HAVE_GLIB_TRUE@test_ot_extents_cff_DEPENDENCIES =  \
+@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz.la \
+@HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_1)
+test_ot_face_SOURCES = test-ot-face.c
+test_ot_face_OBJECTS = test-ot-face.$(OBJEXT)
+test_ot_face_LDADD = $(LDADD)
+@HAVE_GLIB_TRUE@test_ot_face_DEPENDENCIES =  \
+@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz.la \
+@HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_1)
+test_ot_ligature_carets_SOURCES = test-ot-ligature-carets.c
+test_ot_ligature_carets_OBJECTS = test-ot-ligature-carets.$(OBJEXT)
+test_ot_ligature_carets_LDADD = $(LDADD)
+@HAVE_GLIB_TRUE@test_ot_ligature_carets_DEPENDENCIES =  \
+@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz.la \
+@HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_1)
 test_ot_math_SOURCES = test-ot-math.c
 test_ot_math_OBJECTS = test_ot_math-test-ot-math.$(OBJEXT)
-@HAVE_GLIB_TRUE@am__DEPENDENCIES_2 =  \
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@test_ot_math_DEPENDENCIES =  \
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@   $(am__DEPENDENCIES_2) \
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@   $(am__DEPENDENCIES_1)
+test_ot_name_SOURCES = test-ot-name.c
+test_ot_name_OBJECTS = test-ot-name.$(OBJEXT)
+test_ot_name_LDADD = $(LDADD)
+@HAVE_GLIB_TRUE@test_ot_name_DEPENDENCIES =  \
 @HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz.la \
 @HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_1)
-@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@test_ot_math_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@     $(am__DEPENDENCIES_1)
 test_ot_tag_SOURCES = test-ot-tag.c
 test_ot_tag_OBJECTS = test-ot-tag.$(OBJEXT)
 test_ot_tag_LDADD = $(LDADD)
@@ -235,15 +294,18 @@ test_subset_SOURCES = test-subset.c
 test_subset_OBJECTS = test-subset.$(OBJEXT)
 @HAVE_GLIB_TRUE@test_subset_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 @HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz-subset.la
+test_subset_cff1_SOURCES = test-subset-cff1.c
+test_subset_cff1_OBJECTS = test-subset-cff1.$(OBJEXT)
+@HAVE_GLIB_TRUE@test_subset_cff1_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz-subset.la
+test_subset_cff2_SOURCES = test-subset-cff2.c
+test_subset_cff2_OBJECTS = test-subset-cff2.$(OBJEXT)
+@HAVE_GLIB_TRUE@test_subset_cff2_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz-subset.la
 test_subset_cmap_SOURCES = test-subset-cmap.c
 test_subset_cmap_OBJECTS = test-subset-cmap.$(OBJEXT)
 @HAVE_GLIB_TRUE@test_subset_cmap_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 @HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz-subset.la
-test_subset_codepoints_SOURCES = test-subset-codepoints.c
-test_subset_codepoints_OBJECTS = test-subset-codepoints.$(OBJEXT)
-@HAVE_GLIB_TRUE@test_subset_codepoints_DEPENDENCIES =  \
-@HAVE_GLIB_TRUE@       $(am__DEPENDENCIES_2) \
-@HAVE_GLIB_TRUE@       $(top_builddir)/src/libharfbuzz-subset.la
 test_subset_glyf_SOURCES = test-subset-glyf.c
 test_subset_glyf_OBJECTS = test-subset-glyf.$(OBJEXT)
 @HAVE_GLIB_TRUE@test_subset_glyf_DEPENDENCIES = $(am__DEPENDENCIES_2) \
@@ -307,9 +369,6 @@ 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_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
@@ -332,20 +391,28 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-SOURCES = test-blob.c test-buffer.c test-c.c test-common.c \
-       $(test_cplusplus_SOURCES) test-font.c test-object.c \
-       test-ot-color.c test-ot-math.c test-ot-tag.c test-set.c \
-       test-shape.c test-subset.c test-subset-cmap.c \
-       test-subset-codepoints.c test-subset-glyf.c test-subset-hdmx.c \
-       test-subset-hmtx.c test-subset-os2.c test-subset-post.c \
-       test-subset-vmtx.c test-unicode.c test-version.c
-DIST_SOURCES = test-blob.c test-buffer.c test-c.c test-common.c \
-       $(am__test_cplusplus_SOURCES_DIST) test-font.c test-object.c \
-       test-ot-color.c test-ot-math.c test-ot-tag.c test-set.c \
-       test-shape.c test-subset.c test-subset-cmap.c \
-       test-subset-codepoints.c test-subset-glyf.c test-subset-hdmx.c \
-       test-subset-hmtx.c test-subset-os2.c test-subset-post.c \
-       test-subset-vmtx.c test-unicode.c test-version.c
+SOURCES = test-aat-layout.c test-baseline.c test-blob.c test-buffer.c \
+       test-c.c test-collect-unicodes.c test-common.c \
+       $(test_cplusplus_SOURCES) test-font.c test-map.c \
+       test-multithread.c test-object.c test-ot-color.c \
+       test-ot-extents-cff.c test-ot-face.c test-ot-ligature-carets.c \
+       test-ot-math.c test-ot-name.c test-ot-tag.c test-set.c \
+       test-shape.c test-subset.c test-subset-cff1.c \
+       test-subset-cff2.c test-subset-cmap.c test-subset-glyf.c \
+       test-subset-hdmx.c test-subset-hmtx.c test-subset-os2.c \
+       test-subset-post.c test-subset-vmtx.c test-unicode.c \
+       test-version.c
+DIST_SOURCES = test-aat-layout.c test-baseline.c test-blob.c \
+       test-buffer.c test-c.c test-collect-unicodes.c test-common.c \
+       $(am__test_cplusplus_SOURCES_DIST) test-font.c test-map.c \
+       test-multithread.c test-object.c test-ot-color.c \
+       test-ot-extents-cff.c test-ot-face.c test-ot-ligature-carets.c \
+       test-ot-math.c test-ot-name.c test-ot-tag.c test-set.c \
+       test-shape.c test-subset.c test-subset-cff1.c \
+       test-subset-cff2.c test-subset-cmap.c test-subset-glyf.c \
+       test-subset-hdmx.c test-subset-hmtx.c test-subset-os2.c \
+       test-subset-post.c test-subset-vmtx.c test-unicode.c \
+       test-version.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -694,6 +761,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -767,21 +836,25 @@ EXTRA_DIST = CMakeLists.txt fonts $(am__append_1)
 CLEANFILES = $(am__append_10)
 DISTCLEANFILES = 
 MAINTAINERCLEANFILES = 
+LINK = $(CXXLINK)
 @HAVE_GLIB_TRUE@AM_CPPFLAGS = -DSRCDIR="\"$(srcdir)\"" -I$(top_srcdir)/src/ -I$(top_builddir)/src/ $(GLIB_CFLAGS)
 @HAVE_GLIB_TRUE@LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS)
 
 # Tests for header compilation
-@HAVE_GLIB_TRUE@TEST_PROGS = test-blob test-buffer test-common \
-@HAVE_GLIB_TRUE@       test-font test-object test-set test-shape \
-@HAVE_GLIB_TRUE@       test-subset test-subset-codepoints \
+@HAVE_GLIB_TRUE@TEST_PROGS = test-aat-layout test-baseline test-blob \
+@HAVE_GLIB_TRUE@       test-buffer test-collect-unicodes test-common \
+@HAVE_GLIB_TRUE@       test-font test-map test-object test-ot-face \
+@HAVE_GLIB_TRUE@       test-set test-shape test-subset \
 @HAVE_GLIB_TRUE@       test-subset-cmap test-subset-glyf \
 @HAVE_GLIB_TRUE@       test-subset-hdmx test-subset-hmtx \
 @HAVE_GLIB_TRUE@       test-subset-os2 test-subset-post \
-@HAVE_GLIB_TRUE@       test-subset-vmtx test-unicode test-version \
+@HAVE_GLIB_TRUE@       test-subset-vmtx test-subset-cff1 \
+@HAVE_GLIB_TRUE@       test-subset-cff2 test-unicode test-version \
+@HAVE_GLIB_TRUE@       $(NULL) test-ot-color test-ot-ligature-carets \
+@HAVE_GLIB_TRUE@       test-ot-name test-ot-tag test-ot-extents-cff \
 @HAVE_GLIB_TRUE@       $(NULL) $(am__append_4) $(am__append_5) test-c \
 @HAVE_GLIB_TRUE@       test-cplusplus $(NULL)
 @HAVE_GLIB_TRUE@test_subset_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
-@HAVE_GLIB_TRUE@test_subset_codepoints_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
 @HAVE_GLIB_TRUE@test_subset_cmap_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
 @HAVE_GLIB_TRUE@test_subset_glyf_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
 @HAVE_GLIB_TRUE@test_subset_hdmx_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
@@ -789,11 +862,18 @@ MAINTAINERCLEANFILES =
 @HAVE_GLIB_TRUE@test_subset_os2_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
 @HAVE_GLIB_TRUE@test_subset_post_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
 @HAVE_GLIB_TRUE@test_subset_vmtx_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
+@HAVE_GLIB_TRUE@test_subset_cff1_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
+@HAVE_GLIB_TRUE@test_subset_cff2_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la
 @HAVE_GLIB_TRUE@test_unicode_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) \
 @HAVE_GLIB_TRUE@       $(NULL) $(am__append_2)
 @HAVE_GLIB_TRUE@test_unicode_LDADD = $(LDADD) $(am__append_3)
-@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@test_ot_math_LDADD = $(LDADD) $(FREETYPE_LIBS)
-@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_OT_TRUE@test_ot_math_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_PTHREAD_TRUE@test_multithread_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) $(FREETYPE_CFLAGS)
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_PTHREAD_TRUE@test_multithread_LDADD = $(LDADD) $(PTHREAD_LIBS) $(FREETYPE_LIBS)
+# The auto-generated link rule somehow includes CFLAGS as well.  Without
+# it, pthread link fails, because, who knows why, $PTHREAD_LIBS is empty.
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@@HAVE_PTHREAD_TRUE@test_multithread_LINK = $(LINK) $(PTHREAD_CFLAGS)
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@test_ot_math_LDADD = $(LDADD) $(FREETYPE_LIBS)
+@HAVE_FREETYPE_TRUE@@HAVE_GLIB_TRUE@test_ot_math_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
 @HAVE_GLIB_TRUE@test_cplusplus_SOURCES = test-cplusplus.cc
 @HAVE_GLIB_TRUE@test_c_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_6) \
 @HAVE_GLIB_TRUE@       $(am__append_8)
@@ -815,9 +895,10 @@ MAINTAINERCLEANFILES =
 
 # Check tests under valgrind.  Saves log to log-valgrind.txt
 @HAVE_GLIB_TRUE@VALGRIND_FLAGS = \
-@HAVE_GLIB_TRUE@       --tool=memcheck --suppressions=$(srcdir)/.valgrind-suppressions \
+@HAVE_GLIB_TRUE@       --tool=memcheck \
 @HAVE_GLIB_TRUE@       --track-origins=yes \
-@HAVE_GLIB_TRUE@       --leak-check=yes
+@HAVE_GLIB_TRUE@       --leak-check=yes \
+@HAVE_GLIB_TRUE@       $(EXTRA_VALGRIND_FLAGS)
 
 @HAVE_GLIB_TRUE@valgrind_verbose = $(valgrind_verbose_@AM_V@)
 @HAVE_GLIB_TRUE@valgrind_verbose_ = $(valgrind_verbose_@AM_DEFAULT_V@)
@@ -876,6 +957,14 @@ clean-noinstPROGRAMS:
        echo " rm -f" $$list; \
        rm -f $$list
 
+test-aat-layout$(EXEEXT): $(test_aat_layout_OBJECTS) $(test_aat_layout_DEPENDENCIES) $(EXTRA_test_aat_layout_DEPENDENCIES) 
+       @rm -f test-aat-layout$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(test_aat_layout_OBJECTS) $(test_aat_layout_LDADD) $(LIBS)
+
+test-baseline$(EXEEXT): $(test_baseline_OBJECTS) $(test_baseline_DEPENDENCIES) $(EXTRA_test_baseline_DEPENDENCIES) 
+       @rm -f test-baseline$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(test_baseline_OBJECTS) $(test_baseline_LDADD) $(LIBS)
+
 test-blob$(EXEEXT): $(test_blob_OBJECTS) $(test_blob_DEPENDENCIES) $(EXTRA_test_blob_DEPENDENCIES) 
        @rm -f test-blob$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(test_blob_OBJECTS) $(test_blob_LDADD) $(LIBS)
@@ -888,6 +977,10 @@ test-c$(EXEEXT): $(test_c_OBJECTS) $(test_c_DEPENDENCIES) $(EXTRA_test_c_DEPENDE
        @rm -f test-c$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(test_c_OBJECTS) $(test_c_LDADD) $(LIBS)
 
+test-collect-unicodes$(EXEEXT): $(test_collect_unicodes_OBJECTS) $(test_collect_unicodes_DEPENDENCIES) $(EXTRA_test_collect_unicodes_DEPENDENCIES) 
+       @rm -f test-collect-unicodes$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(test_collect_unicodes_OBJECTS) $(test_collect_unicodes_LDADD) $(LIBS)
+
 test-common$(EXEEXT): $(test_common_OBJECTS) $(test_common_DEPENDENCIES) $(EXTRA_test_common_DEPENDENCIES) 
        @rm -f test-common$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(test_common_OBJECTS) $(test_common_LDADD) $(LIBS)
@@ -900,6 +993,14 @@ test-font$(EXEEXT): $(test_font_OBJECTS) $(test_font_DEPENDENCIES) $(EXTRA_test_
        @rm -f test-font$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(test_font_OBJECTS) $(test_font_LDADD) $(LIBS)
 
+test-map$(EXEEXT): $(test_map_OBJECTS) $(test_map_DEPENDENCIES) $(EXTRA_test_map_DEPENDENCIES) 
+       @rm -f test-map$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(test_map_OBJECTS) $(test_map_LDADD) $(LIBS)
+
+test-multithread$(EXEEXT): $(test_multithread_OBJECTS) $(test_multithread_DEPENDENCIES) $(EXTRA_test_multithread_DEPENDENCIES) 
+       @rm -f test-multithread$(EXEEXT)
+       $(AM_V_GEN)$(test_multithread_LINK) $(test_multithread_OBJECTS) $(test_multithread_LDADD) $(LIBS)
+
 test-object$(EXEEXT): $(test_object_OBJECTS) $(test_object_DEPENDENCIES) $(EXTRA_test_object_DEPENDENCIES) 
        @rm -f test-object$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(test_object_OBJECTS) $(test_object_LDADD) $(LIBS)
@@ -908,10 +1009,26 @@ test-ot-color$(EXEEXT): $(test_ot_color_OBJECTS) $(test_ot_color_DEPENDENCIES) $
        @rm -f test-ot-color$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(test_ot_color_OBJECTS) $(test_ot_color_LDADD) $(LIBS)
 
+test-ot-extents-cff$(EXEEXT): $(test_ot_extents_cff_OBJECTS) $(test_ot_extents_cff_DEPENDENCIES) $(EXTRA_test_ot_extents_cff_DEPENDENCIES) 
+       @rm -f test-ot-extents-cff$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(test_ot_extents_cff_OBJECTS) $(test_ot_extents_cff_LDADD) $(LIBS)
+
+test-ot-face$(EXEEXT): $(test_ot_face_OBJECTS) $(test_ot_face_DEPENDENCIES) $(EXTRA_test_ot_face_DEPENDENCIES) 
+       @rm -f test-ot-face$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(test_ot_face_OBJECTS) $(test_ot_face_LDADD) $(LIBS)
+
+test-ot-ligature-carets$(EXEEXT): $(test_ot_ligature_carets_OBJECTS) $(test_ot_ligature_carets_DEPENDENCIES) $(EXTRA_test_ot_ligature_carets_DEPENDENCIES) 
+       @rm -f test-ot-ligature-carets$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(test_ot_ligature_carets_OBJECTS) $(test_ot_ligature_carets_LDADD) $(LIBS)
+
 test-ot-math$(EXEEXT): $(test_ot_math_OBJECTS) $(test_ot_math_DEPENDENCIES) $(EXTRA_test_ot_math_DEPENDENCIES) 
        @rm -f test-ot-math$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(test_ot_math_OBJECTS) $(test_ot_math_LDADD) $(LIBS)
 
+test-ot-name$(EXEEXT): $(test_ot_name_OBJECTS) $(test_ot_name_DEPENDENCIES) $(EXTRA_test_ot_name_DEPENDENCIES) 
+       @rm -f test-ot-name$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(test_ot_name_OBJECTS) $(test_ot_name_LDADD) $(LIBS)
+
 test-ot-tag$(EXEEXT): $(test_ot_tag_OBJECTS) $(test_ot_tag_DEPENDENCIES) $(EXTRA_test_ot_tag_DEPENDENCIES) 
        @rm -f test-ot-tag$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(test_ot_tag_OBJECTS) $(test_ot_tag_LDADD) $(LIBS)
@@ -928,14 +1045,18 @@ test-subset$(EXEEXT): $(test_subset_OBJECTS) $(test_subset_DEPENDENCIES) $(EXTRA
        @rm -f test-subset$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(test_subset_OBJECTS) $(test_subset_LDADD) $(LIBS)
 
+test-subset-cff1$(EXEEXT): $(test_subset_cff1_OBJECTS) $(test_subset_cff1_DEPENDENCIES) $(EXTRA_test_subset_cff1_DEPENDENCIES) 
+       @rm -f test-subset-cff1$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(test_subset_cff1_OBJECTS) $(test_subset_cff1_LDADD) $(LIBS)
+
+test-subset-cff2$(EXEEXT): $(test_subset_cff2_OBJECTS) $(test_subset_cff2_DEPENDENCIES) $(EXTRA_test_subset_cff2_DEPENDENCIES) 
+       @rm -f test-subset-cff2$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(test_subset_cff2_OBJECTS) $(test_subset_cff2_LDADD) $(LIBS)
+
 test-subset-cmap$(EXEEXT): $(test_subset_cmap_OBJECTS) $(test_subset_cmap_DEPENDENCIES) $(EXTRA_test_subset_cmap_DEPENDENCIES) 
        @rm -f test-subset-cmap$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(test_subset_cmap_OBJECTS) $(test_subset_cmap_LDADD) $(LIBS)
 
-test-subset-codepoints$(EXEEXT): $(test_subset_codepoints_OBJECTS) $(test_subset_codepoints_DEPENDENCIES) $(EXTRA_test_subset_codepoints_DEPENDENCIES) 
-       @rm -f test-subset-codepoints$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(test_subset_codepoints_OBJECTS) $(test_subset_codepoints_LDADD) $(LIBS)
-
 test-subset-glyf$(EXEEXT): $(test_subset_glyf_OBJECTS) $(test_subset_glyf_DEPENDENCIES) $(EXTRA_test_subset_glyf_DEPENDENCIES) 
        @rm -f test-subset-glyf$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(test_subset_glyf_OBJECTS) $(test_subset_glyf_LDADD) $(LIBS)
@@ -974,17 +1095,26 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-aat-layout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-baseline.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-blob.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-buffer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-collect-unicodes.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-common.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-font.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-map.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ot-color.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ot-extents-cff.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ot-face.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ot-ligature-carets.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ot-name.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ot-tag.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-set.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-shape.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-subset-cff1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-subset-cff2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-subset-cmap.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-subset-codepoints.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-subset-glyf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-subset-hdmx.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-subset-hmtx.Po@am__quote@
@@ -995,6 +1125,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-version.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_c-test-c.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cplusplus-test-cplusplus.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_multithread-test-multithread.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ot_math-test-ot-math.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_unicode-test-unicode.Po@am__quote@
 
@@ -1033,6 +1164,20 @@ test_c-test-c.obj: test-c.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_c_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_c-test-c.obj `if test -f 'test-c.c'; then $(CYGPATH_W) 'test-c.c'; else $(CYGPATH_W) '$(srcdir)/test-c.c'; fi`
 
+test_multithread-test-multithread.o: test-multithread.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_multithread_CFLAGS) $(CFLAGS) -MT test_multithread-test-multithread.o -MD -MP -MF $(DEPDIR)/test_multithread-test-multithread.Tpo -c -o test_multithread-test-multithread.o `test -f 'test-multithread.c' || echo '$(srcdir)/'`test-multithread.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/test_multithread-test-multithread.Tpo $(DEPDIR)/test_multithread-test-multithread.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test-multithread.c' object='test_multithread-test-multithread.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_multithread_CFLAGS) $(CFLAGS) -c -o test_multithread-test-multithread.o `test -f 'test-multithread.c' || echo '$(srcdir)/'`test-multithread.c
+
+test_multithread-test-multithread.obj: test-multithread.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_multithread_CFLAGS) $(CFLAGS) -MT test_multithread-test-multithread.obj -MD -MP -MF $(DEPDIR)/test_multithread-test-multithread.Tpo -c -o test_multithread-test-multithread.obj `if test -f 'test-multithread.c'; then $(CYGPATH_W) 'test-multithread.c'; else $(CYGPATH_W) '$(srcdir)/test-multithread.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/test_multithread-test-multithread.Tpo $(DEPDIR)/test_multithread-test-multithread.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test-multithread.c' object='test_multithread-test-multithread.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_multithread_CFLAGS) $(CFLAGS) -c -o test_multithread-test-multithread.obj `if test -f 'test-multithread.c'; then $(CYGPATH_W) 'test-multithread.c'; else $(CYGPATH_W) '$(srcdir)/test-multithread.c'; fi`
+
 test_ot_math-test-ot-math.o: test-ot-math.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ot_math_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_ot_math-test-ot-math.o -MD -MP -MF $(DEPDIR)/test_ot_math-test-ot-math.Tpo -c -o test_ot_math-test-ot-math.o `test -f 'test-ot-math.c' || echo '$(srcdir)/'`test-ot-math.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/test_ot_math-test-ot-math.Tpo $(DEPDIR)/test_ot_math-test-ot-math.Po
@@ -1295,6 +1440,20 @@ recheck: all $(check_PROGRAMS)
                am__force_recheck=am--force-recheck \
                TEST_LOGS="$$log_list"; \
        exit $$?
+test-aat-layout.log: test-aat-layout$(EXEEXT)
+       @p='test-aat-layout$(EXEEXT)'; \
+       b='test-aat-layout'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-baseline.log: test-baseline$(EXEEXT)
+       @p='test-baseline$(EXEEXT)'; \
+       b='test-baseline'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
 test-blob.log: test-blob$(EXEEXT)
        @p='test-blob$(EXEEXT)'; \
        b='test-blob'; \
@@ -1309,6 +1468,13 @@ test-buffer.log: test-buffer$(EXEEXT)
        --log-file $$b.log --trs-file $$b.trs \
        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
        "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-collect-unicodes.log: test-collect-unicodes$(EXEEXT)
+       @p='test-collect-unicodes$(EXEEXT)'; \
+       b='test-collect-unicodes'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
 test-common.log: test-common$(EXEEXT)
        @p='test-common$(EXEEXT)'; \
        b='test-common'; \
@@ -1323,6 +1489,13 @@ test-font.log: test-font$(EXEEXT)
        --log-file $$b.log --trs-file $$b.trs \
        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
        "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-map.log: test-map$(EXEEXT)
+       @p='test-map$(EXEEXT)'; \
+       b='test-map'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
 test-object.log: test-object$(EXEEXT)
        @p='test-object$(EXEEXT)'; \
        b='test-object'; \
@@ -1330,6 +1503,13 @@ test-object.log: test-object$(EXEEXT)
        --log-file $$b.log --trs-file $$b.trs \
        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
        "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ot-face.log: test-ot-face$(EXEEXT)
+       @p='test-ot-face$(EXEEXT)'; \
+       b='test-ot-face'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
 test-set.log: test-set$(EXEEXT)
        @p='test-set$(EXEEXT)'; \
        b='test-set'; \
@@ -1351,13 +1531,6 @@ test-subset.log: test-subset$(EXEEXT)
        --log-file $$b.log --trs-file $$b.trs \
        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
        "$$tst" $(AM_TESTS_FD_REDIRECT)
-test-subset-codepoints.log: test-subset-codepoints$(EXEEXT)
-       @p='test-subset-codepoints$(EXEEXT)'; \
-       b='test-subset-codepoints'; \
-       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-       --log-file $$b.log --trs-file $$b.trs \
-       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-       "$$tst" $(AM_TESTS_FD_REDIRECT)
 test-subset-cmap.log: test-subset-cmap$(EXEEXT)
        @p='test-subset-cmap$(EXEEXT)'; \
        b='test-subset-cmap'; \
@@ -1407,6 +1580,20 @@ test-subset-vmtx.log: test-subset-vmtx$(EXEEXT)
        --log-file $$b.log --trs-file $$b.trs \
        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
        "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-subset-cff1.log: test-subset-cff1$(EXEEXT)
+       @p='test-subset-cff1$(EXEEXT)'; \
+       b='test-subset-cff1'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-subset-cff2.log: test-subset-cff2$(EXEEXT)
+       @p='test-subset-cff2$(EXEEXT)'; \
+       b='test-subset-cff2'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
 test-unicode.log: test-unicode$(EXEEXT)
        @p='test-unicode$(EXEEXT)'; \
        b='test-unicode'; \
@@ -1428,6 +1615,20 @@ test-ot-color.log: test-ot-color$(EXEEXT)
        --log-file $$b.log --trs-file $$b.trs \
        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
        "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ot-ligature-carets.log: test-ot-ligature-carets$(EXEEXT)
+       @p='test-ot-ligature-carets$(EXEEXT)'; \
+       b='test-ot-ligature-carets'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ot-name.log: test-ot-name$(EXEEXT)
+       @p='test-ot-name$(EXEEXT)'; \
+       b='test-ot-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-ot-tag.log: test-ot-tag$(EXEEXT)
        @p='test-ot-tag$(EXEEXT)'; \
        b='test-ot-tag'; \
@@ -1435,6 +1636,20 @@ test-ot-tag.log: test-ot-tag$(EXEEXT)
        --log-file $$b.log --trs-file $$b.trs \
        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
        "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-ot-extents-cff.log: test-ot-extents-cff$(EXEEXT)
+       @p='test-ot-extents-cff$(EXEEXT)'; \
+       b='test-ot-extents-cff'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-multithread.log: test-multithread$(EXEEXT)
+       @p='test-multithread$(EXEEXT)'; \
+       b='test-multithread'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
 test-ot-math.log: test-ot-math$(EXEEXT)
        @p='test-ot-math$(EXEEXT)'; \
        b='test-ot-math'; \
@@ -1637,6 +1852,8 @@ uninstall-am:
 # Convenience targets:
 lib:
        @$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src lib
+libs:
+       @$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src libs
 
 # check-tool: Run tests under $(TOOL)
 @HAVE_GLIB_TRUE@check-tool:
@@ -1650,7 +1867,6 @@ lib:
 @HAVE_GLIB_TRUE@       env $(TOOL)'
 @HAVE_GLIB_TRUE@check-gtester:
 @HAVE_GLIB_TRUE@       $(AM_V_at)$(MAKE) $(AM_MAKEFLGS) check-tool-raw TOOL="$(GTESTER) --verbose --keep-going"
-@HAVE_GLIB_TRUE@       $(EXTRA_VALGRIND_FLAGS)
 # TODO: The following check does not fail if valgrind finds error.  It should.
 @HAVE_GLIB_TRUE@check-valgrind:
 @HAVE_GLIB_TRUE@       $(AM_V_at)$(MAKE) $(AM_MAKEFLGS) check-tool TOOL="valgrind $(VALGRIND_FLAGS)" \
@@ -1661,11 +1877,13 @@ lib:
 @HAVE_GLIB_TRUE@       $(AM_V_GEN)$(top_builddir)/libtool --mode=execute nm $^ \
 @HAVE_GLIB_TRUE@       | grep ' U hb_' | sed 's/.* U hb_/hb_/' \
 @HAVE_GLIB_TRUE@       | sort | uniq > $@.tmp && mv $@.tmp $@
+@HAVE_GLIB_TRUE@symbols-tested-or-deprecated.txt: symbols-tested.txt $(top_builddir)/src/harfbuzz-deprecated-symbols.txt
+@HAVE_GLIB_TRUE@       $(AM_V_GEN)cat $^ | sort | uniq > $@.tmp; mv $@.tmp $@
 @HAVE_GLIB_TRUE@symbols-exported.txt: $(top_builddir)/src/.libs/libharfbuzz.so
 @HAVE_GLIB_TRUE@       $(AM_V_GEN)$(top_builddir)/libtool --mode=execute nm $^ \
 @HAVE_GLIB_TRUE@       | grep ' T ' | sed 's/.* T //' | grep -v '^\(_init\|_fini\)$$' \
 @HAVE_GLIB_TRUE@       | sort | uniq > $@.tmp && mv $@.tmp $@
-@HAVE_GLIB_TRUE@symbols-untested.txt: symbols-tested.txt symbols-exported.txt
+@HAVE_GLIB_TRUE@symbols-untested.txt: symbols-tested-or-deprecated.txt symbols-exported.txt
 @HAVE_GLIB_TRUE@       $(AM_V_GEN)diff $^ > $@.tmp; mv $@.tmp $@
 @HAVE_GLIB_TRUE@check-symbols: symbols-untested.txt
 @HAVE_GLIB_TRUE@       @! cat $^ | grep .