From b240d701fd98efa59a7f772ff39654fc95b8fc8f Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 3 Jul 2019 12:17:57 -0700
Subject: [PATCH] [amalgam] Include integration source files as well

Just for those that are normally built into libharfbuzz itself.

Part of https://github.com/harfbuzz/harfbuzz/issues/1809
---
 src/Makefile.am | 12 ++++++++++--
 src/harfbuzz.cc |  6 ++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 746b8f0..5c15a3d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -305,10 +305,18 @@ $(srcdir)/%.hh: $(srcdir)/%.rl
 
 harfbuzz.cc: Makefile.sources
 	$(AM_V_GEN) \
-	for f in $(HB_BASE_sources); do echo '#include "'$$f'"'; done | \
+	for f in \
+		$(HB_BASE_sources) \
+		$(HB_GLIB_sources) \
+		$(HB_FT_sources) \
+		$(HB_GRAPHITE2_sources) \
+		$(HB_UNISCRIBE_sources) \
+		$(HB_DIRECTWRITE_sources) \
+		$(HB_CORETEXT_sources) \
+		; do echo '#include "'$$f'"'; done | \
 	grep '[.]cc"' > $(srcdir)/harfbuzz.cc \
 	|| ($(RM) $(srcdir)/harfbuzz.cc; false)
-EXTRA_DIST += harfbuzz.cc
+BUILT_SOURCES += harfbuzz.cc
 
 noinst_PROGRAMS = \
 	main \
diff --git a/src/harfbuzz.cc b/src/harfbuzz.cc
index a9581d2..8f5bb79 100644
--- a/src/harfbuzz.cc
+++ b/src/harfbuzz.cc
@@ -42,3 +42,9 @@
 #include "hb-ucd.cc"
 #include "hb-unicode.cc"
 #include "hb-warning.cc"
+#include "hb-glib.cc"
+#include "hb-ft.cc"
+#include "hb-graphite2.cc"
+#include "hb-uniscribe.cc"
+#include "hb-directwrite.cc"
+#include "hb-coretext.cc"
-- 
2.7.4