harfbuzz: use amalgam harfbuzz.cc (from Ebrahim Byagowi)

git-svn-id: svn://tug.org/texlive/trunk@72117 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 14 insertions, 1053 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index b7d67d6c294..2e4bb26357e 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -28,7 +28,7 @@ graphite2 1.3.14 - checked 10apr20
   https://sourceforge.net/projects/silgraphite/files/graphite2/
   (requires C++11)
 
-harfbuzz 9.0.0 - checked 26aug24
+harfbuzz 9.0.0 - checked 27aug24
   https://github.com/harfbuzz/harfbuzz/releases/latest
 
 icu 74.2 - checked 22dec23
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index abab360cf4c..44c06e7ba95 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,8 @@
+2024-08-27  Akira Kakuto  <kakuto@jcom.zaq.ne.jp>
+
+	* Makefile.am: Use amalgam harfbuzz.cc, since it is easy to
+	maintain (from Ebrahim Byagowi <ebrahim@gnu.org>).
+
 2024-08-26  Akira Kakuto  <kakuto@jcom.zaq.ne.jp>
 
 	Import harfbuzz-9.0.0.
diff --git a/Build/source/libs/harfbuzz/Makefile.am b/Build/source/libs/harfbuzz/Makefile.am
index 64e89d4b8dc..5c48a7bf023 100644
--- a/Build/source/libs/harfbuzz/Makefile.am
+++ b/Build/source/libs/harfbuzz/Makefile.am
@@ -33,301 +33,11 @@ AM_CPPFLAGS = -DHB_NO_MT -DHAVE_FALLBACK=1 \
 AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) $(WARNING_CXXFLAGS)
 
 libharfbuzz_dependencies =
-libharfbuzz_a_SOURCES =  \
-	@HARFBUZZ_TREE@/src/hb-algs.hh \
-	@HARFBUZZ_TREE@/src/hb-atomic.hh \
-	@HARFBUZZ_TREE@/src/hb-bimap.hh \
-	@HARFBUZZ_TREE@/src/hb-bit-page.hh \
-	@HARFBUZZ_TREE@/src/hb-bit-set-invertible.hh \
-	@HARFBUZZ_TREE@/src/hb-bit-set.hh \
-	@HARFBUZZ_TREE@/src/hb-blob.hh \
-	@HARFBUZZ_TREE@/src/hb-blob.cc \
-	@HARFBUZZ_TREE@/src/hb-buffer.hh \
-	@HARFBUZZ_TREE@/src/hb-buffer-serialize.cc \
-	@HARFBUZZ_TREE@/src/hb-buffer-verify.cc \
-	@HARFBUZZ_TREE@/src/hb-buffer.cc \
-	@HARFBUZZ_TREE@/src/hb-cache.hh \
-	@HARFBUZZ_TREE@/src/hb-cplusplus.hh \
-	@HARFBUZZ_TREE@/src/hb-cff-interp-common.hh \
-	@HARFBUZZ_TREE@/src/hb-cff-interp-cs-common.hh \
-	@HARFBUZZ_TREE@/src/hb-cff-interp-dict-common.hh \
-	@HARFBUZZ_TREE@/src/hb-cff1-interp-cs.hh \
-	@HARFBUZZ_TREE@/src/hb-cff2-interp-cs.hh \
-	@HARFBUZZ_TREE@/src/hb-common.cc \
-	@HARFBUZZ_TREE@/src/hb-config.hh \
-	@HARFBUZZ_TREE@/src/hb-debug.hh \
-	@HARFBUZZ_TREE@/src/hb-dispatch.hh \
-	@HARFBUZZ_TREE@/src/hb-draw.cc \
-	@HARFBUZZ_TREE@/src/hb-draw.hh \
-	@HARFBUZZ_TREE@/src/hb-face-builder.cc \
-	@HARFBUZZ_TREE@/src/hb-face.hh \
-	@HARFBUZZ_TREE@/src/hb-face.cc \
-	@HARFBUZZ_TREE@/src/hb-font.hh \
-	@HARFBUZZ_TREE@/src/hb-font.cc \
-	@HARFBUZZ_TREE@/src/hb-geometry.hh \
-	@HARFBUZZ_TREE@/src/hb-iter.hh \
-	@HARFBUZZ_TREE@/src/hb-kern.hh \
-	@HARFBUZZ_TREE@/src/hb-limits.hh \
-	@HARFBUZZ_TREE@/src/hb-map.hh \
-	@HARFBUZZ_TREE@/src/hb-map.cc \
-	@HARFBUZZ_TREE@/src/hb-machinery.hh \
-	@HARFBUZZ_TREE@/src/hb-meta.hh \
-	@HARFBUZZ_TREE@/src/hb-ms-feature-ranges.hh \
-	@HARFBUZZ_TREE@/src/hb-mutex.hh \
-	@HARFBUZZ_TREE@/src/hb-null.hh \
-	@HARFBUZZ_TREE@/src/hb-number-parser.hh \
-	@HARFBUZZ_TREE@/src/hb-number.cc \
-	@HARFBUZZ_TREE@/src/hb-number.hh \
-	@HARFBUZZ_TREE@/src/hb-object.hh \
-	@HARFBUZZ_TREE@/src/hb-open-file.hh \
-	@HARFBUZZ_TREE@/src/hb-open-type.hh \
-	@HARFBUZZ_TREE@/src/hb-wasm-api-list.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-cff-common.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-cff1-std-str.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-cff1-table.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-cff1-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-cff2-table.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-cff2-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-gasp-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-cmap-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-face.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-face.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-face-table-list.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-glyf-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-hdmx-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-head-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-hhea-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-hmtx-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-kern-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-maxp-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-name-language-static.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-name-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-stat-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-name-language.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-name.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-os2-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-os2-unicode-ranges.hh \
-	@HARFBUZZ_TREE@/src/hb-pool.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-post-macroman.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-post-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-post-table-v2subset.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-tag.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-tag-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var-common.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var-cvar-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var-varc-table.hh \
-	@HARFBUZZ_TREE@/src/hb-outline.cc \
-	@HARFBUZZ_TREE@/src/hb-outline.hh \
-	@HARFBUZZ_TREE@/src/hb-paint-extents.cc \
-	@HARFBUZZ_TREE@/src/hb-paint-extents.hh \
-	@HARFBUZZ_TREE@/src/hb-paint.cc \
-	@HARFBUZZ_TREE@/src/hb-paint.hh \
-	@HARFBUZZ_TREE@/src/hb-sanitize.hh \
-	@HARFBUZZ_TREE@/src/hb-serialize.hh \
-	@HARFBUZZ_TREE@/src/hb-set-digest.hh \
-	@HARFBUZZ_TREE@/src/hb-set.hh \
-	@HARFBUZZ_TREE@/src/hb-set.cc \
-	@HARFBUZZ_TREE@/src/hb-shape.cc \
-	@HARFBUZZ_TREE@/src/hb-shape-plan.hh \
-	@HARFBUZZ_TREE@/src/hb-shape-plan.cc \
-	@HARFBUZZ_TREE@/src/hb-shaper-list.hh \
-	@HARFBUZZ_TREE@/src/hb-shaper-impl.hh \
-	@HARFBUZZ_TREE@/src/hb-shaper.hh \
-	@HARFBUZZ_TREE@/src/hb-shaper.cc \
-	@HARFBUZZ_TREE@/src/hb-static.cc \
-	@HARFBUZZ_TREE@/src/hb-string-array.hh \
-	@HARFBUZZ_TREE@/src/hb-style.cc \
-	@HARFBUZZ_TREE@/src/hb-subset-accelerator.hh \
-	@HARFBUZZ_TREE@/src/hb-subset-cff-common.cc \
-	@HARFBUZZ_TREE@/src/hb-subset-cff-common.hh \
-	@HARFBUZZ_TREE@/src/hb-subset-cff1.cc \
-	@HARFBUZZ_TREE@/src/hb-subset-cff2.cc \
-	@HARFBUZZ_TREE@/src/hb-subset-input.hh \
-	@HARFBUZZ_TREE@/src/hb-subset-instancer-iup.cc \
-	@HARFBUZZ_TREE@/src/hb-subset-instancer-iup.hh \
-	@HARFBUZZ_TREE@/src/hb-subset-instancer-solver.cc \
-	@HARFBUZZ_TREE@/src/hb-subset-instancer-solver.hh \
-	@HARFBUZZ_TREE@/src/hb-subset.hh \
-	@HARFBUZZ_TREE@/src/hb-ucd-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ucd.cc \
-	@HARFBUZZ_TREE@/src/hb-unicode.hh \
-	@HARFBUZZ_TREE@/src/hb-unicode.cc \
-	@HARFBUZZ_TREE@/src/hb-unicode-emoji-table.hh \
-	@HARFBUZZ_TREE@/src/hb-vector.hh \
-	@HARFBUZZ_TREE@/src/hb-utf.hh \
-	@HARFBUZZ_TREE@/src/hb-buffer-deserialize-json.hh \
-	@HARFBUZZ_TREE@/src/hb-buffer-deserialize-text-glyphs.hh \
-	@HARFBUZZ_TREE@/src/hb-buffer-deserialize-text-unicode.hh \
-	@HARFBUZZ_TREE@/src/hb-fallback-shape.cc \
-	@HARFBUZZ_TREE@/src/hb.hh
-
-## native OpenType Layout backend
-libharfbuzz_a_SOURCES += \
-	@HARFBUZZ_TREE@/src/hb-aat-layout.cc \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-common.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-ankr-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-bsln-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-feat-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-just-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-kerx-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-morx-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-opbd-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-trak-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-ltag-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-map.cc \
-	@HARFBUZZ_TREE@/src/hb-aat-map.hh \
-	@HARFBUZZ_TREE@/src/hb-array.hh \
-	@HARFBUZZ_TREE@/src/hb-multimap.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-font.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-layout.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-layout-base-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-layout-common.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-layout-gdef-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-layout-gpos-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-layout-gsubgpos.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-layout-gsub-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-layout-jstf-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-layout.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-color.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-map.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-map.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-math.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-math-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-meta-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-meta.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-metrics.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-metrics.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shape.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic-fallback.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic-joining-list.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic-pua.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic-win1256.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-default.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-hangul.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-hebrew.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-indic-machine.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-indic-table.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-indic.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-indic.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-khmer-machine.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-khmer.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-myanmar-machine.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-myanmar.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-syllabic.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-syllabic.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-thai.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-use-machine.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-use-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-use.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-vowel-constraints.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-vowel-constraints.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shape-normalize.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shape-normalize.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shape-fallback.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shape-fallback.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shape.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-var-avar-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var-fvar-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var-gvar-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var-hvar-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var-mvar-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-vorg-table.hh
-##
-libharfbuzz_a_SOURCES += \
-	@HARFBUZZ_TREE@/src/OT/Color/CBDT/CBDT.hh \
-	@HARFBUZZ_TREE@/src/OT/Color/COLR/COLR.hh \
-	@HARFBUZZ_TREE@/src/OT/Color/COLR/colrv1-closure.hh \
-	@HARFBUZZ_TREE@/src/OT/Color/CPAL/CPAL.hh \
-	@HARFBUZZ_TREE@/src/OT/Color/sbix/sbix.hh \
-	@HARFBUZZ_TREE@/src/OT/Color/svg/svg.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/glyf.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/glyf-helpers.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/loca.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/path-builder.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/Glyph.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/GlyphHeader.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/SimpleGlyph.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/CompositeGlyph.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/SubsetGlyph.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/composite-iter.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/Common/Coverage.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/Common/CoverageFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/Common/CoverageFormat2.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/Common/RangeRecord.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GDEF/GDEF.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/Common.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/Sequence.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/SingleSubstFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/SingleSubstFormat2.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/SingleSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/MultipleSubstFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/MultipleSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/AlternateSubstFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/AlternateSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/AlternateSet.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/LigatureSubstFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/LigatureSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/LigatureSet.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/Ligature.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/ReverseChainSingleSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/ContextSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/ChainContextSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/ExtensionSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/SubstLookupSubTable.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/SubstLookup.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/GSUB.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/AnchorFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/AnchorFormat2.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/AnchorFormat3.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/Anchor.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/AnchorMatrix.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/ChainContextPos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/Common.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/ContextPos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/CursivePosFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/CursivePos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/ExtensionPos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/GPOS.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/LigatureArray.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkArray.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkBasePosFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkBasePos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkLigPosFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkLigPos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkMarkPosFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkMarkPos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkRecord.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/PairPosFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/PairPosFormat2.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/PairPos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/PairSet.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/PairValueRecord.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/PosLookup.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/PosLookupSubTable.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/SinglePosFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/SinglePosFormat2.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/SinglePos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/ValueFormat.hh \
-	@HARFBUZZ_TREE@/src/OT/name/name.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/types.hh \
-	@HARFBUZZ_TREE@/src/OT/Var/VARC/coord-setter.hh \
-	@HARFBUZZ_TREE@/src/OT/Var/VARC/VARC.cc \
-	@HARFBUZZ_TREE@/src/OT/Var/VARC/VARC.hh \
-	@HARFBUZZ_TREE@/src/graph/graph.hh \
-	@HARFBUZZ_TREE@/src/graph/serialize.hh
-
+libharfbuzz_a_SOURCES = @HARFBUZZ_TREE@/src/harfbuzz.cc
 
 ## Graphite library
 AM_CPPFLAGS += $(GRAPHITE2_INCLUDES)
 libharfbuzz_dependencies += $(GRAPHITE2_DEPEND)
-libharfbuzz_a_SOURCES += @HARFBUZZ_TREE@/src/hb-graphite2.cc
 
 $(libharfbuzz_a_OBJECTS): config.force
 
diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in
index 009749a2a87..85e20894806 100644
--- a/Build/source/libs/harfbuzz/Makefile.in
+++ b/Build/source/libs/harfbuzz/Makefile.in
@@ -122,66 +122,7 @@ libharfbuzz_a_AR = $(AR) $(ARFLAGS)
 libharfbuzz_a_RANLIB = $(RANLIB)
 libharfbuzz_a_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
-am_libharfbuzz_a_OBJECTS = @HARFBUZZ_TREE@/src/hb-blob.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-buffer-serialize.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-buffer-verify.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-buffer.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-common.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-draw.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-face-builder.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-face.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-font.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-map.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-number.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-cff1-table.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-cff2-table.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-face.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-name.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-tag.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-outline.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-paint-extents.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-paint.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-set.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-shape.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-shape-plan.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-shaper.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-static.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-style.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-subset-cff-common.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-subset-cff1.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-subset-cff2.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-subset-instancer-iup.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-subset-instancer-solver.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ucd.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-unicode.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-fallback-shape.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-aat-layout.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-aat-map.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-font.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-layout.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-color.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-map.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-math.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-meta.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-metrics.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shape.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-default.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-hangul.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-hebrew.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-indic-table.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-indic.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-khmer.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-myanmar.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-syllabic.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-thai.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-use.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-vowel-constraints.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shape-normalize.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-shape-fallback.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-ot-var.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/OT/Var/VARC/VARC.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-graphite2.$(OBJEXT)
+am_libharfbuzz_a_OBJECTS = @HARFBUZZ_TREE@/src/harfbuzz.$(OBJEXT)
 libharfbuzz_a_OBJECTS = $(am_libharfbuzz_a_OBJECTS)
 am_hbtest_OBJECTS = hbtest-hbtest.$(OBJEXT)
 hbtest_OBJECTS = $(am_hbtest_OBJECTS)
@@ -206,66 +147,7 @@ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ./$(DEPDIR)/hbtest-dummy.Po \
 	./$(DEPDIR)/hbtest-hbtest.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-layout.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-map.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-blob.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer-serialize.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer-verify.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-common.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-draw.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-face-builder.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-face.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-fallback-shape.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-font.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-graphite2.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-map.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-number.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff1-table.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff2-table.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-color.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-face.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-font.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-layout.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-map.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-math.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-meta.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-metrics.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-name.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-fallback.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-normalize.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-arabic.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-default.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-hangul.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-hebrew.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-indic-table.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-indic.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-khmer.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-myanmar.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-syllabic.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-thai.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-use.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-vowel-constraints.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-tag.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-var.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-outline.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-paint-extents.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-paint.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-set.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape-plan.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shaper.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-static.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-style.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff-common.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff1.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff2.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-instancer-iup.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-instancer-solver.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ucd.Po \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po \
-	@HARFBUZZ_TREE@/src/OT/Var/VARC/$(DEPDIR)/VARC.Po
+	@HARFBUZZ_TREE@/src/$(DEPDIR)/harfbuzz.Po
 am__mv = mv -f
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -742,280 +624,7 @@ noinst_LIBRARIES = libharfbuzz.a
 AM_CPPFLAGS = -DHB_NO_MT -DHAVE_FALLBACK=1 \
 	-I$(top_srcdir)/$(HARFBUZZ_SRC) $(GRAPHITE2_INCLUDES)
 libharfbuzz_dependencies = $(GRAPHITE2_DEPEND)
-libharfbuzz_a_SOURCES = @HARFBUZZ_TREE@/src/hb-algs.hh \
-	@HARFBUZZ_TREE@/src/hb-atomic.hh \
-	@HARFBUZZ_TREE@/src/hb-bimap.hh \
-	@HARFBUZZ_TREE@/src/hb-bit-page.hh \
-	@HARFBUZZ_TREE@/src/hb-bit-set-invertible.hh \
-	@HARFBUZZ_TREE@/src/hb-bit-set.hh \
-	@HARFBUZZ_TREE@/src/hb-blob.hh @HARFBUZZ_TREE@/src/hb-blob.cc \
-	@HARFBUZZ_TREE@/src/hb-buffer.hh \
-	@HARFBUZZ_TREE@/src/hb-buffer-serialize.cc \
-	@HARFBUZZ_TREE@/src/hb-buffer-verify.cc \
-	@HARFBUZZ_TREE@/src/hb-buffer.cc \
-	@HARFBUZZ_TREE@/src/hb-cache.hh \
-	@HARFBUZZ_TREE@/src/hb-cplusplus.hh \
-	@HARFBUZZ_TREE@/src/hb-cff-interp-common.hh \
-	@HARFBUZZ_TREE@/src/hb-cff-interp-cs-common.hh \
-	@HARFBUZZ_TREE@/src/hb-cff-interp-dict-common.hh \
-	@HARFBUZZ_TREE@/src/hb-cff1-interp-cs.hh \
-	@HARFBUZZ_TREE@/src/hb-cff2-interp-cs.hh \
-	@HARFBUZZ_TREE@/src/hb-common.cc \
-	@HARFBUZZ_TREE@/src/hb-config.hh \
-	@HARFBUZZ_TREE@/src/hb-debug.hh \
-	@HARFBUZZ_TREE@/src/hb-dispatch.hh \
-	@HARFBUZZ_TREE@/src/hb-draw.cc @HARFBUZZ_TREE@/src/hb-draw.hh \
-	@HARFBUZZ_TREE@/src/hb-face-builder.cc \
-	@HARFBUZZ_TREE@/src/hb-face.hh @HARFBUZZ_TREE@/src/hb-face.cc \
-	@HARFBUZZ_TREE@/src/hb-font.hh @HARFBUZZ_TREE@/src/hb-font.cc \
-	@HARFBUZZ_TREE@/src/hb-geometry.hh \
-	@HARFBUZZ_TREE@/src/hb-iter.hh @HARFBUZZ_TREE@/src/hb-kern.hh \
-	@HARFBUZZ_TREE@/src/hb-limits.hh @HARFBUZZ_TREE@/src/hb-map.hh \
-	@HARFBUZZ_TREE@/src/hb-map.cc \
-	@HARFBUZZ_TREE@/src/hb-machinery.hh \
-	@HARFBUZZ_TREE@/src/hb-meta.hh \
-	@HARFBUZZ_TREE@/src/hb-ms-feature-ranges.hh \
-	@HARFBUZZ_TREE@/src/hb-mutex.hh @HARFBUZZ_TREE@/src/hb-null.hh \
-	@HARFBUZZ_TREE@/src/hb-number-parser.hh \
-	@HARFBUZZ_TREE@/src/hb-number.cc \
-	@HARFBUZZ_TREE@/src/hb-number.hh \
-	@HARFBUZZ_TREE@/src/hb-object.hh \
-	@HARFBUZZ_TREE@/src/hb-open-file.hh \
-	@HARFBUZZ_TREE@/src/hb-open-type.hh \
-	@HARFBUZZ_TREE@/src/hb-wasm-api-list.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-cff-common.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-cff1-std-str.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-cff1-table.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-cff1-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-cff2-table.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-cff2-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-gasp-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-cmap-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-face.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-face.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-face-table-list.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-glyf-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-hdmx-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-head-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-hhea-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-hmtx-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-kern-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-maxp-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-name-language-static.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-name-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-stat-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-name-language.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-name.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-os2-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-os2-unicode-ranges.hh \
-	@HARFBUZZ_TREE@/src/hb-pool.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-post-macroman.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-post-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-post-table-v2subset.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-tag.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-tag-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var-common.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var-cvar-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var-varc-table.hh \
-	@HARFBUZZ_TREE@/src/hb-outline.cc \
-	@HARFBUZZ_TREE@/src/hb-outline.hh \
-	@HARFBUZZ_TREE@/src/hb-paint-extents.cc \
-	@HARFBUZZ_TREE@/src/hb-paint-extents.hh \
-	@HARFBUZZ_TREE@/src/hb-paint.cc \
-	@HARFBUZZ_TREE@/src/hb-paint.hh \
-	@HARFBUZZ_TREE@/src/hb-sanitize.hh \
-	@HARFBUZZ_TREE@/src/hb-serialize.hh \
-	@HARFBUZZ_TREE@/src/hb-set-digest.hh \
-	@HARFBUZZ_TREE@/src/hb-set.hh @HARFBUZZ_TREE@/src/hb-set.cc \
-	@HARFBUZZ_TREE@/src/hb-shape.cc \
-	@HARFBUZZ_TREE@/src/hb-shape-plan.hh \
-	@HARFBUZZ_TREE@/src/hb-shape-plan.cc \
-	@HARFBUZZ_TREE@/src/hb-shaper-list.hh \
-	@HARFBUZZ_TREE@/src/hb-shaper-impl.hh \
-	@HARFBUZZ_TREE@/src/hb-shaper.hh \
-	@HARFBUZZ_TREE@/src/hb-shaper.cc \
-	@HARFBUZZ_TREE@/src/hb-static.cc \
-	@HARFBUZZ_TREE@/src/hb-string-array.hh \
-	@HARFBUZZ_TREE@/src/hb-style.cc \
-	@HARFBUZZ_TREE@/src/hb-subset-accelerator.hh \
-	@HARFBUZZ_TREE@/src/hb-subset-cff-common.cc \
-	@HARFBUZZ_TREE@/src/hb-subset-cff-common.hh \
-	@HARFBUZZ_TREE@/src/hb-subset-cff1.cc \
-	@HARFBUZZ_TREE@/src/hb-subset-cff2.cc \
-	@HARFBUZZ_TREE@/src/hb-subset-input.hh \
-	@HARFBUZZ_TREE@/src/hb-subset-instancer-iup.cc \
-	@HARFBUZZ_TREE@/src/hb-subset-instancer-iup.hh \
-	@HARFBUZZ_TREE@/src/hb-subset-instancer-solver.cc \
-	@HARFBUZZ_TREE@/src/hb-subset-instancer-solver.hh \
-	@HARFBUZZ_TREE@/src/hb-subset.hh \
-	@HARFBUZZ_TREE@/src/hb-ucd-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ucd.cc \
-	@HARFBUZZ_TREE@/src/hb-unicode.hh \
-	@HARFBUZZ_TREE@/src/hb-unicode.cc \
-	@HARFBUZZ_TREE@/src/hb-unicode-emoji-table.hh \
-	@HARFBUZZ_TREE@/src/hb-vector.hh @HARFBUZZ_TREE@/src/hb-utf.hh \
-	@HARFBUZZ_TREE@/src/hb-buffer-deserialize-json.hh \
-	@HARFBUZZ_TREE@/src/hb-buffer-deserialize-text-glyphs.hh \
-	@HARFBUZZ_TREE@/src/hb-buffer-deserialize-text-unicode.hh \
-	@HARFBUZZ_TREE@/src/hb-fallback-shape.cc \
-	@HARFBUZZ_TREE@/src/hb.hh @HARFBUZZ_TREE@/src/hb-aat-layout.cc \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-common.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-ankr-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-bsln-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-feat-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-just-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-kerx-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-morx-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-opbd-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout-trak-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-layout.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-ltag-table.hh \
-	@HARFBUZZ_TREE@/src/hb-aat-map.cc \
-	@HARFBUZZ_TREE@/src/hb-aat-map.hh \
-	@HARFBUZZ_TREE@/src/hb-array.hh \
-	@HARFBUZZ_TREE@/src/hb-multimap.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-font.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-layout.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-layout-base-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-layout-common.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-layout-gdef-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-layout-gpos-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-layout-gsubgpos.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-layout-gsub-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-layout-jstf-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-layout.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-color.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-map.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-map.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-math.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-math-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-meta-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-meta.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-metrics.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-metrics.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shape.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic-fallback.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic-joining-list.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic-pua.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic-win1256.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-default.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-hangul.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-hebrew.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-indic-machine.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-indic-table.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-indic.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-indic.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-khmer-machine.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-khmer.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-myanmar-machine.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-myanmar.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-syllabic.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-syllabic.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-thai.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-use-machine.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-use-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-use.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-vowel-constraints.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper-vowel-constraints.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shaper.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shape-normalize.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shape-normalize.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shape-fallback.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-shape-fallback.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-shape.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var.cc \
-	@HARFBUZZ_TREE@/src/hb-ot-var-avar-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var-fvar-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var-gvar-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var-hvar-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-var-mvar-table.hh \
-	@HARFBUZZ_TREE@/src/hb-ot-vorg-table.hh \
-	@HARFBUZZ_TREE@/src/OT/Color/CBDT/CBDT.hh \
-	@HARFBUZZ_TREE@/src/OT/Color/COLR/COLR.hh \
-	@HARFBUZZ_TREE@/src/OT/Color/COLR/colrv1-closure.hh \
-	@HARFBUZZ_TREE@/src/OT/Color/CPAL/CPAL.hh \
-	@HARFBUZZ_TREE@/src/OT/Color/sbix/sbix.hh \
-	@HARFBUZZ_TREE@/src/OT/Color/svg/svg.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/glyf.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/glyf-helpers.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/loca.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/path-builder.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/Glyph.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/GlyphHeader.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/SimpleGlyph.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/CompositeGlyph.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/SubsetGlyph.hh \
-	@HARFBUZZ_TREE@/src/OT/glyf/composite-iter.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/Common/Coverage.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/Common/CoverageFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/Common/CoverageFormat2.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/Common/RangeRecord.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GDEF/GDEF.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/Common.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/Sequence.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/SingleSubstFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/SingleSubstFormat2.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/SingleSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/MultipleSubstFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/MultipleSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/AlternateSubstFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/AlternateSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/AlternateSet.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/LigatureSubstFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/LigatureSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/LigatureSet.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/Ligature.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/ReverseChainSingleSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/ContextSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/ChainContextSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/ExtensionSubst.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/SubstLookupSubTable.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/SubstLookup.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GSUB/GSUB.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/AnchorFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/AnchorFormat2.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/AnchorFormat3.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/Anchor.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/AnchorMatrix.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/ChainContextPos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/Common.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/ContextPos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/CursivePosFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/CursivePos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/ExtensionPos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/GPOS.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/LigatureArray.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkArray.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkBasePosFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkBasePos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkLigPosFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkLigPos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkMarkPosFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkMarkPos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/MarkRecord.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/PairPosFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/PairPosFormat2.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/PairPos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/PairSet.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/PairValueRecord.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/PosLookup.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/PosLookupSubTable.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/SinglePosFormat1.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/SinglePosFormat2.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/SinglePos.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/GPOS/ValueFormat.hh \
-	@HARFBUZZ_TREE@/src/OT/name/name.hh \
-	@HARFBUZZ_TREE@/src/OT/Layout/types.hh \
-	@HARFBUZZ_TREE@/src/OT/Var/VARC/coord-setter.hh \
-	@HARFBUZZ_TREE@/src/OT/Var/VARC/VARC.cc \
-	@HARFBUZZ_TREE@/src/OT/Var/VARC/VARC.hh \
-	@HARFBUZZ_TREE@/src/graph/graph.hh \
-	@HARFBUZZ_TREE@/src/graph/serialize.hh \
-	@HARFBUZZ_TREE@/src/hb-graphite2.cc
+libharfbuzz_a_SOURCES = @HARFBUZZ_TREE@/src/harfbuzz.cc
 @build_TRUE@dist_check_SCRIPTS = harfbuzz.test
 @build_TRUE@TESTS = harfbuzz.test
 hbtest_SOURCES = hbtest.c
@@ -1101,190 +710,7 @@ clean-noinstLIBRARIES:
 @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) @HARFBUZZ_TREE@/src/$(DEPDIR)
 	@: >>@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-blob.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-buffer-serialize.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-buffer-verify.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-buffer.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-common.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-draw.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-face-builder.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-face.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-font.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-map.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-number.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-cff1-table.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-cff2-table.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-face.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-name.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-tag.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-outline.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-paint-extents.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-paint.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-set.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-shape.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-shape-plan.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-shaper.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-static.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-style.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-subset-cff-common.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-subset-cff1.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-subset-cff2.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-subset-instancer-iup.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-subset-instancer-solver.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ucd.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-unicode.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-fallback-shape.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-aat-layout.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-aat-map.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-font.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-layout.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-color.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-map.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-math.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-meta.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-metrics.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shape.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shaper-arabic.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shaper-default.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shaper-hangul.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shaper-hebrew.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shaper-indic-table.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shaper-indic.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shaper-khmer.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shaper-myanmar.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shaper-syllabic.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shaper-thai.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shaper-use.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shaper-vowel-constraints.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shape-normalize.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-shape-fallback.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ot-var.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/OT/Var/VARC/$(am__dirstamp):
-	@$(MKDIR_P) @HARFBUZZ_TREE@/src/OT/Var/VARC
-	@: >>@HARFBUZZ_TREE@/src/OT/Var/VARC/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/OT/Var/VARC/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) @HARFBUZZ_TREE@/src/OT/Var/VARC/$(DEPDIR)
-	@: >>@HARFBUZZ_TREE@/src/OT/Var/VARC/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/OT/Var/VARC/VARC.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/OT/Var/VARC/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/OT/Var/VARC/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-graphite2.$(OBJEXT):  \
+@HARFBUZZ_TREE@/src/harfbuzz.$(OBJEXT):  \
 	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
 	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
 
@@ -1300,73 +726,13 @@ hbtest$(EXEEXT): $(hbtest_OBJECTS) $(hbtest_DEPENDENCIES) $(EXTRA_hbtest_DEPENDE
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 	-rm -f @HARFBUZZ_TREE@/src/*.$(OBJEXT)
-	-rm -f @HARFBUZZ_TREE@/src/OT/Var/VARC/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hbtest-dummy.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hbtest-hbtest.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-layout.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-map.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-blob.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer-serialize.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer-verify.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-common.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-draw.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-face-builder.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-face.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-fallback-shape.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-font.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-graphite2.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-map.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-number.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff1-table.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff2-table.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-color.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-face.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-font.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-layout.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-map.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-math.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-meta.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-metrics.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-name.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-fallback.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-normalize.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-arabic.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-default.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-hangul.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-hebrew.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-indic-table.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-indic.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-khmer.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-myanmar.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-syllabic.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-thai.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-use.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-vowel-constraints.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-tag.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-var.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-outline.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-paint-extents.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-paint.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-set.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape-plan.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shaper.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-static.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-style.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff-common.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff1.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff2.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-instancer-iup.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-instancer-solver.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ucd.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/OT/Var/VARC/$(DEPDIR)/VARC.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/harfbuzz.Po@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
@@ -1977,8 +1343,6 @@ distclean-generic:
 	-$(am__rm_f) $(DISTCLEANFILES)
 	-$(am__rm_f) @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
 	-$(am__rm_f) @HARFBUZZ_TREE@/src/$(am__dirstamp)
-	-$(am__rm_f) @HARFBUZZ_TREE@/src/OT/Var/VARC/$(DEPDIR)/$(am__dirstamp)
-	-$(am__rm_f) @HARFBUZZ_TREE@/src/OT/Var/VARC/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1992,66 +1356,7 @@ distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f ./$(DEPDIR)/hbtest-dummy.Po
 	-rm -f ./$(DEPDIR)/hbtest-hbtest.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-layout.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-map.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-blob.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer-serialize.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer-verify.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-common.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-draw.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-face-builder.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-face.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-fallback-shape.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-font.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-graphite2.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-map.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-number.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff1-table.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff2-table.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-color.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-face.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-font.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-layout.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-map.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-math.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-meta.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-metrics.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-name.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-fallback.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-normalize.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-arabic.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-default.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-hangul.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-hebrew.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-indic-table.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-indic.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-khmer.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-myanmar.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-syllabic.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-thai.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-use.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-vowel-constraints.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-tag.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-var.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-outline.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-paint-extents.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-paint.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-set.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape-plan.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shaper.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-static.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-style.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff-common.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff1.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff2.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-instancer-iup.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-instancer-solver.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ucd.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po
-	-rm -f @HARFBUZZ_TREE@/src/OT/Var/VARC/$(DEPDIR)/VARC.Po
+	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/harfbuzz.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-tags
@@ -2101,66 +1406,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -rf $(top_srcdir)/autom4te.cache
 	-rm -f ./$(DEPDIR)/hbtest-dummy.Po
 	-rm -f ./$(DEPDIR)/hbtest-hbtest.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-layout.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-aat-map.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-blob.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer-serialize.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer-verify.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-common.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-draw.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-face-builder.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-face.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-fallback-shape.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-font.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-graphite2.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-map.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-number.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff1-table.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-cff2-table.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-color.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-face.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-font.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-layout.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-map.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-math.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-meta.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-metrics.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-name.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-fallback.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape-normalize.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shape.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-arabic.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-default.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-hangul.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-hebrew.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-indic-table.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-indic.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-khmer.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-myanmar.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-syllabic.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-thai.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-use.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-shaper-vowel-constraints.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-tag.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-var.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-outline.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-paint-extents.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-paint.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-set.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape-plan.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shape.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-shaper.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-static.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-style.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff-common.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff1.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff2.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-instancer-iup.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-instancer-solver.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ucd.Po
-	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po
-	-rm -f @HARFBUZZ_TREE@/src/OT/Var/VARC/$(DEPDIR)/VARC.Po
+	-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/harfbuzz.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic