Imported Upstream version 3.4.0
[platform/upstream/harfbuzz.git] / src / Makefile.in
index 0399213..86a0c79 100644 (file)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -96,9 +96,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 TESTS = $(am__EXEEXT_2) $(am__EXEEXT_4)
-check_PROGRAMS = dump-indic-data$(EXEEXT) dump-khmer-data$(EXEEXT) \
-       dump-myanmar-data$(EXEEXT) dump-use-data$(EXEEXT) \
-       $(am__EXEEXT_1) $(am__EXEEXT_2)
+check_PROGRAMS = $(am__EXEEXT_2)
 @HAVE_PTHREAD_TRUE@am__append_1 = $(PTHREAD_CFLAGS)
 @HAVE_PTHREAD_TRUE@am__append_2 = $(PTHREAD_LIBS)
 @HAVE_GLIB_TRUE@am__append_3 = $(GLIB_CFLAGS)
@@ -188,9 +186,11 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
        "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkgincludedir)"
 am__EXEEXT_1 =
 am__EXEEXT_2 = test-algs$(EXEEXT) test-array$(EXEEXT) \
-       test-iter$(EXEEXT) test-meta$(EXEEXT) test-number$(EXEEXT) \
-       test-ot-tag$(EXEEXT) test-unicode-ranges$(EXEEXT) \
-       test-bimap$(EXEEXT)
+       test-bimap$(EXEEXT) test-iter$(EXEEXT) test-machinery$(EXEEXT) \
+       test-map$(EXEEXT) test-number$(EXEEXT) test-ot-tag$(EXEEXT) \
+       test-priority-queue$(EXEEXT) test-set$(EXEEXT) \
+       test-serialize$(EXEEXT) test-unicode-ranges$(EXEEXT) \
+       test-vector$(EXEEXT) test-repacker$(EXEEXT) $(am__EXEEXT_1)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -283,44 +283,46 @@ am__DEPENDENCIES_12 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
        $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_10) \
        $(am__DEPENDENCIES_11)
 libharfbuzz_la_DEPENDENCIES = $(am__DEPENDENCIES_12)
-am__libharfbuzz_la_SOURCES_DIST = hb-aat-fdsc-table.hh \
-       hb-aat-layout-ankr-table.hh hb-aat-layout-bsln-table.hh \
-       hb-aat-layout-common.hh hb-aat-layout-feat-table.hh \
-       hb-aat-layout-just-table.hh hb-aat-layout-kerx-table.hh \
-       hb-aat-layout-lcar-table.hh hb-aat-layout-morx-table.hh \
+am__libharfbuzz_la_SOURCES_DIST = hb-aat-layout-ankr-table.hh \
+       hb-aat-layout-bsln-table.hh hb-aat-layout-common.hh \
+       hb-aat-layout-feat-table.hh hb-aat-layout-just-table.hh \
+       hb-aat-layout-kerx-table.hh hb-aat-layout-morx-table.hh \
        hb-aat-layout-opbd-table.hh hb-aat-layout-trak-table.hh \
        hb-aat-layout.cc hb-aat-layout.hh hb-aat-ltag-table.hh \
        hb-aat-map.cc hb-aat-map.hh hb-algs.hh hb-array.hh \
-       hb-atomic.hh hb-blob.cc hb-blob.hh hb-buffer-serialize.cc \
-       hb-buffer.cc hb-buffer.hh hb-cache.hh hb-cff-interp-common.hh \
+       hb-atomic.hh hb-bimap.hh hb-bit-page.hh hb-bit-set.hh \
+       hb-bit-set-invertible.hh hb-blob.cc hb-blob.hh \
+       hb-buffer-serialize.cc hb-buffer-verify.cc hb-buffer.cc \
+       hb-buffer.hh hb-cache.hh hb-cff-interp-common.hh \
        hb-cff-interp-cs-common.hh hb-cff-interp-dict-common.hh \
        hb-cff1-interp-cs.hh hb-cff2-interp-cs.hh hb-common.cc \
        hb-config.hh hb-debug.hh hb-dispatch.hh hb-draw.cc hb-draw.hh \
        hb-face.cc hb-face.hh hb-fallback-shape.cc hb-font.cc \
        hb-font.hh hb-iter.hh hb-kern.hh hb-machinery.hh hb-map.cc \
-       hb-map.hh hb-bimap.hh hb-meta.hh hb-mutex.hh hb-null.hh \
-       hb-number.cc hb-number.hh hb-object.hh hb-open-file.hh \
-       hb-open-type.hh hb-ot-cff-common.hh hb-ot-cff1-table.cc \
-       hb-ot-cff1-table.hh hb-ot-cff1-std-str.hh hb-ot-cff2-table.cc \
-       hb-ot-cff2-table.hh hb-ot-cmap-table.hh \
+       hb-map.hh hb-meta.hh hb-ms-feature-ranges.hh hb-mutex.hh \
+       hb-null.hh hb-number.cc hb-number.hh hb-object.hh \
+       hb-open-file.hh hb-open-type.hh hb-ot-cff-common.hh \
+       hb-ot-cff1-std-str.hh hb-ot-cff1-table.cc hb-ot-cff1-table.hh \
+       hb-ot-cff2-table.cc hb-ot-cff2-table.hh hb-ot-cmap-table.hh \
        hb-ot-color-cbdt-table.hh hb-ot-color-colr-table.hh \
        hb-ot-color-cpal-table.hh hb-ot-color-sbix-table.hh \
-       hb-ot-color-svg-table.hh hb-ot-color.cc hb-ot-face.cc \
-       hb-ot-face.hh hb-ot-face-table-list.hh hb-ot-font.cc \
-       hb-ot-gasp-table.hh hb-ot-glyf-table.hh hb-ot-hdmx-table.hh \
-       hb-ot-head-table.hh hb-ot-hhea-table.hh hb-ot-hmtx-table.hh \
-       hb-ot-kern-table.hh hb-ot-layout-base-table.hh \
-       hb-ot-layout-common.hh hb-ot-layout-gdef-table.hh \
-       hb-ot-layout-gpos-table.hh hb-ot-layout-gsub-table.hh \
-       hb-ot-layout-gsubgpos.hh hb-ot-layout-jstf-table.hh \
-       hb-ot-layout.cc hb-ot-layout.hh hb-ot-map.cc hb-ot-map.hh \
-       hb-ot-math-table.hh hb-ot-math.cc hb-ot-maxp-table.hh \
-       hb-ot-meta-table.hh hb-ot-meta.cc hb-ot-metrics.cc \
-       hb-ot-metrics.hh hb-ot-name-language-static.hh \
-       hb-ot-name-language.hh hb-ot-name-table.hh hb-ot-name.cc \
-       hb-ot-os2-table.hh hb-ot-os2-unicode-ranges.hh \
-       hb-ot-post-macroman.hh hb-ot-post-table.hh \
-       hb-ot-shape-complex-arabic-fallback.hh \
+       hb-ot-color-svg-table.hh hb-ot-color.cc \
+       hb-ot-face-table-list.hh hb-ot-face.cc hb-ot-face.hh \
+       hb-ot-font.cc hb-ot-gasp-table.hh hb-ot-glyf-table.hh \
+       hb-ot-hdmx-table.hh hb-ot-head-table.hh hb-ot-hhea-table.hh \
+       hb-ot-hmtx-table.hh hb-ot-kern-table.hh \
+       hb-ot-layout-base-table.hh hb-ot-layout-common.hh \
+       hb-ot-layout-gdef-table.hh hb-ot-layout-gpos-table.hh \
+       hb-ot-layout-gsub-table.hh hb-ot-layout-gsubgpos.hh \
+       hb-ot-layout-jstf-table.hh hb-ot-layout.cc hb-ot-layout.hh \
+       hb-ot-map.cc hb-ot-map.hh hb-ot-math-table.hh hb-ot-math.cc \
+       hb-ot-maxp-table.hh hb-ot-meta-table.hh hb-ot-meta.cc \
+       hb-ot-metrics.cc hb-ot-metrics.hh \
+       hb-ot-name-language-static.hh hb-ot-name-language.hh \
+       hb-ot-name-table.hh hb-ot-name.cc hb-ot-os2-table.hh \
+       hb-ot-os2-unicode-ranges.hh hb-ot-post-macroman.hh \
+       hb-ot-post-table.hh hb-ot-shape-complex-arabic-fallback.hh \
+       hb-ot-shape-complex-arabic-joining-list.hh \
        hb-ot-shape-complex-arabic-table.hh \
        hb-ot-shape-complex-arabic-win1256.hh \
        hb-ot-shape-complex-arabic.cc hb-ot-shape-complex-arabic.hh \
@@ -330,23 +332,25 @@ am__libharfbuzz_la_SOURCES_DIST = hb-aat-fdsc-table.hh \
        hb-ot-shape-complex-indic.cc hb-ot-shape-complex-indic.hh \
        hb-ot-shape-complex-khmer.cc hb-ot-shape-complex-khmer.hh \
        hb-ot-shape-complex-myanmar.cc hb-ot-shape-complex-myanmar.hh \
-       hb-ot-shape-complex-thai.cc hb-ot-shape-complex-use-table.cc \
-       hb-ot-shape-complex-use.cc hb-ot-shape-complex-use.hh \
+       hb-ot-shape-complex-syllabic.cc \
+       hb-ot-shape-complex-syllabic.hh hb-ot-shape-complex-thai.cc \
+       hb-ot-shape-complex-use-table.hh hb-ot-shape-complex-use.cc \
        hb-ot-shape-complex-vowel-constraints.cc \
        hb-ot-shape-complex-vowel-constraints.hh \
        hb-ot-shape-complex.hh hb-ot-shape-fallback.cc \
        hb-ot-shape-fallback.hh hb-ot-shape-normalize.cc \
        hb-ot-shape-normalize.hh hb-ot-shape.cc hb-ot-shape.hh \
        hb-ot-stat-table.hh hb-ot-tag-table.hh hb-ot-tag.cc \
-       hb-ot-var-avar-table.hh hb-ot-var-fvar-table.hh \
-       hb-ot-var-gvar-table.hh hb-ot-var-hvar-table.hh \
-       hb-ot-var-mvar-table.hh hb-ot-var.cc hb-ot-vorg-table.hh \
-       hb-pool.hh hb-sanitize.hh hb-serialize.hh hb-set-digest.hh \
-       hb-set.cc hb-set.hh hb-shape-plan.cc hb-shape-plan.hh \
-       hb-shape.cc hb-shaper-impl.hh hb-shaper-list.hh hb-shaper.cc \
-       hb-shaper.hh hb-static.cc hb-string-array.hh hb-ucd-table.hh \
-       hb-ucd.cc hb-unicode-emoji-table.hh hb-unicode.cc \
-       hb-unicode.hh hb-utf.hh hb-vector.hh hb.hh \
+       hb-ot-var-avar-table.hh hb-ot-var-common.hh \
+       hb-ot-var-fvar-table.hh hb-ot-var-gvar-table.hh \
+       hb-ot-var-hvar-table.hh hb-ot-var-mvar-table.hh hb-ot-var.cc \
+       hb-ot-vorg-table.hh hb-pool.hh hb-sanitize.hh hb-serialize.hh \
+       hb-set-digest.hh hb-set.cc hb-set.hh hb-shape-plan.cc \
+       hb-shape-plan.hh hb-shape.cc hb-shaper-impl.hh \
+       hb-shaper-list.hh hb-shaper.cc hb-shaper.hh hb-static.cc \
+       hb-string-array.hh hb-style.cc hb-ucd-table.hh hb-ucd.cc \
+       hb-unicode-emoji-table.hh hb-unicode.cc hb-unicode.hh \
+       hb-utf.hh hb-vector.hh hb-priority-queue.hh hb.hh \
        hb-buffer-deserialize-json.hh hb-buffer-deserialize-text.hh \
        hb-number-parser.hh hb-ot-shape-complex-indic-machine.hh \
        hb-ot-shape-complex-khmer-machine.hh \
@@ -358,17 +362,18 @@ am__libharfbuzz_la_SOURCES_DIST = hb-aat-fdsc-table.hh \
        hb-font.h hb-map.h hb-ot-color.h hb-ot-deprecated.h \
        hb-ot-font.h hb-ot-layout.h hb-ot-math.h hb-ot-meta.h \
        hb-ot-metrics.h hb-ot-name.h hb-ot-shape.h hb-ot-var.h hb-ot.h \
-       hb-set.h hb-shape-plan.h hb-shape.h hb-unicode.h hb-version.h \
-       hb.h hb-glib.h hb-ft.h hb-graphite2.h hb-uniscribe.h \
-       hb-directwrite.h hb-gdi.h hb-coretext.h hb-icu.h
+       hb-set.h hb-shape-plan.h hb-shape.h hb-style.h hb-unicode.h \
+       hb-version.h hb.h hb-glib.h hb-ft.h hb-graphite2.h \
+       hb-uniscribe.h hb-directwrite.h hb-gdi.h hb-coretext.h \
+       hb-icu.h
 am__objects_7 = libharfbuzz_la-hb-aat-layout.lo \
        libharfbuzz_la-hb-aat-map.lo libharfbuzz_la-hb-blob.lo \
        libharfbuzz_la-hb-buffer-serialize.lo \
-       libharfbuzz_la-hb-buffer.lo libharfbuzz_la-hb-common.lo \
-       libharfbuzz_la-hb-draw.lo libharfbuzz_la-hb-face.lo \
-       libharfbuzz_la-hb-fallback-shape.lo libharfbuzz_la-hb-font.lo \
-       libharfbuzz_la-hb-map.lo libharfbuzz_la-hb-number.lo \
-       libharfbuzz_la-hb-ot-cff1-table.lo \
+       libharfbuzz_la-hb-buffer-verify.lo libharfbuzz_la-hb-buffer.lo \
+       libharfbuzz_la-hb-common.lo libharfbuzz_la-hb-draw.lo \
+       libharfbuzz_la-hb-face.lo libharfbuzz_la-hb-fallback-shape.lo \
+       libharfbuzz_la-hb-font.lo libharfbuzz_la-hb-map.lo \
+       libharfbuzz_la-hb-number.lo libharfbuzz_la-hb-ot-cff1-table.lo \
        libharfbuzz_la-hb-ot-cff2-table.lo \
        libharfbuzz_la-hb-ot-color.lo libharfbuzz_la-hb-ot-face.lo \
        libharfbuzz_la-hb-ot-font.lo libharfbuzz_la-hb-ot-layout.lo \
@@ -383,8 +388,8 @@ am__objects_7 = libharfbuzz_la-hb-aat-layout.lo \
        libharfbuzz_la-hb-ot-shape-complex-indic.lo \
        libharfbuzz_la-hb-ot-shape-complex-khmer.lo \
        libharfbuzz_la-hb-ot-shape-complex-myanmar.lo \
+       libharfbuzz_la-hb-ot-shape-complex-syllabic.lo \
        libharfbuzz_la-hb-ot-shape-complex-thai.lo \
-       libharfbuzz_la-hb-ot-shape-complex-use-table.lo \
        libharfbuzz_la-hb-ot-shape-complex-use.lo \
        libharfbuzz_la-hb-ot-shape-complex-vowel-constraints.lo \
        libharfbuzz_la-hb-ot-shape-fallback.lo \
@@ -393,8 +398,8 @@ am__objects_7 = libharfbuzz_la-hb-aat-layout.lo \
        libharfbuzz_la-hb-ot-var.lo libharfbuzz_la-hb-set.lo \
        libharfbuzz_la-hb-shape-plan.lo libharfbuzz_la-hb-shape.lo \
        libharfbuzz_la-hb-shaper.lo libharfbuzz_la-hb-static.lo \
-       libharfbuzz_la-hb-ucd.lo libharfbuzz_la-hb-unicode.lo \
-       $(am__objects_5)
+       libharfbuzz_la-hb-style.lo libharfbuzz_la-hb-ucd.lo \
+       libharfbuzz_la-hb-unicode.lo $(am__objects_5)
 am__objects_8 = $(am__objects_5)
 am__objects_9 = libharfbuzz_la-hb-glib.lo
 @HAVE_GLIB_TRUE@am__objects_10 = $(am__objects_9)
@@ -431,25 +436,6 @@ am__objects_34 = $(am__objects_8) $(am__objects_26) $(am__objects_27) \
        $(am__objects_31) $(am__objects_32) $(am__objects_33)
 am_libharfbuzz_la_OBJECTS = $(am__objects_25) $(am__objects_34)
 libharfbuzz_la_OBJECTS = $(am_libharfbuzz_la_OBJECTS)
-am_dump_indic_data_OBJECTS =  \
-       dump_indic_data-dump-indic-data.$(OBJEXT) \
-       dump_indic_data-hb-ot-shape-complex-indic-table.$(OBJEXT)
-dump_indic_data_OBJECTS = $(am_dump_indic_data_OBJECTS)
-dump_indic_data_DEPENDENCIES = libharfbuzz.la $(am__DEPENDENCIES_12)
-am_dump_khmer_data_OBJECTS =  \
-       dump_khmer_data-dump-khmer-data.$(OBJEXT) \
-       dump_khmer_data-hb-ot-shape-complex-indic-table.$(OBJEXT)
-dump_khmer_data_OBJECTS = $(am_dump_khmer_data_OBJECTS)
-dump_khmer_data_DEPENDENCIES = libharfbuzz.la $(am__DEPENDENCIES_12)
-am_dump_myanmar_data_OBJECTS =  \
-       dump_myanmar_data-dump-myanmar-data.$(OBJEXT) \
-       dump_myanmar_data-hb-ot-shape-complex-indic-table.$(OBJEXT)
-dump_myanmar_data_OBJECTS = $(am_dump_myanmar_data_OBJECTS)
-dump_myanmar_data_DEPENDENCIES = libharfbuzz.la $(am__DEPENDENCIES_12)
-am_dump_use_data_OBJECTS = dump_use_data-dump-use-data.$(OBJEXT) \
-       dump_use_data-hb-ot-shape-complex-use-table.$(OBJEXT)
-dump_use_data_OBJECTS = $(am_dump_use_data_OBJECTS)
-dump_use_data_DEPENDENCIES = libharfbuzz.la $(am__DEPENDENCIES_12)
 am_main_OBJECTS = main-main.$(OBJEXT)
 main_OBJECTS = $(am_main_OBJECTS)
 main_DEPENDENCIES = libharfbuzz.la $(am__DEPENDENCIES_12)
@@ -488,10 +474,14 @@ am_test_iter_OBJECTS = test_iter-test-iter.$(OBJEXT) \
        test_iter-hb-static.$(OBJEXT)
 test_iter_OBJECTS = $(am_test_iter_OBJECTS)
 test_iter_DEPENDENCIES = $(am__DEPENDENCIES_13)
-am_test_meta_OBJECTS = test_meta-test-meta.$(OBJEXT) \
-       test_meta-hb-static.$(OBJEXT)
-test_meta_OBJECTS = $(am_test_meta_OBJECTS)
-test_meta_DEPENDENCIES = $(am__DEPENDENCIES_13)
+am_test_machinery_OBJECTS = test_machinery-test-machinery.$(OBJEXT) \
+       test_machinery-hb-static.$(OBJEXT)
+test_machinery_OBJECTS = $(am_test_machinery_OBJECTS)
+test_machinery_DEPENDENCIES = $(am__DEPENDENCIES_13)
+am_test_map_OBJECTS = test_map-test-map.$(OBJEXT) \
+       test_map-hb-static.$(OBJEXT)
+test_map_OBJECTS = $(am_test_map_OBJECTS)
+test_map_DEPENDENCIES = $(am__DEPENDENCIES_13)
 am_test_number_OBJECTS = test_number-test-number.$(OBJEXT) \
        test_number-hb-number.$(OBJEXT)
 test_number_OBJECTS = $(am_test_number_OBJECTS)
@@ -509,10 +499,33 @@ test_ot_name_DEPENDENCIES = libharfbuzz.la $(am__DEPENDENCIES_12)
 am_test_ot_tag_OBJECTS = test_ot_tag-hb-ot-tag.$(OBJEXT)
 test_ot_tag_OBJECTS = $(am_test_ot_tag_OBJECTS)
 test_ot_tag_DEPENDENCIES = $(am__DEPENDENCIES_13)
+am_test_priority_queue_OBJECTS =  \
+       test_priority_queue-test-priority-queue.$(OBJEXT) \
+       test_priority_queue-hb-static.$(OBJEXT)
+test_priority_queue_OBJECTS = $(am_test_priority_queue_OBJECTS)
+test_priority_queue_DEPENDENCIES = libharfbuzz.la \
+       $(am__DEPENDENCIES_12)
+am_test_repacker_OBJECTS = test_repacker-test-repacker.$(OBJEXT) \
+       test_repacker-hb-static.$(OBJEXT)
+test_repacker_OBJECTS = $(am_test_repacker_OBJECTS)
+test_repacker_DEPENDENCIES = libharfbuzz.la libharfbuzz-subset.la \
+       $(am__DEPENDENCIES_12)
+am_test_serialize_OBJECTS = test_serialize-test-serialize.$(OBJEXT) \
+       test_serialize-hb-static.$(OBJEXT)
+test_serialize_OBJECTS = $(am_test_serialize_OBJECTS)
+test_serialize_DEPENDENCIES = $(am__DEPENDENCIES_13)
+am_test_set_OBJECTS = test_set-test-set.$(OBJEXT) \
+       test_set-hb-static.$(OBJEXT)
+test_set_OBJECTS = $(am_test_set_OBJECTS)
+test_set_DEPENDENCIES = $(am__DEPENDENCIES_13)
 am_test_unicode_ranges_OBJECTS =  \
        test_unicode_ranges-test-unicode-ranges.$(OBJEXT)
 test_unicode_ranges_OBJECTS = $(am_test_unicode_ranges_OBJECTS)
 test_unicode_ranges_DEPENDENCIES = $(am__DEPENDENCIES_13)
+am_test_vector_OBJECTS = test_vector-test-vector.$(OBJEXT) \
+       test_vector-hb-static.$(OBJEXT)
+test_vector_OBJECTS = $(am_test_vector_OBJECTS)
+test_vector_DEPENDENCIES = $(am__DEPENDENCIES_13)
 am__dist_check_SCRIPTS_DIST = check-c-linkage-decls.py \
        check-externs.py check-header-guards.py check-includes.py \
        check-static-inits.py check-symbols.py check-libstdc++.py
@@ -531,14 +544,7 @@ am__v_at_1 =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/dump_indic_data-dump-indic-data.Po \
-       ./$(DEPDIR)/dump_indic_data-hb-ot-shape-complex-indic-table.Po \
-       ./$(DEPDIR)/dump_khmer_data-dump-khmer-data.Po \
-       ./$(DEPDIR)/dump_khmer_data-hb-ot-shape-complex-indic-table.Po \
-       ./$(DEPDIR)/dump_myanmar_data-dump-myanmar-data.Po \
-       ./$(DEPDIR)/dump_myanmar_data-hb-ot-shape-complex-indic-table.Po \
-       ./$(DEPDIR)/dump_use_data-dump-use-data.Po \
-       ./$(DEPDIR)/dump_use_data-hb-ot-shape-complex-use-table.Po \
+am__depfiles_remade =  \
        ./$(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-enums.Plo \
        ./$(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-structs.Plo \
        ./$(DEPDIR)/libharfbuzz_icu_la-hb-icu.Plo \
@@ -546,6 +552,7 @@ am__depfiles_remade = ./$(DEPDIR)/dump_indic_data-dump-indic-data.Po \
        ./$(DEPDIR)/libharfbuzz_la-hb-aat-map.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-blob.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-buffer-serialize.Plo \
+       ./$(DEPDIR)/libharfbuzz_la-hb-buffer-verify.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-buffer.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-common.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-coretext.Plo \
@@ -580,8 +587,8 @@ am__depfiles_remade = ./$(DEPDIR)/dump_indic_data-dump-indic-data.Po \
        ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-indic.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-khmer.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-myanmar.Plo \
+       ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-syllabic.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-thai.Plo \
-       ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use-table.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-vowel-constraints.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-fallback.Plo \
@@ -594,6 +601,7 @@ am__depfiles_remade = ./$(DEPDIR)/dump_indic_data-dump-indic-data.Po \
        ./$(DEPDIR)/libharfbuzz_la-hb-shape.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-shaper.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-static.Plo \
+       ./$(DEPDIR)/libharfbuzz_la-hb-style.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-ucd.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-unicode.Plo \
        ./$(DEPDIR)/libharfbuzz_la-hb-uniscribe.Plo \
@@ -618,15 +626,27 @@ am__depfiles_remade = ./$(DEPDIR)/dump_indic_data-dump-indic-data.Po \
        ./$(DEPDIR)/test_gsub_would_substitute-test-gsub-would-substitute.Po \
        ./$(DEPDIR)/test_iter-hb-static.Po \
        ./$(DEPDIR)/test_iter-test-iter.Po \
-       ./$(DEPDIR)/test_meta-hb-static.Po \
-       ./$(DEPDIR)/test_meta-test-meta.Po \
+       ./$(DEPDIR)/test_machinery-hb-static.Po \
+       ./$(DEPDIR)/test_machinery-test-machinery.Po \
+       ./$(DEPDIR)/test_map-hb-static.Po \
+       ./$(DEPDIR)/test_map-test-map.Po \
        ./$(DEPDIR)/test_number-hb-number.Po \
        ./$(DEPDIR)/test_number-test-number.Po \
        ./$(DEPDIR)/test_ot_glyphname-test-ot-glyphname.Po \
        ./$(DEPDIR)/test_ot_meta-test-ot-meta.Po \
        ./$(DEPDIR)/test_ot_name-test-ot-name.Po \
        ./$(DEPDIR)/test_ot_tag-hb-ot-tag.Po \
-       ./$(DEPDIR)/test_unicode_ranges-test-unicode-ranges.Po
+       ./$(DEPDIR)/test_priority_queue-hb-static.Po \
+       ./$(DEPDIR)/test_priority_queue-test-priority-queue.Po \
+       ./$(DEPDIR)/test_repacker-hb-static.Po \
+       ./$(DEPDIR)/test_repacker-test-repacker.Po \
+       ./$(DEPDIR)/test_serialize-hb-static.Po \
+       ./$(DEPDIR)/test_serialize-test-serialize.Po \
+       ./$(DEPDIR)/test_set-hb-static.Po \
+       ./$(DEPDIR)/test_set-test-set.Po \
+       ./$(DEPDIR)/test_unicode_ranges-test-unicode-ranges.Po \
+       ./$(DEPDIR)/test_vector-hb-static.Po \
+       ./$(DEPDIR)/test_vector-test-vector.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -667,31 +687,33 @@ am__v_CCLD_1 =
 SOURCES = $(libharfbuzz_gobject_la_SOURCES) \
        $(nodist_libharfbuzz_gobject_la_SOURCES) \
        $(libharfbuzz_icu_la_SOURCES) $(libharfbuzz_subset_la_SOURCES) \
-       $(libharfbuzz_la_SOURCES) $(dump_indic_data_SOURCES) \
-       $(dump_khmer_data_SOURCES) $(dump_myanmar_data_SOURCES) \
-       $(dump_use_data_SOURCES) $(main_SOURCES) $(test_SOURCES) \
+       $(libharfbuzz_la_SOURCES) $(main_SOURCES) $(test_SOURCES) \
        $(test_algs_SOURCES) $(test_array_SOURCES) \
        $(test_bimap_SOURCES) $(test_buffer_serialize_SOURCES) \
        $(test_gpos_size_params_SOURCES) \
        $(test_gsub_would_substitute_SOURCES) $(test_iter_SOURCES) \
-       $(test_meta_SOURCES) $(test_number_SOURCES) \
-       $(test_ot_glyphname_SOURCES) $(test_ot_meta_SOURCES) \
-       $(test_ot_name_SOURCES) $(test_ot_tag_SOURCES) \
-       $(test_unicode_ranges_SOURCES)
+       $(test_machinery_SOURCES) $(test_map_SOURCES) \
+       $(test_number_SOURCES) $(test_ot_glyphname_SOURCES) \
+       $(test_ot_meta_SOURCES) $(test_ot_name_SOURCES) \
+       $(test_ot_tag_SOURCES) $(test_priority_queue_SOURCES) \
+       $(test_repacker_SOURCES) $(test_serialize_SOURCES) \
+       $(test_set_SOURCES) $(test_unicode_ranges_SOURCES) \
+       $(test_vector_SOURCES)
 DIST_SOURCES = $(am__libharfbuzz_gobject_la_SOURCES_DIST) \
        $(am__libharfbuzz_icu_la_SOURCES_DIST) \
        $(libharfbuzz_subset_la_SOURCES) \
-       $(am__libharfbuzz_la_SOURCES_DIST) $(dump_indic_data_SOURCES) \
-       $(dump_khmer_data_SOURCES) $(dump_myanmar_data_SOURCES) \
-       $(dump_use_data_SOURCES) $(main_SOURCES) $(test_SOURCES) \
-       $(test_algs_SOURCES) $(test_array_SOURCES) \
+       $(am__libharfbuzz_la_SOURCES_DIST) $(main_SOURCES) \
+       $(test_SOURCES) $(test_algs_SOURCES) $(test_array_SOURCES) \
        $(test_bimap_SOURCES) $(test_buffer_serialize_SOURCES) \
        $(test_gpos_size_params_SOURCES) \
        $(test_gsub_would_substitute_SOURCES) $(test_iter_SOURCES) \
-       $(test_meta_SOURCES) $(test_number_SOURCES) \
-       $(test_ot_glyphname_SOURCES) $(test_ot_meta_SOURCES) \
-       $(test_ot_name_SOURCES) $(test_ot_tag_SOURCES) \
-       $(test_unicode_ranges_SOURCES)
+       $(test_machinery_SOURCES) $(test_map_SOURCES) \
+       $(test_number_SOURCES) $(test_ot_glyphname_SOURCES) \
+       $(test_ot_meta_SOURCES) $(test_ot_name_SOURCES) \
+       $(test_ot_tag_SOURCES) $(test_priority_queue_SOURCES) \
+       $(test_repacker_SOURCES) $(test_serialize_SOURCES) \
+       $(test_set_SOURCES) $(test_unicode_ranges_SOURCES) \
+       $(test_vector_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
        ctags-recursive dvi-recursive html-recursive info-recursive \
        install-data-recursive install-dvi-recursive \
@@ -711,10 +733,10 @@ am__pkginclude_HEADERS_DIST = hb-aat-layout.h hb-aat.h hb-blob.h \
        hb-font.h hb-map.h hb-ot-color.h hb-ot-deprecated.h \
        hb-ot-font.h hb-ot-layout.h hb-ot-math.h hb-ot-meta.h \
        hb-ot-metrics.h hb-ot-name.h hb-ot-shape.h hb-ot-var.h hb-ot.h \
-       hb-set.h hb-shape-plan.h hb-shape.h hb-unicode.h hb-version.h \
-       hb.h hb-glib.h hb-ft.h hb-graphite2.h hb-uniscribe.h \
-       hb-directwrite.h hb-gdi.h hb-coretext.h hb-icu.h hb-subset.h \
-       hb-gobject.h hb-gobject-structs.h
+       hb-set.h hb-shape-plan.h hb-shape.h hb-style.h hb-unicode.h \
+       hb-version.h hb.h hb-glib.h hb-ft.h hb-graphite2.h \
+       hb-uniscribe.h hb-directwrite.h hb-gdi.h hb-coretext.h \
+       hb-icu.h hb-subset.h hb-gobject.h hb-gobject-structs.h
 HEADERS = $(nodist_pkginclude_HEADERS) $(pkginclude_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
@@ -968,6 +990,8 @@ CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHAFA_CFLAGS = @CHAFA_CFLAGS@
+CHAFA_LIBS = @CHAFA_LIBS@
 CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
 CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
 CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
@@ -996,8 +1020,6 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
 FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
 FREETYPE_DEPS = @FREETYPE_DEPS@
 FREETYPE_LIBS = @FREETYPE_LIBS@
@@ -1030,7 +1052,6 @@ HB_VERSION_MICRO = @HB_VERSION_MICRO@
 HB_VERSION_MINOR = @HB_VERSION_MINOR@
 HTML_DIR = @HTML_DIR@
 ICU_CFLAGS = @ICU_CFLAGS@
-ICU_CONFIG = @ICU_CONFIG@
 ICU_LIBS = @ICU_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -1136,6 +1157,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1161,14 +1183,12 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
 lib_LTLIBRARIES = libharfbuzz.la libharfbuzz-subset.la \
        $(am__append_38) $(am__append_41)
 HB_BASE_sources = \
-       hb-aat-fdsc-table.hh \
        hb-aat-layout-ankr-table.hh \
        hb-aat-layout-bsln-table.hh \
        hb-aat-layout-common.hh \
        hb-aat-layout-feat-table.hh \
        hb-aat-layout-just-table.hh \
        hb-aat-layout-kerx-table.hh \
-       hb-aat-layout-lcar-table.hh \
        hb-aat-layout-morx-table.hh \
        hb-aat-layout-opbd-table.hh \
        hb-aat-layout-trak-table.hh \
@@ -1180,9 +1200,14 @@ HB_BASE_sources = \
        hb-algs.hh \
        hb-array.hh \
        hb-atomic.hh \
+       hb-bimap.hh \
+       hb-bit-page.hh \
+       hb-bit-set.hh \
+       hb-bit-set-invertible.hh \
        hb-blob.cc \
        hb-blob.hh \
        hb-buffer-serialize.cc \
+       hb-buffer-verify.cc \
        hb-buffer.cc \
        hb-buffer.hh \
        hb-cache.hh \
@@ -1207,8 +1232,8 @@ HB_BASE_sources = \
        hb-machinery.hh \
        hb-map.cc \
        hb-map.hh \
-       hb-bimap.hh \
        hb-meta.hh \
+       hb-ms-feature-ranges.hh \
        hb-mutex.hh \
        hb-null.hh \
        hb-number.cc \
@@ -1217,9 +1242,9 @@ HB_BASE_sources = \
        hb-open-file.hh \
        hb-open-type.hh \
        hb-ot-cff-common.hh \
+       hb-ot-cff1-std-str.hh \
        hb-ot-cff1-table.cc \
        hb-ot-cff1-table.hh \
-       hb-ot-cff1-std-str.hh \
        hb-ot-cff2-table.cc \
        hb-ot-cff2-table.hh \
        hb-ot-cmap-table.hh \
@@ -1229,9 +1254,9 @@ HB_BASE_sources = \
        hb-ot-color-sbix-table.hh \
        hb-ot-color-svg-table.hh \
        hb-ot-color.cc \
+       hb-ot-face-table-list.hh \
        hb-ot-face.cc \
        hb-ot-face.hh \
-       hb-ot-face-table-list.hh \
        hb-ot-font.cc \
        hb-ot-gasp-table.hh \
        hb-ot-glyf-table.hh \
@@ -1267,6 +1292,7 @@ HB_BASE_sources = \
        hb-ot-post-macroman.hh \
        hb-ot-post-table.hh \
        hb-ot-shape-complex-arabic-fallback.hh \
+       hb-ot-shape-complex-arabic-joining-list.hh \
        hb-ot-shape-complex-arabic-table.hh \
        hb-ot-shape-complex-arabic-win1256.hh \
        hb-ot-shape-complex-arabic.cc \
@@ -1281,10 +1307,11 @@ HB_BASE_sources = \
        hb-ot-shape-complex-khmer.hh \
        hb-ot-shape-complex-myanmar.cc \
        hb-ot-shape-complex-myanmar.hh \
+       hb-ot-shape-complex-syllabic.cc \
+       hb-ot-shape-complex-syllabic.hh \
        hb-ot-shape-complex-thai.cc \
-       hb-ot-shape-complex-use-table.cc \
+       hb-ot-shape-complex-use-table.hh \
        hb-ot-shape-complex-use.cc \
-       hb-ot-shape-complex-use.hh \
        hb-ot-shape-complex-vowel-constraints.cc \
        hb-ot-shape-complex-vowel-constraints.hh \
        hb-ot-shape-complex.hh \
@@ -1298,6 +1325,7 @@ HB_BASE_sources = \
        hb-ot-tag-table.hh \
        hb-ot-tag.cc \
        hb-ot-var-avar-table.hh \
+       hb-ot-var-common.hh \
        hb-ot-var-fvar-table.hh \
        hb-ot-var-gvar-table.hh \
        hb-ot-var-hvar-table.hh \
@@ -1319,6 +1347,7 @@ HB_BASE_sources = \
        hb-shaper.hh \
        hb-static.cc \
        hb-string-array.hh \
+       hb-style.cc \
        hb-ucd-table.hh \
        hb-ucd.cc \
        hb-unicode-emoji-table.hh \
@@ -1326,6 +1355,7 @@ HB_BASE_sources = \
        hb-unicode.hh \
        hb-utf.hh \
        hb-vector.hh \
+       hb-priority-queue.hh \
        hb.hh \
        $(NULL)
 
@@ -1374,6 +1404,7 @@ HB_BASE_headers = \
        hb-set.h \
        hb-shape-plan.h \
        hb-shape.h \
+       hb-style.h \
        hb-unicode.h \
        hb-version.h \
        hb.h \
@@ -1408,6 +1439,8 @@ HB_SUBSET_sources = \
        hb-number.hh \
        hb-ot-cff1-table.cc \
        hb-ot-cff2-table.cc \
+       hb-ot-color-colrv1-closure.hh \
+       hb-ot-post-table-v2subset.hh \
        hb-static.cc \
        hb-subset-cff-common.cc \
        hb-subset-cff-common.hh \
@@ -1419,10 +1452,9 @@ HB_SUBSET_sources = \
        hb-subset-input.hh \
        hb-subset-plan.cc \
        hb-subset-plan.hh \
-       hb-subset-plan.hh \
        hb-subset.cc \
        hb-subset.hh \
-       hb-subset.hh \
+       hb-repacker.hh \
        $(NULL)
 
 HB_SUBSET_headers = \
@@ -1503,6 +1535,7 @@ EXTRA_libharfbuzz_subset_la_DEPENDENCIES = $(harfbuzz_subset_def_dependency)
 DEF_FILES = harfbuzz.def harfbuzz-subset.def harfbuzz-icu.def \
        harfbuzz-deprecated-symbols.txt $(am__append_47)
 GENERATORS = \
+       gen-arabic-joining-list.py \
        gen-arabic-table.py \
        gen-def.py \
        gen-emoji-table.py \
@@ -1545,19 +1578,23 @@ test_gpos_size_params_LDADD = libharfbuzz.la $(HBLIBS)
 test_gsub_would_substitute_SOURCES = test-gsub-would-substitute.cc
 test_gsub_would_substitute_CPPFLAGS = $(HBCFLAGS) $(FREETYPE_CFLAGS)
 test_gsub_would_substitute_LDADD = libharfbuzz.la $(HBLIBS) $(FREETYPE_LIBS)
-dump_indic_data_SOURCES = dump-indic-data.cc hb-ot-shape-complex-indic-table.cc
-dump_indic_data_CPPFLAGS = $(HBCFLAGS)
-dump_indic_data_LDADD = libharfbuzz.la $(HBLIBS)
-dump_khmer_data_SOURCES = dump-khmer-data.cc hb-ot-shape-complex-indic-table.cc
-dump_khmer_data_CPPFLAGS = $(HBCFLAGS)
-dump_khmer_data_LDADD = libharfbuzz.la $(HBLIBS)
-dump_myanmar_data_SOURCES = dump-myanmar-data.cc hb-ot-shape-complex-indic-table.cc
-dump_myanmar_data_CPPFLAGS = $(HBCFLAGS)
-dump_myanmar_data_LDADD = libharfbuzz.la $(HBLIBS)
-dump_use_data_SOURCES = dump-use-data.cc hb-ot-shape-complex-use-table.cc
-dump_use_data_CPPFLAGS = $(HBCFLAGS)
-dump_use_data_LDADD = libharfbuzz.la $(HBLIBS)
-COMPILED_TESTS = test-algs test-array test-iter test-meta test-number test-ot-tag test-unicode-ranges test-bimap
+COMPILED_TESTS = \
+       test-algs \
+       test-array \
+       test-bimap \
+       test-iter \
+       test-machinery \
+       test-map \
+       test-number \
+       test-ot-tag \
+       test-priority-queue \
+       test-set \
+       test-serialize \
+       test-unicode-ranges \
+       test-vector \
+       test-repacker \
+       $(NULL)
+
 COMPILED_TESTS_CPPFLAGS = $(HBCFLAGS) -DMAIN -UNDEBUG
 COMPILED_TESTS_LDADD = libharfbuzz.la $(HBLIBS)
 test_algs_SOURCES = test-algs.cc hb-static.cc
@@ -1566,24 +1603,42 @@ test_algs_LDADD = $(COMPILED_TESTS_LDADD)
 test_array_SOURCES = test-array.cc
 test_array_CPPFLAGS = $(HBCFLAGS)
 test_array_LDADD = libharfbuzz.la $(HBLIBS)
+test_bimap_SOURCES = test-bimap.cc hb-static.cc
+test_bimap_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS)
+test_bimap_LDADD = $(COMPILED_TESTS_LDADD)
 test_iter_SOURCES = test-iter.cc hb-static.cc
 test_iter_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS)
 test_iter_LDADD = $(COMPILED_TESTS_LDADD)
-test_meta_SOURCES = test-meta.cc hb-static.cc
-test_meta_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS)
-test_meta_LDADD = $(COMPILED_TESTS_LDADD)
+test_machinery_SOURCES = test-machinery.cc hb-static.cc
+test_machinery_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS)
+test_machinery_LDADD = $(COMPILED_TESTS_LDADD)
+test_map_SOURCES = test-map.cc hb-static.cc
+test_map_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS)
+test_map_LDADD = $(COMPILED_TESTS_LDADD)
 test_number_SOURCES = test-number.cc hb-number.cc
 test_number_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS)
 test_number_LDADD = $(COMPILED_TESTS_LDADD)
 test_ot_tag_SOURCES = hb-ot-tag.cc
 test_ot_tag_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS)
 test_ot_tag_LDADD = $(COMPILED_TESTS_LDADD)
+test_priority_queue_SOURCES = test-priority-queue.cc hb-static.cc
+test_priority_queue_CPPFLAGS = $(HBCFLAGS)
+test_priority_queue_LDADD = libharfbuzz.la $(HBLIBS)
+test_repacker_SOURCES = test-repacker.cc hb-static.cc
+test_repacker_CPPFLAGS = $(HBCFLAGS)
+test_repacker_LDADD = libharfbuzz.la libharfbuzz-subset.la $(HBLIBS)
+test_set_SOURCES = test-set.cc hb-static.cc
+test_set_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS)
+test_set_LDADD = $(COMPILED_TESTS_LDADD)
+test_serialize_SOURCES = test-serialize.cc hb-static.cc
+test_serialize_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS)
+test_serialize_LDADD = $(COMPILED_TESTS_LDADD)
 test_unicode_ranges_SOURCES = test-unicode-ranges.cc
 test_unicode_ranges_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS)
 test_unicode_ranges_LDADD = $(COMPILED_TESTS_LDADD)
-test_bimap_SOURCES = test-bimap.cc hb-static.cc
-test_bimap_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS)
-test_bimap_LDADD = $(COMPILED_TESTS_LDADD)
+test_vector_SOURCES = test-vector.cc hb-static.cc
+test_vector_CPPFLAGS = $(COMPILED_TESTS_CPPFLAGS)
+test_vector_LDADD = $(COMPILED_TESTS_LDADD)
 dist_check_SCRIPTS = check-c-linkage-decls.py check-externs.py \
        check-header-guards.py check-includes.py check-static-inits.py \
        check-symbols.py $(NULL) $(am__append_48)
@@ -1593,6 +1648,10 @@ TESTS_ENVIRONMENT = \
        MAKE="$(MAKE) $(AM_MAKEFLAGS)" \
        HBSOURCES="$(HBSOURCES)" \
        HBHEADERS="$(HBHEADERS)" \
+       LDD="$(LDD)" \
+       NM="$(NM)" \
+       OBJDUMP="$(OBJDUMP)" \
+       OTOOL="$(OTOOL)" \
        $(NULL)
 
 @HAVE_INTROSPECTION_TRUE@INTROSPECTION_GIRS = HarfBuzz-0.0.gir # What does the 0 mean anyway?!
@@ -1613,14 +1672,7 @@ TESTS_ENVIRONMENT = \
 @HAVE_INTROSPECTION_TRUE@HarfBuzz_0_0_gir_CFLAGS = \
 @HAVE_INTROSPECTION_TRUE@      $(INCLUDES) \
 @HAVE_INTROSPECTION_TRUE@      $(HBCFLAGS) \
-@HAVE_INTROSPECTION_TRUE@      -DHB_H \
-@HAVE_INTROSPECTION_TRUE@      -DHB_H_IN \
-@HAVE_INTROSPECTION_TRUE@      -DHB_OT_H \
-@HAVE_INTROSPECTION_TRUE@      -DHB_OT_H_IN \
-@HAVE_INTROSPECTION_TRUE@      -DHB_AAT_H \
-@HAVE_INTROSPECTION_TRUE@      -DHB_AAT_H_IN \
-@HAVE_INTROSPECTION_TRUE@      -DHB_GOBJECT_H \
-@HAVE_INTROSPECTION_TRUE@      -DHB_GOBJECT_H_IN \
+@HAVE_INTROSPECTION_TRUE@      -DHB_NO_SINGLE_HEADER_ERROR \
 @HAVE_INTROSPECTION_TRUE@      -DHAVE_GOBJECT \
 @HAVE_INTROSPECTION_TRUE@      -DHB_EXTERN= \
 @HAVE_INTROSPECTION_TRUE@      $(NULL)
@@ -1809,22 +1861,6 @@ libharfbuzz-subset.la: $(libharfbuzz_subset_la_OBJECTS) $(libharfbuzz_subset_la_
 libharfbuzz.la: $(libharfbuzz_la_OBJECTS) $(libharfbuzz_la_DEPENDENCIES) $(EXTRA_libharfbuzz_la_DEPENDENCIES) 
        $(AM_V_GEN)$(libharfbuzz_la_LINK) -rpath $(libdir) $(libharfbuzz_la_OBJECTS) $(libharfbuzz_la_LIBADD) $(LIBS)
 
-dump-indic-data$(EXEEXT): $(dump_indic_data_OBJECTS) $(dump_indic_data_DEPENDENCIES) $(EXTRA_dump_indic_data_DEPENDENCIES) 
-       @rm -f dump-indic-data$(EXEEXT)
-       $(AM_V_CXXLD)$(CXXLINK) $(dump_indic_data_OBJECTS) $(dump_indic_data_LDADD) $(LIBS)
-
-dump-khmer-data$(EXEEXT): $(dump_khmer_data_OBJECTS) $(dump_khmer_data_DEPENDENCIES) $(EXTRA_dump_khmer_data_DEPENDENCIES) 
-       @rm -f dump-khmer-data$(EXEEXT)
-       $(AM_V_CXXLD)$(CXXLINK) $(dump_khmer_data_OBJECTS) $(dump_khmer_data_LDADD) $(LIBS)
-
-dump-myanmar-data$(EXEEXT): $(dump_myanmar_data_OBJECTS) $(dump_myanmar_data_DEPENDENCIES) $(EXTRA_dump_myanmar_data_DEPENDENCIES) 
-       @rm -f dump-myanmar-data$(EXEEXT)
-       $(AM_V_CXXLD)$(CXXLINK) $(dump_myanmar_data_OBJECTS) $(dump_myanmar_data_LDADD) $(LIBS)
-
-dump-use-data$(EXEEXT): $(dump_use_data_OBJECTS) $(dump_use_data_DEPENDENCIES) $(EXTRA_dump_use_data_DEPENDENCIES) 
-       @rm -f dump-use-data$(EXEEXT)
-       $(AM_V_CXXLD)$(CXXLINK) $(dump_use_data_OBJECTS) $(dump_use_data_LDADD) $(LIBS)
-
 main$(EXEEXT): $(main_OBJECTS) $(main_DEPENDENCIES) $(EXTRA_main_DEPENDENCIES) 
        @rm -f main$(EXEEXT)
        $(AM_V_CXXLD)$(CXXLINK) $(main_OBJECTS) $(main_LDADD) $(LIBS)
@@ -1861,9 +1897,13 @@ test-iter$(EXEEXT): $(test_iter_OBJECTS) $(test_iter_DEPENDENCIES) $(EXTRA_test_
        @rm -f test-iter$(EXEEXT)
        $(AM_V_CXXLD)$(CXXLINK) $(test_iter_OBJECTS) $(test_iter_LDADD) $(LIBS)
 
-test-meta$(EXEEXT): $(test_meta_OBJECTS) $(test_meta_DEPENDENCIES) $(EXTRA_test_meta_DEPENDENCIES) 
-       @rm -f test-meta$(EXEEXT)
-       $(AM_V_CXXLD)$(CXXLINK) $(test_meta_OBJECTS) $(test_meta_LDADD) $(LIBS)
+test-machinery$(EXEEXT): $(test_machinery_OBJECTS) $(test_machinery_DEPENDENCIES) $(EXTRA_test_machinery_DEPENDENCIES) 
+       @rm -f test-machinery$(EXEEXT)
+       $(AM_V_CXXLD)$(CXXLINK) $(test_machinery_OBJECTS) $(test_machinery_LDADD) $(LIBS)
+
+test-map$(EXEEXT): $(test_map_OBJECTS) $(test_map_DEPENDENCIES) $(EXTRA_test_map_DEPENDENCIES) 
+       @rm -f test-map$(EXEEXT)
+       $(AM_V_CXXLD)$(CXXLINK) $(test_map_OBJECTS) $(test_map_LDADD) $(LIBS)
 
 test-number$(EXEEXT): $(test_number_OBJECTS) $(test_number_DEPENDENCIES) $(EXTRA_test_number_DEPENDENCIES) 
        @rm -f test-number$(EXEEXT)
@@ -1885,24 +1925,36 @@ test-ot-tag$(EXEEXT): $(test_ot_tag_OBJECTS) $(test_ot_tag_DEPENDENCIES) $(EXTRA
        @rm -f test-ot-tag$(EXEEXT)
        $(AM_V_CXXLD)$(CXXLINK) $(test_ot_tag_OBJECTS) $(test_ot_tag_LDADD) $(LIBS)
 
+test-priority-queue$(EXEEXT): $(test_priority_queue_OBJECTS) $(test_priority_queue_DEPENDENCIES) $(EXTRA_test_priority_queue_DEPENDENCIES) 
+       @rm -f test-priority-queue$(EXEEXT)
+       $(AM_V_CXXLD)$(CXXLINK) $(test_priority_queue_OBJECTS) $(test_priority_queue_LDADD) $(LIBS)
+
+test-repacker$(EXEEXT): $(test_repacker_OBJECTS) $(test_repacker_DEPENDENCIES) $(EXTRA_test_repacker_DEPENDENCIES) 
+       @rm -f test-repacker$(EXEEXT)
+       $(AM_V_CXXLD)$(CXXLINK) $(test_repacker_OBJECTS) $(test_repacker_LDADD) $(LIBS)
+
+test-serialize$(EXEEXT): $(test_serialize_OBJECTS) $(test_serialize_DEPENDENCIES) $(EXTRA_test_serialize_DEPENDENCIES) 
+       @rm -f test-serialize$(EXEEXT)
+       $(AM_V_CXXLD)$(CXXLINK) $(test_serialize_OBJECTS) $(test_serialize_LDADD) $(LIBS)
+
+test-set$(EXEEXT): $(test_set_OBJECTS) $(test_set_DEPENDENCIES) $(EXTRA_test_set_DEPENDENCIES) 
+       @rm -f test-set$(EXEEXT)
+       $(AM_V_CXXLD)$(CXXLINK) $(test_set_OBJECTS) $(test_set_LDADD) $(LIBS)
+
 test-unicode-ranges$(EXEEXT): $(test_unicode_ranges_OBJECTS) $(test_unicode_ranges_DEPENDENCIES) $(EXTRA_test_unicode_ranges_DEPENDENCIES) 
        @rm -f test-unicode-ranges$(EXEEXT)
        $(AM_V_CXXLD)$(CXXLINK) $(test_unicode_ranges_OBJECTS) $(test_unicode_ranges_LDADD) $(LIBS)
 
+test-vector$(EXEEXT): $(test_vector_OBJECTS) $(test_vector_DEPENDENCIES) $(EXTRA_test_vector_DEPENDENCIES) 
+       @rm -f test-vector$(EXEEXT)
+       $(AM_V_CXXLD)$(CXXLINK) $(test_vector_OBJECTS) $(test_vector_LDADD) $(LIBS)
+
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
 
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump_indic_data-dump-indic-data.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump_indic_data-hb-ot-shape-complex-indic-table.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump_khmer_data-dump-khmer-data.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump_khmer_data-hb-ot-shape-complex-indic-table.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump_myanmar_data-dump-myanmar-data.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump_myanmar_data-hb-ot-shape-complex-indic-table.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump_use_data-dump-use-data.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump_use_data-hb-ot-shape-complex-use-table.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-enums.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-structs.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_icu_la-hb-icu.Plo@am__quote@ # am--include-marker
@@ -1910,6 +1962,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-aat-map.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-blob.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-buffer-serialize.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-buffer-verify.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-buffer.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-common.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-coretext.Plo@am__quote@ # am--include-marker
@@ -1944,8 +1997,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-indic.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-khmer.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-myanmar.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-syllabic.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-thai.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use-table.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-vowel-constraints.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-fallback.Plo@am__quote@ # am--include-marker
@@ -1958,6 +2011,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-shape.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-shaper.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-static.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-style.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ucd.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-unicode.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-uniscribe.Plo@am__quote@ # am--include-marker
@@ -1983,15 +2037,27 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gsub_would_substitute-test-gsub-would-substitute.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_iter-hb-static.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_iter-test-iter.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_meta-hb-static.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_meta-test-meta.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_machinery-hb-static.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_machinery-test-machinery.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_map-hb-static.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_map-test-map.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_number-hb-number.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_number-test-number.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ot_glyphname-test-ot-glyphname.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ot_meta-test-ot-meta.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ot_name-test-ot-name.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ot_tag-hb-ot-tag.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_priority_queue-hb-static.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_priority_queue-test-priority-queue.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_repacker-hb-static.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_repacker-test-repacker.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_serialize-hb-static.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_serialize-test-serialize.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_set-hb-static.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_set-test-set.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_unicode_ranges-test-unicode-ranges.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_vector-hb-static.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_vector-test-vector.Po@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
        @$(MKDIR_P) $(@D)
@@ -2139,6 +2205,13 @@ libharfbuzz_la-hb-buffer-serialize.lo: hb-buffer-serialize.cc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-buffer-serialize.lo `test -f 'hb-buffer-serialize.cc' || echo '$(srcdir)/'`hb-buffer-serialize.cc
 
+libharfbuzz_la-hb-buffer-verify.lo: hb-buffer-verify.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-buffer-verify.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-buffer-verify.Tpo -c -o libharfbuzz_la-hb-buffer-verify.lo `test -f 'hb-buffer-verify.cc' || echo '$(srcdir)/'`hb-buffer-verify.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-buffer-verify.Tpo $(DEPDIR)/libharfbuzz_la-hb-buffer-verify.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-buffer-verify.cc' object='libharfbuzz_la-hb-buffer-verify.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-buffer-verify.lo `test -f 'hb-buffer-verify.cc' || echo '$(srcdir)/'`hb-buffer-verify.cc
+
 libharfbuzz_la-hb-buffer.lo: hb-buffer.cc
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-buffer.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-buffer.Tpo -c -o libharfbuzz_la-hb-buffer.lo `test -f 'hb-buffer.cc' || echo '$(srcdir)/'`hb-buffer.cc
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-buffer.Tpo $(DEPDIR)/libharfbuzz_la-hb-buffer.Plo
@@ -2328,6 +2401,13 @@ libharfbuzz_la-hb-ot-shape-complex-myanmar.lo: hb-ot-shape-complex-myanmar.cc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-myanmar.lo `test -f 'hb-ot-shape-complex-myanmar.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-myanmar.cc
 
+libharfbuzz_la-hb-ot-shape-complex-syllabic.lo: hb-ot-shape-complex-syllabic.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-syllabic.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-syllabic.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-syllabic.lo `test -f 'hb-ot-shape-complex-syllabic.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-syllabic.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-syllabic.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-syllabic.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-ot-shape-complex-syllabic.cc' object='libharfbuzz_la-hb-ot-shape-complex-syllabic.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-syllabic.lo `test -f 'hb-ot-shape-complex-syllabic.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-syllabic.cc
+
 libharfbuzz_la-hb-ot-shape-complex-thai.lo: hb-ot-shape-complex-thai.cc
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-thai.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-thai.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-thai.lo `test -f 'hb-ot-shape-complex-thai.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-thai.cc
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-thai.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-thai.Plo
@@ -2335,13 +2415,6 @@ libharfbuzz_la-hb-ot-shape-complex-thai.lo: hb-ot-shape-complex-thai.cc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-thai.lo `test -f 'hb-ot-shape-complex-thai.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-thai.cc
 
-libharfbuzz_la-hb-ot-shape-complex-use-table.lo: hb-ot-shape-complex-use-table.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-use-table.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use-table.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-use-table.lo `test -f 'hb-ot-shape-complex-use-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-use-table.cc
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use-table.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use-table.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-ot-shape-complex-use-table.cc' object='libharfbuzz_la-hb-ot-shape-complex-use-table.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-use-table.lo `test -f 'hb-ot-shape-complex-use-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-use-table.cc
-
 libharfbuzz_la-hb-ot-shape-complex-use.lo: hb-ot-shape-complex-use.cc
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-use.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-use.lo `test -f 'hb-ot-shape-complex-use.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-use.cc
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use.Plo
@@ -2426,6 +2499,13 @@ libharfbuzz_la-hb-static.lo: hb-static.cc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-static.lo `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
 
+libharfbuzz_la-hb-style.lo: hb-style.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-style.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-style.Tpo -c -o libharfbuzz_la-hb-style.lo `test -f 'hb-style.cc' || echo '$(srcdir)/'`hb-style.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-style.Tpo $(DEPDIR)/libharfbuzz_la-hb-style.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-style.cc' object='libharfbuzz_la-hb-style.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-style.lo `test -f 'hb-style.cc' || echo '$(srcdir)/'`hb-style.cc
+
 libharfbuzz_la-hb-ucd.lo: hb-ucd.cc
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ucd.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ucd.Tpo -c -o libharfbuzz_la-hb-ucd.lo `test -f 'hb-ucd.cc' || echo '$(srcdir)/'`hb-ucd.cc
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ucd.Tpo $(DEPDIR)/libharfbuzz_la-hb-ucd.Plo
@@ -2496,118 +2576,6 @@ libharfbuzz_la-hb-icu.lo: hb-icu.cc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-icu.lo `test -f 'hb-icu.cc' || echo '$(srcdir)/'`hb-icu.cc
 
-dump_indic_data-dump-indic-data.o: dump-indic-data.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_indic_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_indic_data-dump-indic-data.o -MD -MP -MF $(DEPDIR)/dump_indic_data-dump-indic-data.Tpo -c -o dump_indic_data-dump-indic-data.o `test -f 'dump-indic-data.cc' || echo '$(srcdir)/'`dump-indic-data.cc
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_indic_data-dump-indic-data.Tpo $(DEPDIR)/dump_indic_data-dump-indic-data.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='dump-indic-data.cc' object='dump_indic_data-dump-indic-data.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_indic_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_indic_data-dump-indic-data.o `test -f 'dump-indic-data.cc' || echo '$(srcdir)/'`dump-indic-data.cc
-
-dump_indic_data-dump-indic-data.obj: dump-indic-data.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_indic_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_indic_data-dump-indic-data.obj -MD -MP -MF $(DEPDIR)/dump_indic_data-dump-indic-data.Tpo -c -o dump_indic_data-dump-indic-data.obj `if test -f 'dump-indic-data.cc'; then $(CYGPATH_W) 'dump-indic-data.cc'; else $(CYGPATH_W) '$(srcdir)/dump-indic-data.cc'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_indic_data-dump-indic-data.Tpo $(DEPDIR)/dump_indic_data-dump-indic-data.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='dump-indic-data.cc' object='dump_indic_data-dump-indic-data.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_indic_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_indic_data-dump-indic-data.obj `if test -f 'dump-indic-data.cc'; then $(CYGPATH_W) 'dump-indic-data.cc'; else $(CYGPATH_W) '$(srcdir)/dump-indic-data.cc'; fi`
-
-dump_indic_data-hb-ot-shape-complex-indic-table.o: hb-ot-shape-complex-indic-table.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_indic_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_indic_data-hb-ot-shape-complex-indic-table.o -MD -MP -MF $(DEPDIR)/dump_indic_data-hb-ot-shape-complex-indic-table.Tpo -c -o dump_indic_data-hb-ot-shape-complex-indic-table.o `test -f 'hb-ot-shape-complex-indic-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-indic-table.cc
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_indic_data-hb-ot-shape-complex-indic-table.Tpo $(DEPDIR)/dump_indic_data-hb-ot-shape-complex-indic-table.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-ot-shape-complex-indic-table.cc' object='dump_indic_data-hb-ot-shape-complex-indic-table.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_indic_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_indic_data-hb-ot-shape-complex-indic-table.o `test -f 'hb-ot-shape-complex-indic-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-indic-table.cc
-
-dump_indic_data-hb-ot-shape-complex-indic-table.obj: hb-ot-shape-complex-indic-table.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_indic_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_indic_data-hb-ot-shape-complex-indic-table.obj -MD -MP -MF $(DEPDIR)/dump_indic_data-hb-ot-shape-complex-indic-table.Tpo -c -o dump_indic_data-hb-ot-shape-complex-indic-table.obj `if test -f 'hb-ot-shape-complex-indic-table.cc'; then $(CYGPATH_W) 'hb-ot-shape-complex-indic-table.cc'; else $(CYGPATH_W) '$(srcdir)/hb-ot-shape-complex-indic-table.cc'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_indic_data-hb-ot-shape-complex-indic-table.Tpo $(DEPDIR)/dump_indic_data-hb-ot-shape-complex-indic-table.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-ot-shape-complex-indic-table.cc' object='dump_indic_data-hb-ot-shape-complex-indic-table.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_indic_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_indic_data-hb-ot-shape-complex-indic-table.obj `if test -f 'hb-ot-shape-complex-indic-table.cc'; then $(CYGPATH_W) 'hb-ot-shape-complex-indic-table.cc'; else $(CYGPATH_W) '$(srcdir)/hb-ot-shape-complex-indic-table.cc'; fi`
-
-dump_khmer_data-dump-khmer-data.o: dump-khmer-data.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_khmer_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_khmer_data-dump-khmer-data.o -MD -MP -MF $(DEPDIR)/dump_khmer_data-dump-khmer-data.Tpo -c -o dump_khmer_data-dump-khmer-data.o `test -f 'dump-khmer-data.cc' || echo '$(srcdir)/'`dump-khmer-data.cc
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_khmer_data-dump-khmer-data.Tpo $(DEPDIR)/dump_khmer_data-dump-khmer-data.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='dump-khmer-data.cc' object='dump_khmer_data-dump-khmer-data.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_khmer_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_khmer_data-dump-khmer-data.o `test -f 'dump-khmer-data.cc' || echo '$(srcdir)/'`dump-khmer-data.cc
-
-dump_khmer_data-dump-khmer-data.obj: dump-khmer-data.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_khmer_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_khmer_data-dump-khmer-data.obj -MD -MP -MF $(DEPDIR)/dump_khmer_data-dump-khmer-data.Tpo -c -o dump_khmer_data-dump-khmer-data.obj `if test -f 'dump-khmer-data.cc'; then $(CYGPATH_W) 'dump-khmer-data.cc'; else $(CYGPATH_W) '$(srcdir)/dump-khmer-data.cc'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_khmer_data-dump-khmer-data.Tpo $(DEPDIR)/dump_khmer_data-dump-khmer-data.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='dump-khmer-data.cc' object='dump_khmer_data-dump-khmer-data.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_khmer_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_khmer_data-dump-khmer-data.obj `if test -f 'dump-khmer-data.cc'; then $(CYGPATH_W) 'dump-khmer-data.cc'; else $(CYGPATH_W) '$(srcdir)/dump-khmer-data.cc'; fi`
-
-dump_khmer_data-hb-ot-shape-complex-indic-table.o: hb-ot-shape-complex-indic-table.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_khmer_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_khmer_data-hb-ot-shape-complex-indic-table.o -MD -MP -MF $(DEPDIR)/dump_khmer_data-hb-ot-shape-complex-indic-table.Tpo -c -o dump_khmer_data-hb-ot-shape-complex-indic-table.o `test -f 'hb-ot-shape-complex-indic-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-indic-table.cc
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_khmer_data-hb-ot-shape-complex-indic-table.Tpo $(DEPDIR)/dump_khmer_data-hb-ot-shape-complex-indic-table.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-ot-shape-complex-indic-table.cc' object='dump_khmer_data-hb-ot-shape-complex-indic-table.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_khmer_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_khmer_data-hb-ot-shape-complex-indic-table.o `test -f 'hb-ot-shape-complex-indic-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-indic-table.cc
-
-dump_khmer_data-hb-ot-shape-complex-indic-table.obj: hb-ot-shape-complex-indic-table.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_khmer_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_khmer_data-hb-ot-shape-complex-indic-table.obj -MD -MP -MF $(DEPDIR)/dump_khmer_data-hb-ot-shape-complex-indic-table.Tpo -c -o dump_khmer_data-hb-ot-shape-complex-indic-table.obj `if test -f 'hb-ot-shape-complex-indic-table.cc'; then $(CYGPATH_W) 'hb-ot-shape-complex-indic-table.cc'; else $(CYGPATH_W) '$(srcdir)/hb-ot-shape-complex-indic-table.cc'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_khmer_data-hb-ot-shape-complex-indic-table.Tpo $(DEPDIR)/dump_khmer_data-hb-ot-shape-complex-indic-table.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-ot-shape-complex-indic-table.cc' object='dump_khmer_data-hb-ot-shape-complex-indic-table.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_khmer_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_khmer_data-hb-ot-shape-complex-indic-table.obj `if test -f 'hb-ot-shape-complex-indic-table.cc'; then $(CYGPATH_W) 'hb-ot-shape-complex-indic-table.cc'; else $(CYGPATH_W) '$(srcdir)/hb-ot-shape-complex-indic-table.cc'; fi`
-
-dump_myanmar_data-dump-myanmar-data.o: dump-myanmar-data.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_myanmar_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_myanmar_data-dump-myanmar-data.o -MD -MP -MF $(DEPDIR)/dump_myanmar_data-dump-myanmar-data.Tpo -c -o dump_myanmar_data-dump-myanmar-data.o `test -f 'dump-myanmar-data.cc' || echo '$(srcdir)/'`dump-myanmar-data.cc
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_myanmar_data-dump-myanmar-data.Tpo $(DEPDIR)/dump_myanmar_data-dump-myanmar-data.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='dump-myanmar-data.cc' object='dump_myanmar_data-dump-myanmar-data.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_myanmar_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_myanmar_data-dump-myanmar-data.o `test -f 'dump-myanmar-data.cc' || echo '$(srcdir)/'`dump-myanmar-data.cc
-
-dump_myanmar_data-dump-myanmar-data.obj: dump-myanmar-data.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_myanmar_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_myanmar_data-dump-myanmar-data.obj -MD -MP -MF $(DEPDIR)/dump_myanmar_data-dump-myanmar-data.Tpo -c -o dump_myanmar_data-dump-myanmar-data.obj `if test -f 'dump-myanmar-data.cc'; then $(CYGPATH_W) 'dump-myanmar-data.cc'; else $(CYGPATH_W) '$(srcdir)/dump-myanmar-data.cc'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_myanmar_data-dump-myanmar-data.Tpo $(DEPDIR)/dump_myanmar_data-dump-myanmar-data.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='dump-myanmar-data.cc' object='dump_myanmar_data-dump-myanmar-data.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_myanmar_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_myanmar_data-dump-myanmar-data.obj `if test -f 'dump-myanmar-data.cc'; then $(CYGPATH_W) 'dump-myanmar-data.cc'; else $(CYGPATH_W) '$(srcdir)/dump-myanmar-data.cc'; fi`
-
-dump_myanmar_data-hb-ot-shape-complex-indic-table.o: hb-ot-shape-complex-indic-table.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_myanmar_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_myanmar_data-hb-ot-shape-complex-indic-table.o -MD -MP -MF $(DEPDIR)/dump_myanmar_data-hb-ot-shape-complex-indic-table.Tpo -c -o dump_myanmar_data-hb-ot-shape-complex-indic-table.o `test -f 'hb-ot-shape-complex-indic-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-indic-table.cc
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_myanmar_data-hb-ot-shape-complex-indic-table.Tpo $(DEPDIR)/dump_myanmar_data-hb-ot-shape-complex-indic-table.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-ot-shape-complex-indic-table.cc' object='dump_myanmar_data-hb-ot-shape-complex-indic-table.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_myanmar_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_myanmar_data-hb-ot-shape-complex-indic-table.o `test -f 'hb-ot-shape-complex-indic-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-indic-table.cc
-
-dump_myanmar_data-hb-ot-shape-complex-indic-table.obj: hb-ot-shape-complex-indic-table.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_myanmar_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_myanmar_data-hb-ot-shape-complex-indic-table.obj -MD -MP -MF $(DEPDIR)/dump_myanmar_data-hb-ot-shape-complex-indic-table.Tpo -c -o dump_myanmar_data-hb-ot-shape-complex-indic-table.obj `if test -f 'hb-ot-shape-complex-indic-table.cc'; then $(CYGPATH_W) 'hb-ot-shape-complex-indic-table.cc'; else $(CYGPATH_W) '$(srcdir)/hb-ot-shape-complex-indic-table.cc'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_myanmar_data-hb-ot-shape-complex-indic-table.Tpo $(DEPDIR)/dump_myanmar_data-hb-ot-shape-complex-indic-table.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-ot-shape-complex-indic-table.cc' object='dump_myanmar_data-hb-ot-shape-complex-indic-table.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_myanmar_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_myanmar_data-hb-ot-shape-complex-indic-table.obj `if test -f 'hb-ot-shape-complex-indic-table.cc'; then $(CYGPATH_W) 'hb-ot-shape-complex-indic-table.cc'; else $(CYGPATH_W) '$(srcdir)/hb-ot-shape-complex-indic-table.cc'; fi`
-
-dump_use_data-dump-use-data.o: dump-use-data.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_use_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_use_data-dump-use-data.o -MD -MP -MF $(DEPDIR)/dump_use_data-dump-use-data.Tpo -c -o dump_use_data-dump-use-data.o `test -f 'dump-use-data.cc' || echo '$(srcdir)/'`dump-use-data.cc
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_use_data-dump-use-data.Tpo $(DEPDIR)/dump_use_data-dump-use-data.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='dump-use-data.cc' object='dump_use_data-dump-use-data.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_use_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_use_data-dump-use-data.o `test -f 'dump-use-data.cc' || echo '$(srcdir)/'`dump-use-data.cc
-
-dump_use_data-dump-use-data.obj: dump-use-data.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_use_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_use_data-dump-use-data.obj -MD -MP -MF $(DEPDIR)/dump_use_data-dump-use-data.Tpo -c -o dump_use_data-dump-use-data.obj `if test -f 'dump-use-data.cc'; then $(CYGPATH_W) 'dump-use-data.cc'; else $(CYGPATH_W) '$(srcdir)/dump-use-data.cc'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_use_data-dump-use-data.Tpo $(DEPDIR)/dump_use_data-dump-use-data.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='dump-use-data.cc' object='dump_use_data-dump-use-data.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_use_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_use_data-dump-use-data.obj `if test -f 'dump-use-data.cc'; then $(CYGPATH_W) 'dump-use-data.cc'; else $(CYGPATH_W) '$(srcdir)/dump-use-data.cc'; fi`
-
-dump_use_data-hb-ot-shape-complex-use-table.o: hb-ot-shape-complex-use-table.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_use_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_use_data-hb-ot-shape-complex-use-table.o -MD -MP -MF $(DEPDIR)/dump_use_data-hb-ot-shape-complex-use-table.Tpo -c -o dump_use_data-hb-ot-shape-complex-use-table.o `test -f 'hb-ot-shape-complex-use-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-use-table.cc
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_use_data-hb-ot-shape-complex-use-table.Tpo $(DEPDIR)/dump_use_data-hb-ot-shape-complex-use-table.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-ot-shape-complex-use-table.cc' object='dump_use_data-hb-ot-shape-complex-use-table.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_use_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_use_data-hb-ot-shape-complex-use-table.o `test -f 'hb-ot-shape-complex-use-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-use-table.cc
-
-dump_use_data-hb-ot-shape-complex-use-table.obj: hb-ot-shape-complex-use-table.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_use_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dump_use_data-hb-ot-shape-complex-use-table.obj -MD -MP -MF $(DEPDIR)/dump_use_data-hb-ot-shape-complex-use-table.Tpo -c -o dump_use_data-hb-ot-shape-complex-use-table.obj `if test -f 'hb-ot-shape-complex-use-table.cc'; then $(CYGPATH_W) 'hb-ot-shape-complex-use-table.cc'; else $(CYGPATH_W) '$(srcdir)/hb-ot-shape-complex-use-table.cc'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/dump_use_data-hb-ot-shape-complex-use-table.Tpo $(DEPDIR)/dump_use_data-hb-ot-shape-complex-use-table.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-ot-shape-complex-use-table.cc' object='dump_use_data-hb-ot-shape-complex-use-table.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dump_use_data_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dump_use_data-hb-ot-shape-complex-use-table.obj `if test -f 'hb-ot-shape-complex-use-table.cc'; then $(CYGPATH_W) 'hb-ot-shape-complex-use-table.cc'; else $(CYGPATH_W) '$(srcdir)/hb-ot-shape-complex-use-table.cc'; fi`
-
 main-main.o: main.cc
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(main_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT main-main.o -MD -MP -MF $(DEPDIR)/main-main.Tpo -c -o main-main.o `test -f 'main.cc' || echo '$(srcdir)/'`main.cc
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/main-main.Tpo $(DEPDIR)/main-main.Po
@@ -2776,33 +2744,61 @@ test_iter-hb-static.obj: hb-static.cc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_iter_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_iter-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
 
-test_meta-test-meta.o: test-meta.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_meta_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_meta-test-meta.o -MD -MP -MF $(DEPDIR)/test_meta-test-meta.Tpo -c -o test_meta-test-meta.o `test -f 'test-meta.cc' || echo '$(srcdir)/'`test-meta.cc
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_meta-test-meta.Tpo $(DEPDIR)/test_meta-test-meta.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-meta.cc' object='test_meta-test-meta.o' libtool=no @AMDEPBACKSLASH@
+test_machinery-test-machinery.o: test-machinery.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_machinery_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_machinery-test-machinery.o -MD -MP -MF $(DEPDIR)/test_machinery-test-machinery.Tpo -c -o test_machinery-test-machinery.o `test -f 'test-machinery.cc' || echo '$(srcdir)/'`test-machinery.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_machinery-test-machinery.Tpo $(DEPDIR)/test_machinery-test-machinery.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-machinery.cc' object='test_machinery-test-machinery.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_machinery_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_machinery-test-machinery.o `test -f 'test-machinery.cc' || echo '$(srcdir)/'`test-machinery.cc
+
+test_machinery-test-machinery.obj: test-machinery.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_machinery_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_machinery-test-machinery.obj -MD -MP -MF $(DEPDIR)/test_machinery-test-machinery.Tpo -c -o test_machinery-test-machinery.obj `if test -f 'test-machinery.cc'; then $(CYGPATH_W) 'test-machinery.cc'; else $(CYGPATH_W) '$(srcdir)/test-machinery.cc'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_machinery-test-machinery.Tpo $(DEPDIR)/test_machinery-test-machinery.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-machinery.cc' object='test_machinery-test-machinery.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_machinery_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_machinery-test-machinery.obj `if test -f 'test-machinery.cc'; then $(CYGPATH_W) 'test-machinery.cc'; else $(CYGPATH_W) '$(srcdir)/test-machinery.cc'; fi`
+
+test_machinery-hb-static.o: hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_machinery_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_machinery-hb-static.o -MD -MP -MF $(DEPDIR)/test_machinery-hb-static.Tpo -c -o test_machinery-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_machinery-hb-static.Tpo $(DEPDIR)/test_machinery-hb-static.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_machinery-hb-static.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_meta_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_meta-test-meta.o `test -f 'test-meta.cc' || echo '$(srcdir)/'`test-meta.cc
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_machinery_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_machinery-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
 
-test_meta-test-meta.obj: test-meta.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_meta_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_meta-test-meta.obj -MD -MP -MF $(DEPDIR)/test_meta-test-meta.Tpo -c -o test_meta-test-meta.obj `if test -f 'test-meta.cc'; then $(CYGPATH_W) 'test-meta.cc'; else $(CYGPATH_W) '$(srcdir)/test-meta.cc'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_meta-test-meta.Tpo $(DEPDIR)/test_meta-test-meta.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-meta.cc' object='test_meta-test-meta.obj' libtool=no @AMDEPBACKSLASH@
+test_machinery-hb-static.obj: hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_machinery_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_machinery-hb-static.obj -MD -MP -MF $(DEPDIR)/test_machinery-hb-static.Tpo -c -o test_machinery-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_machinery-hb-static.Tpo $(DEPDIR)/test_machinery-hb-static.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_machinery-hb-static.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_meta_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_meta-test-meta.obj `if test -f 'test-meta.cc'; then $(CYGPATH_W) 'test-meta.cc'; else $(CYGPATH_W) '$(srcdir)/test-meta.cc'; fi`
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_machinery_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_machinery-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
 
-test_meta-hb-static.o: hb-static.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_meta_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_meta-hb-static.o -MD -MP -MF $(DEPDIR)/test_meta-hb-static.Tpo -c -o test_meta-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_meta-hb-static.Tpo $(DEPDIR)/test_meta-hb-static.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_meta-hb-static.o' libtool=no @AMDEPBACKSLASH@
+test_map-test-map.o: test-map.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_map_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_map-test-map.o -MD -MP -MF $(DEPDIR)/test_map-test-map.Tpo -c -o test_map-test-map.o `test -f 'test-map.cc' || echo '$(srcdir)/'`test-map.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_map-test-map.Tpo $(DEPDIR)/test_map-test-map.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-map.cc' object='test_map-test-map.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_meta_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_meta-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_map_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_map-test-map.o `test -f 'test-map.cc' || echo '$(srcdir)/'`test-map.cc
 
-test_meta-hb-static.obj: hb-static.cc
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_meta_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_meta-hb-static.obj -MD -MP -MF $(DEPDIR)/test_meta-hb-static.Tpo -c -o test_meta-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_meta-hb-static.Tpo $(DEPDIR)/test_meta-hb-static.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_meta-hb-static.obj' libtool=no @AMDEPBACKSLASH@
+test_map-test-map.obj: test-map.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_map_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_map-test-map.obj -MD -MP -MF $(DEPDIR)/test_map-test-map.Tpo -c -o test_map-test-map.obj `if test -f 'test-map.cc'; then $(CYGPATH_W) 'test-map.cc'; else $(CYGPATH_W) '$(srcdir)/test-map.cc'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_map-test-map.Tpo $(DEPDIR)/test_map-test-map.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-map.cc' object='test_map-test-map.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_meta_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_meta-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_map_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_map-test-map.obj `if test -f 'test-map.cc'; then $(CYGPATH_W) 'test-map.cc'; else $(CYGPATH_W) '$(srcdir)/test-map.cc'; fi`
+
+test_map-hb-static.o: hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_map_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_map-hb-static.o -MD -MP -MF $(DEPDIR)/test_map-hb-static.Tpo -c -o test_map-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_map-hb-static.Tpo $(DEPDIR)/test_map-hb-static.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_map-hb-static.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_map_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_map-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
+
+test_map-hb-static.obj: hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_map_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_map-hb-static.obj -MD -MP -MF $(DEPDIR)/test_map-hb-static.Tpo -c -o test_map-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_map-hb-static.Tpo $(DEPDIR)/test_map-hb-static.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_map-hb-static.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_map_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_map-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
 
 test_number-test-number.o: test-number.cc
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_number_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_number-test-number.o -MD -MP -MF $(DEPDIR)/test_number-test-number.Tpo -c -o test_number-test-number.o `test -f 'test-number.cc' || echo '$(srcdir)/'`test-number.cc
@@ -2888,6 +2884,118 @@ test_ot_tag-hb-ot-tag.obj: hb-ot-tag.cc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ot_tag_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_ot_tag-hb-ot-tag.obj `if test -f 'hb-ot-tag.cc'; then $(CYGPATH_W) 'hb-ot-tag.cc'; else $(CYGPATH_W) '$(srcdir)/hb-ot-tag.cc'; fi`
 
+test_priority_queue-test-priority-queue.o: test-priority-queue.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_priority_queue_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_priority_queue-test-priority-queue.o -MD -MP -MF $(DEPDIR)/test_priority_queue-test-priority-queue.Tpo -c -o test_priority_queue-test-priority-queue.o `test -f 'test-priority-queue.cc' || echo '$(srcdir)/'`test-priority-queue.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_priority_queue-test-priority-queue.Tpo $(DEPDIR)/test_priority_queue-test-priority-queue.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-priority-queue.cc' object='test_priority_queue-test-priority-queue.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_priority_queue_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_priority_queue-test-priority-queue.o `test -f 'test-priority-queue.cc' || echo '$(srcdir)/'`test-priority-queue.cc
+
+test_priority_queue-test-priority-queue.obj: test-priority-queue.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_priority_queue_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_priority_queue-test-priority-queue.obj -MD -MP -MF $(DEPDIR)/test_priority_queue-test-priority-queue.Tpo -c -o test_priority_queue-test-priority-queue.obj `if test -f 'test-priority-queue.cc'; then $(CYGPATH_W) 'test-priority-queue.cc'; else $(CYGPATH_W) '$(srcdir)/test-priority-queue.cc'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_priority_queue-test-priority-queue.Tpo $(DEPDIR)/test_priority_queue-test-priority-queue.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-priority-queue.cc' object='test_priority_queue-test-priority-queue.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_priority_queue_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_priority_queue-test-priority-queue.obj `if test -f 'test-priority-queue.cc'; then $(CYGPATH_W) 'test-priority-queue.cc'; else $(CYGPATH_W) '$(srcdir)/test-priority-queue.cc'; fi`
+
+test_priority_queue-hb-static.o: hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_priority_queue_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_priority_queue-hb-static.o -MD -MP -MF $(DEPDIR)/test_priority_queue-hb-static.Tpo -c -o test_priority_queue-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_priority_queue-hb-static.Tpo $(DEPDIR)/test_priority_queue-hb-static.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_priority_queue-hb-static.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_priority_queue_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_priority_queue-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
+
+test_priority_queue-hb-static.obj: hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_priority_queue_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_priority_queue-hb-static.obj -MD -MP -MF $(DEPDIR)/test_priority_queue-hb-static.Tpo -c -o test_priority_queue-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_priority_queue-hb-static.Tpo $(DEPDIR)/test_priority_queue-hb-static.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_priority_queue-hb-static.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_priority_queue_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_priority_queue-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
+
+test_repacker-test-repacker.o: test-repacker.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_repacker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_repacker-test-repacker.o -MD -MP -MF $(DEPDIR)/test_repacker-test-repacker.Tpo -c -o test_repacker-test-repacker.o `test -f 'test-repacker.cc' || echo '$(srcdir)/'`test-repacker.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_repacker-test-repacker.Tpo $(DEPDIR)/test_repacker-test-repacker.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-repacker.cc' object='test_repacker-test-repacker.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_repacker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_repacker-test-repacker.o `test -f 'test-repacker.cc' || echo '$(srcdir)/'`test-repacker.cc
+
+test_repacker-test-repacker.obj: test-repacker.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_repacker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_repacker-test-repacker.obj -MD -MP -MF $(DEPDIR)/test_repacker-test-repacker.Tpo -c -o test_repacker-test-repacker.obj `if test -f 'test-repacker.cc'; then $(CYGPATH_W) 'test-repacker.cc'; else $(CYGPATH_W) '$(srcdir)/test-repacker.cc'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_repacker-test-repacker.Tpo $(DEPDIR)/test_repacker-test-repacker.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-repacker.cc' object='test_repacker-test-repacker.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_repacker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_repacker-test-repacker.obj `if test -f 'test-repacker.cc'; then $(CYGPATH_W) 'test-repacker.cc'; else $(CYGPATH_W) '$(srcdir)/test-repacker.cc'; fi`
+
+test_repacker-hb-static.o: hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_repacker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_repacker-hb-static.o -MD -MP -MF $(DEPDIR)/test_repacker-hb-static.Tpo -c -o test_repacker-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_repacker-hb-static.Tpo $(DEPDIR)/test_repacker-hb-static.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_repacker-hb-static.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_repacker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_repacker-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
+
+test_repacker-hb-static.obj: hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_repacker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_repacker-hb-static.obj -MD -MP -MF $(DEPDIR)/test_repacker-hb-static.Tpo -c -o test_repacker-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_repacker-hb-static.Tpo $(DEPDIR)/test_repacker-hb-static.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_repacker-hb-static.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_repacker_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_repacker-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
+
+test_serialize-test-serialize.o: test-serialize.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_serialize_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_serialize-test-serialize.o -MD -MP -MF $(DEPDIR)/test_serialize-test-serialize.Tpo -c -o test_serialize-test-serialize.o `test -f 'test-serialize.cc' || echo '$(srcdir)/'`test-serialize.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_serialize-test-serialize.Tpo $(DEPDIR)/test_serialize-test-serialize.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-serialize.cc' object='test_serialize-test-serialize.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_serialize_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_serialize-test-serialize.o `test -f 'test-serialize.cc' || echo '$(srcdir)/'`test-serialize.cc
+
+test_serialize-test-serialize.obj: test-serialize.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_serialize_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_serialize-test-serialize.obj -MD -MP -MF $(DEPDIR)/test_serialize-test-serialize.Tpo -c -o test_serialize-test-serialize.obj `if test -f 'test-serialize.cc'; then $(CYGPATH_W) 'test-serialize.cc'; else $(CYGPATH_W) '$(srcdir)/test-serialize.cc'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_serialize-test-serialize.Tpo $(DEPDIR)/test_serialize-test-serialize.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-serialize.cc' object='test_serialize-test-serialize.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_serialize_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_serialize-test-serialize.obj `if test -f 'test-serialize.cc'; then $(CYGPATH_W) 'test-serialize.cc'; else $(CYGPATH_W) '$(srcdir)/test-serialize.cc'; fi`
+
+test_serialize-hb-static.o: hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_serialize_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_serialize-hb-static.o -MD -MP -MF $(DEPDIR)/test_serialize-hb-static.Tpo -c -o test_serialize-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_serialize-hb-static.Tpo $(DEPDIR)/test_serialize-hb-static.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_serialize-hb-static.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_serialize_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_serialize-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
+
+test_serialize-hb-static.obj: hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_serialize_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_serialize-hb-static.obj -MD -MP -MF $(DEPDIR)/test_serialize-hb-static.Tpo -c -o test_serialize-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_serialize-hb-static.Tpo $(DEPDIR)/test_serialize-hb-static.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_serialize-hb-static.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_serialize_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_serialize-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
+
+test_set-test-set.o: test-set.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_set_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_set-test-set.o -MD -MP -MF $(DEPDIR)/test_set-test-set.Tpo -c -o test_set-test-set.o `test -f 'test-set.cc' || echo '$(srcdir)/'`test-set.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_set-test-set.Tpo $(DEPDIR)/test_set-test-set.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-set.cc' object='test_set-test-set.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_set_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_set-test-set.o `test -f 'test-set.cc' || echo '$(srcdir)/'`test-set.cc
+
+test_set-test-set.obj: test-set.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_set_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_set-test-set.obj -MD -MP -MF $(DEPDIR)/test_set-test-set.Tpo -c -o test_set-test-set.obj `if test -f 'test-set.cc'; then $(CYGPATH_W) 'test-set.cc'; else $(CYGPATH_W) '$(srcdir)/test-set.cc'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_set-test-set.Tpo $(DEPDIR)/test_set-test-set.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-set.cc' object='test_set-test-set.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_set_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_set-test-set.obj `if test -f 'test-set.cc'; then $(CYGPATH_W) 'test-set.cc'; else $(CYGPATH_W) '$(srcdir)/test-set.cc'; fi`
+
+test_set-hb-static.o: hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_set_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_set-hb-static.o -MD -MP -MF $(DEPDIR)/test_set-hb-static.Tpo -c -o test_set-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_set-hb-static.Tpo $(DEPDIR)/test_set-hb-static.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_set-hb-static.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_set_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_set-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
+
+test_set-hb-static.obj: hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_set_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_set-hb-static.obj -MD -MP -MF $(DEPDIR)/test_set-hb-static.Tpo -c -o test_set-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_set-hb-static.Tpo $(DEPDIR)/test_set-hb-static.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_set-hb-static.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_set_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_set-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
+
 test_unicode_ranges-test-unicode-ranges.o: test-unicode-ranges.cc
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_unicode_ranges_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_unicode_ranges-test-unicode-ranges.o -MD -MP -MF $(DEPDIR)/test_unicode_ranges-test-unicode-ranges.Tpo -c -o test_unicode_ranges-test-unicode-ranges.o `test -f 'test-unicode-ranges.cc' || echo '$(srcdir)/'`test-unicode-ranges.cc
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_unicode_ranges-test-unicode-ranges.Tpo $(DEPDIR)/test_unicode_ranges-test-unicode-ranges.Po
@@ -2902,6 +3010,34 @@ test_unicode_ranges-test-unicode-ranges.obj: test-unicode-ranges.cc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_unicode_ranges_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_unicode_ranges-test-unicode-ranges.obj `if test -f 'test-unicode-ranges.cc'; then $(CYGPATH_W) 'test-unicode-ranges.cc'; else $(CYGPATH_W) '$(srcdir)/test-unicode-ranges.cc'; fi`
 
+test_vector-test-vector.o: test-vector.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vector_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_vector-test-vector.o -MD -MP -MF $(DEPDIR)/test_vector-test-vector.Tpo -c -o test_vector-test-vector.o `test -f 'test-vector.cc' || echo '$(srcdir)/'`test-vector.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_vector-test-vector.Tpo $(DEPDIR)/test_vector-test-vector.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-vector.cc' object='test_vector-test-vector.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vector_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_vector-test-vector.o `test -f 'test-vector.cc' || echo '$(srcdir)/'`test-vector.cc
+
+test_vector-test-vector.obj: test-vector.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vector_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_vector-test-vector.obj -MD -MP -MF $(DEPDIR)/test_vector-test-vector.Tpo -c -o test_vector-test-vector.obj `if test -f 'test-vector.cc'; then $(CYGPATH_W) 'test-vector.cc'; else $(CYGPATH_W) '$(srcdir)/test-vector.cc'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_vector-test-vector.Tpo $(DEPDIR)/test_vector-test-vector.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test-vector.cc' object='test_vector-test-vector.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vector_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_vector-test-vector.obj `if test -f 'test-vector.cc'; then $(CYGPATH_W) 'test-vector.cc'; else $(CYGPATH_W) '$(srcdir)/test-vector.cc'; fi`
+
+test_vector-hb-static.o: hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vector_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_vector-hb-static.o -MD -MP -MF $(DEPDIR)/test_vector-hb-static.Tpo -c -o test_vector-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_vector-hb-static.Tpo $(DEPDIR)/test_vector-hb-static.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_vector-hb-static.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vector_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_vector-hb-static.o `test -f 'hb-static.cc' || echo '$(srcdir)/'`hb-static.cc
+
+test_vector-hb-static.obj: hb-static.cc
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vector_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_vector-hb-static.obj -MD -MP -MF $(DEPDIR)/test_vector-hb-static.Tpo -c -o test_vector-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/test_vector-hb-static.Tpo $(DEPDIR)/test_vector-hb-static.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='hb-static.cc' object='test_vector-hb-static.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_vector_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_vector-hb-static.obj `if test -f 'hb-static.cc'; then $(CYGPATH_W) 'hb-static.cc'; else $(CYGPATH_W) '$(srcdir)/hb-static.cc'; fi`
+
 mostlyclean-libtool:
        -rm -f *.lo
 
@@ -3288,6 +3424,13 @@ test-array.log: test-array$(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-bimap.log: test-bimap$(EXEEXT)
+       @p='test-bimap$(EXEEXT)'; \
+       b='test-bimap'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
 test-iter.log: test-iter$(EXEEXT)
        @p='test-iter$(EXEEXT)'; \
        b='test-iter'; \
@@ -3295,9 +3438,16 @@ test-iter.log: test-iter$(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-meta.log: test-meta$(EXEEXT)
-       @p='test-meta$(EXEEXT)'; \
-       b='test-meta'; \
+test-machinery.log: test-machinery$(EXEEXT)
+       @p='test-machinery$(EXEEXT)'; \
+       b='test-machinery'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.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) \
@@ -3316,6 +3466,27 @@ 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-priority-queue.log: test-priority-queue$(EXEEXT)
+       @p='test-priority-queue$(EXEEXT)'; \
+       b='test-priority-queue'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.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'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-serialize.log: test-serialize$(EXEEXT)
+       @p='test-serialize$(EXEEXT)'; \
+       b='test-serialize'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.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-ranges.log: test-unicode-ranges$(EXEEXT)
        @p='test-unicode-ranges$(EXEEXT)'; \
        b='test-unicode-ranges'; \
@@ -3323,9 +3494,16 @@ test-unicode-ranges.log: test-unicode-ranges$(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-bimap.log: test-bimap$(EXEEXT)
-       @p='test-bimap$(EXEEXT)'; \
-       b='test-bimap'; \
+test-vector.log: test-vector$(EXEEXT)
+       @p='test-vector$(EXEEXT)'; \
+       b='test-vector'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-repacker.log: test-repacker$(EXEEXT)
+       @p='test-repacker$(EXEEXT)'; \
+       b='test-repacker'; \
        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
        --log-file $$b.log --trs-file $$b.trs \
        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -3511,21 +3689,14 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
        mostlyclean-am
 
 distclean: distclean-recursive
-               -rm -f ./$(DEPDIR)/dump_indic_data-dump-indic-data.Po
-       -rm -f ./$(DEPDIR)/dump_indic_data-hb-ot-shape-complex-indic-table.Po
-       -rm -f ./$(DEPDIR)/dump_khmer_data-dump-khmer-data.Po
-       -rm -f ./$(DEPDIR)/dump_khmer_data-hb-ot-shape-complex-indic-table.Po
-       -rm -f ./$(DEPDIR)/dump_myanmar_data-dump-myanmar-data.Po
-       -rm -f ./$(DEPDIR)/dump_myanmar_data-hb-ot-shape-complex-indic-table.Po
-       -rm -f ./$(DEPDIR)/dump_use_data-dump-use-data.Po
-       -rm -f ./$(DEPDIR)/dump_use_data-hb-ot-shape-complex-use-table.Po
-       -rm -f ./$(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-enums.Plo
+               -rm -f ./$(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-enums.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-structs.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_icu_la-hb-icu.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-aat-layout.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-aat-map.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-blob.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-buffer-serialize.Plo
+       -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-buffer-verify.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-buffer.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-common.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-coretext.Plo
@@ -3560,8 +3731,8 @@ distclean: distclean-recursive
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-indic.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-khmer.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-myanmar.Plo
+       -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-syllabic.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-thai.Plo
-       -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use-table.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-vowel-constraints.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-fallback.Plo
@@ -3574,6 +3745,7 @@ distclean: distclean-recursive
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-shape.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-shaper.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-static.Plo
+       -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-style.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ucd.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-unicode.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-uniscribe.Plo
@@ -3599,15 +3771,27 @@ distclean: distclean-recursive
        -rm -f ./$(DEPDIR)/test_gsub_would_substitute-test-gsub-would-substitute.Po
        -rm -f ./$(DEPDIR)/test_iter-hb-static.Po
        -rm -f ./$(DEPDIR)/test_iter-test-iter.Po
-       -rm -f ./$(DEPDIR)/test_meta-hb-static.Po
-       -rm -f ./$(DEPDIR)/test_meta-test-meta.Po
+       -rm -f ./$(DEPDIR)/test_machinery-hb-static.Po
+       -rm -f ./$(DEPDIR)/test_machinery-test-machinery.Po
+       -rm -f ./$(DEPDIR)/test_map-hb-static.Po
+       -rm -f ./$(DEPDIR)/test_map-test-map.Po
        -rm -f ./$(DEPDIR)/test_number-hb-number.Po
        -rm -f ./$(DEPDIR)/test_number-test-number.Po
        -rm -f ./$(DEPDIR)/test_ot_glyphname-test-ot-glyphname.Po
        -rm -f ./$(DEPDIR)/test_ot_meta-test-ot-meta.Po
        -rm -f ./$(DEPDIR)/test_ot_name-test-ot-name.Po
        -rm -f ./$(DEPDIR)/test_ot_tag-hb-ot-tag.Po
+       -rm -f ./$(DEPDIR)/test_priority_queue-hb-static.Po
+       -rm -f ./$(DEPDIR)/test_priority_queue-test-priority-queue.Po
+       -rm -f ./$(DEPDIR)/test_repacker-hb-static.Po
+       -rm -f ./$(DEPDIR)/test_repacker-test-repacker.Po
+       -rm -f ./$(DEPDIR)/test_serialize-hb-static.Po
+       -rm -f ./$(DEPDIR)/test_serialize-test-serialize.Po
+       -rm -f ./$(DEPDIR)/test_set-hb-static.Po
+       -rm -f ./$(DEPDIR)/test_set-test-set.Po
        -rm -f ./$(DEPDIR)/test_unicode_ranges-test-unicode-ranges.Po
+       -rm -f ./$(DEPDIR)/test_vector-hb-static.Po
+       -rm -f ./$(DEPDIR)/test_vector-test-vector.Po
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-tags
@@ -3655,21 +3839,14 @@ install-ps-am:
 installcheck-am: installcheck-binPROGRAMS
 
 maintainer-clean: maintainer-clean-recursive
-               -rm -f ./$(DEPDIR)/dump_indic_data-dump-indic-data.Po
-       -rm -f ./$(DEPDIR)/dump_indic_data-hb-ot-shape-complex-indic-table.Po
-       -rm -f ./$(DEPDIR)/dump_khmer_data-dump-khmer-data.Po
-       -rm -f ./$(DEPDIR)/dump_khmer_data-hb-ot-shape-complex-indic-table.Po
-       -rm -f ./$(DEPDIR)/dump_myanmar_data-dump-myanmar-data.Po
-       -rm -f ./$(DEPDIR)/dump_myanmar_data-hb-ot-shape-complex-indic-table.Po
-       -rm -f ./$(DEPDIR)/dump_use_data-dump-use-data.Po
-       -rm -f ./$(DEPDIR)/dump_use_data-hb-ot-shape-complex-use-table.Po
-       -rm -f ./$(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-enums.Plo
+               -rm -f ./$(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-enums.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-structs.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_icu_la-hb-icu.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-aat-layout.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-aat-map.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-blob.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-buffer-serialize.Plo
+       -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-buffer-verify.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-buffer.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-common.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-coretext.Plo
@@ -3704,8 +3881,8 @@ maintainer-clean: maintainer-clean-recursive
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-indic.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-khmer.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-myanmar.Plo
+       -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-syllabic.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-thai.Plo
-       -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use-table.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-vowel-constraints.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-fallback.Plo
@@ -3718,6 +3895,7 @@ maintainer-clean: maintainer-clean-recursive
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-shape.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-shaper.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-static.Plo
+       -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-style.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-ucd.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-unicode.Plo
        -rm -f ./$(DEPDIR)/libharfbuzz_la-hb-uniscribe.Plo
@@ -3743,15 +3921,27 @@ maintainer-clean: maintainer-clean-recursive
        -rm -f ./$(DEPDIR)/test_gsub_would_substitute-test-gsub-would-substitute.Po
        -rm -f ./$(DEPDIR)/test_iter-hb-static.Po
        -rm -f ./$(DEPDIR)/test_iter-test-iter.Po
-       -rm -f ./$(DEPDIR)/test_meta-hb-static.Po
-       -rm -f ./$(DEPDIR)/test_meta-test-meta.Po
+       -rm -f ./$(DEPDIR)/test_machinery-hb-static.Po
+       -rm -f ./$(DEPDIR)/test_machinery-test-machinery.Po
+       -rm -f ./$(DEPDIR)/test_map-hb-static.Po
+       -rm -f ./$(DEPDIR)/test_map-test-map.Po
        -rm -f ./$(DEPDIR)/test_number-hb-number.Po
        -rm -f ./$(DEPDIR)/test_number-test-number.Po
        -rm -f ./$(DEPDIR)/test_ot_glyphname-test-ot-glyphname.Po
        -rm -f ./$(DEPDIR)/test_ot_meta-test-ot-meta.Po
        -rm -f ./$(DEPDIR)/test_ot_name-test-ot-name.Po
        -rm -f ./$(DEPDIR)/test_ot_tag-hb-ot-tag.Po
+       -rm -f ./$(DEPDIR)/test_priority_queue-hb-static.Po
+       -rm -f ./$(DEPDIR)/test_priority_queue-test-priority-queue.Po
+       -rm -f ./$(DEPDIR)/test_repacker-hb-static.Po
+       -rm -f ./$(DEPDIR)/test_repacker-test-repacker.Po
+       -rm -f ./$(DEPDIR)/test_serialize-hb-static.Po
+       -rm -f ./$(DEPDIR)/test_serialize-test-serialize.Po
+       -rm -f ./$(DEPDIR)/test_set-hb-static.Po
+       -rm -f ./$(DEPDIR)/test_set-test-set.Po
        -rm -f ./$(DEPDIR)/test_unicode_ranges-test-unicode-ranges.Po
+       -rm -f ./$(DEPDIR)/test_vector-hb-static.Po
+       -rm -f ./$(DEPDIR)/test_vector-test-vector.Po
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -3812,7 +4002,12 @@ tinyz:
        $(MAKE) $(AM_MAKEFLAGS) CPPFLAGS="-Oz -DHB_TINY $(CPPFLAGS)" libs
 
 $(srcdir)/hb-version.h: hb-version.h.in $(top_srcdir)/configure.ac
-       $(AM_V_GEN) $(srcdir)/gen-hb-version.py $(HB_VERSION) hb-version.h.in hb-version.h
+       $(AM_V_GEN) $(SED) \
+               -e 's/[@]HB_VERSION_MAJOR@/$(HB_VERSION_MAJOR)/' \
+               -e 's/[@]HB_VERSION_MINOR@/$(HB_VERSION_MINOR)/' \
+               -e 's/[@]HB_VERSION_MICRO@/$(HB_VERSION_MICRO)/' \
+               -e 's/[@]HB_VERSION@/$(HB_VERSION)/' \
+               "$<" > "$@" || ($(RM) "$@"; false)
 
 @CODE_COVERAGE_RULES@
 @HAVE_GOBJECT_TRUE@hb-gobject-enums.%: hb-gobject-enums.%.tmpl $(HBHEADERS)
@@ -3834,7 +4029,8 @@ $(srcdir)/hb-version.h: hb-version.h.in $(top_srcdir)/configure.ac
        "$<" > "$@" \
        || ($(RM) "$@"; false)
 check: $(DEF_FILES) # For check-symbols.sh
-harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS)
+harfbuzz.def: $(top_builddir)/config.status
+harfbuzz.def: $(HBHEADERS)
        $(AM_V_GEN) $(srcdir)/gen-def.py "$@" $^
 harfbuzz-subset.def: $(HB_SUBSET_headers)
        $(AM_V_GEN) $(srcdir)/gen-def.py "$@" $^
@@ -3856,8 +4052,7 @@ $(srcdir)/%.hh: $(srcdir)/%.rl
 
 harfbuzz.cc: Makefile.sources
        $(AM_V_GEN) \
-       $(srcdir)/gen-harfbuzzcc.py \
-               $(srcdir)/harfbuzz.cc \
+       for f in \
                $(HB_BASE_sources) \
                $(HB_GLIB_sources) \
                $(HB_FT_sources) \
@@ -3865,7 +4060,10 @@ harfbuzz.cc: Makefile.sources
                $(HB_UNISCRIBE_sources) \
                $(HB_GDI_sources) \
                $(HB_DIRECTWRITE_sources) \
-               $(HB_CORETEXT_sources)
+               $(HB_CORETEXT_sources) \
+               ; do echo '#include "'$$f'"'; done | \
+       grep '[.]cc"' > $(srcdir)/harfbuzz.cc \
+       || ($(RM) $(srcdir)/harfbuzz.cc; false)
 
 @HAVE_INTROSPECTION_TRUE@-include $(INTROSPECTION_MAKEFILE)