Move list of ragel sources to Makefile.sources as well

diff --git a/src/Makefile.am b/src/Makefile.am
index d3a0cfa61e4ac50888062901135dd638d9e26ae9..145033a60bd952e223a88b33fd11adefd83508d0 100644 (file)
--- 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 03be7ba58838f0781b7399fb551834f7792ea527..51e687b4a144f546bc6cb8b492d8065f95379cc7 100644 (file)
--- 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 \