[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/Makefile.am      |   14 ++++----------
 src/Makefile.sources |    9 +++++++++
 2 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit a4471d0c2cc4baa81e2cea695f9bd15e03d0f15e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Apr 5 15:42:11 2017 +0200

    Move list of ragel sources to Makefile.sources as well

diff --git a/src/Makefile.am b/src/Makefile.am
index d3a0cfa6..145033a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -253,19 +253,13 @@ built-sources: $(BUILT_SOURCES)
 .PHONY: unicode-tables arabic-table indic-table use-table built-sources
 
 RAGEL_GENERATED = \
-	$(srcdir)/hb-buffer-deserialize-json.hh \
-	$(srcdir)/hb-buffer-deserialize-text.hh \
-	$(srcdir)/hb-ot-shape-complex-indic-machine.hh \
-	$(srcdir)/hb-ot-shape-complex-myanmar-machine.hh \
-	$(srcdir)/hb-ot-shape-complex-use-machine.hh \
+	$(HB_BASE_RAGEL_GENERATED_sources) \
+	$(HB_OT_RAGEL_GENERATED_sources) \
 	$(NULL)
 BUILT_SOURCES += $(RAGEL_GENERATED)
 EXTRA_DIST += \
-	hb-buffer-deserialize-json.rl \
-	hb-buffer-deserialize-text.rl \
-	hb-ot-shape-complex-indic-machine.rl \
-	hb-ot-shape-complex-myanmar-machine.rl \
-	hb-ot-shape-complex-use-machine.rl \
+	$(HB_BASE_RAGEL_sources) \
+	$(HB_OT_RAGEL_sources) \
 	$(NULL)
 MAINTAINERCLEANFILES += $(RAGEL_GENERATED)
 $(srcdir)/%.hh: $(srcdir)/%.rl
diff --git a/src/Makefile.sources b/src/Makefile.sources
index 03be7ba5..51e687b4 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -49,6 +49,10 @@ HB_BASE_RAGEL_GENERATED_sources = \
 	hb-buffer-deserialize-json.hh \
 	hb-buffer-deserialize-text.hh \
 	$(NULL)
+HB_BASE_RAGEL_sources = \
+	hb-buffer-deserialize-json.rl \
+	hb-buffer-deserialize-text.rl \
+	$(NULL)
 
 HB_BASE_headers = \
 	hb.h \
@@ -120,6 +124,11 @@ HB_OT_RAGEL_GENERATED_sources = \
 	hb-ot-shape-complex-myanmar-machine.hh \
 	hb-ot-shape-complex-use-machine.hh \
 	$(NULL)
+HB_OT_RAGEL_sources = \
+	hb-ot-shape-complex-indic-machine.rl \
+	hb-ot-shape-complex-myanmar-machine.rl \
+	hb-ot-shape-complex-use-machine.rl \
+	$(NULL)
 
 HB_OT_headers = \
 	hb-ot.h \