[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/Makefile.am                                  |    1 
 src/Makefile.sources                             |    2 -
 test/shaping/data/in-house/Makefile.am           |   46 +----------------------
 test/shaping/data/in-house/Makefile.sources      |   46 +++++++++++++++++++++++
 test/shaping/data/text-rendering-tests/update.sh |    2 -
 util/Makefile.am                                 |    1 
 util/Makefile.sources                            |    2 -
 7 files changed, 50 insertions(+), 50 deletions(-)

New commits:
commit de02b5093c42a527ae67084b30943369ed59efe6
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jan 11 10:48:42 2018 +0100

    [test/in-house] Add Makefile.sources

diff --git a/test/shaping/data/in-house/Makefile.am b/test/shaping/data/in-house/Makefile.am
index 2f955191..aab1652e 100644
--- a/test/shaping/data/in-house/Makefile.am
+++ b/test/shaping/data/in-house/Makefile.am
@@ -9,54 +9,12 @@ lib:
 EXTRA_DIST = \
 	COPYING \
 	fonts \
-	$(TESTS) \
+	tests \
 	$(NULL)
 
 TEST_EXTENSIONS = .tests
 TESTS_LOG_COMPILER = $(srcdir)/../../run-tests.py $(top_builddir)/util/hb-shape$(EXEEXT)
 
-TESTS = \
-	tests/arabic-fallback-shaping.tests \
-	tests/arabic-feature-order.tests \
-	tests/arabic-like-joining.tests \
-	tests/arabic-mark-order.tests \
-	tests/arabic-stch.tests \
-	tests/automatic-fractions.tests \
-	tests/cluster.tests \
-	tests/color-fonts.tests \
-	tests/context-matching.tests \
-	tests/cursive-positioning.tests \
-	tests/default-ignorables.tests \
-	tests/emoji-flag-tags.tests \
-	tests/fallback-positioning.tests \
-	tests/fuzzed.tests \
-	tests/hangul-jamo.tests \
-	tests/hyphens.tests \
-	tests/indic-consonant-with-stacker.tests \
-	tests/indic-init.tests \
-	tests/indic-joiner-candrabindu.tests \
-	tests/indic-joiners.tests \
-	tests/indic-old-spec.tests \
-	tests/indic-pref-blocking.tests \
-	tests/indic-script-extensions.tests \
-	tests/indic-special-cases.tests \
-	tests/indic-syllable.tests \
-	tests/language-tags.tests \
-	tests/ligature-id.tests \
-	tests/mark-attachment.tests \
-	tests/mark-filtering-sets.tests \
-	tests/mongolian-variation-selector.tests \
-	tests/spaces.tests \
-	tests/simple.tests \
-	tests/tibetan-contractions-1.tests \
-	tests/tibetan-contractions-2.tests \
-	tests/tibetan-vowels.tests \
-	tests/use.tests \
-	tests/use-marchen.tests \
-	tests/use-syllable.tests \
-	tests/variations-rvrn.tests \
-	tests/vertical.tests \
-	tests/zero-width-marks.tests \
-	$(NULL)
+include Makefile.sources
 
 -include $(top_srcdir)/git.mk
diff --git a/test/shaping/data/in-house/Makefile.sources b/test/shaping/data/in-house/Makefile.sources
new file mode 100644
index 00000000..247133d4
--- /dev/null
+++ b/test/shaping/data/in-house/Makefile.sources
@@ -0,0 +1,46 @@
+TESTS = \
+	tests/arabic-fallback-shaping.tests \
+	tests/arabic-feature-order.tests \
+	tests/arabic-like-joining.tests \
+	tests/arabic-mark-order.tests \
+	tests/arabic-stch.tests \
+	tests/automatic-fractions.tests \
+	tests/cluster.tests \
+	tests/color-fonts.tests \
+	tests/context-matching.tests \
+	tests/cursive-positioning.tests \
+	tests/default-ignorables.tests \
+	tests/emoji-flag-tags.tests \
+	tests/fallback-positioning.tests \
+	tests/fuzzed.tests \
+	tests/hangul-jamo.tests \
+	tests/hyphens.tests \
+	tests/indic-consonant-with-stacker.tests \
+	tests/indic-init.tests \
+	tests/indic-joiner-candrabindu.tests \
+	tests/indic-joiners.tests \
+	tests/indic-old-spec.tests \
+	tests/indic-pref-blocking.tests \
+	tests/indic-script-extensions.tests \
+	tests/indic-special-cases.tests \
+	tests/indic-syllable.tests \
+	tests/language-tags.tests \
+	tests/ligature-id.tests \
+	tests/mark-attachment.tests \
+	tests/mark-filtering-sets.tests \
+	tests/mongolian-variation-selector.tests \
+	tests/spaces.tests \
+	tests/simple.tests \
+	tests/tibetan-contractions-1.tests \
+	tests/tibetan-contractions-2.tests \
+	tests/tibetan-vowels.tests \
+	tests/use.tests \
+	tests/use-marchen.tests \
+	tests/use-syllable.tests \
+	tests/variations-rvrn.tests \
+	tests/vertical.tests \
+	tests/zero-width-marks.tests \
+	$(NULL)
+
+DISABLED_TESTS = \
+	$(NULL)
commit 7c32e01d04deaab511d41f5dec0dfd9fc0469f39
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jan 11 10:47:31 2018 +0100

    Minor

diff --git a/src/Makefile.am b/src/Makefile.am
index b62e7d0a..912a98cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,6 @@
 # Process this file with automake to produce Makefile.in
 
+NULL =
 SUBDIRS =
 DIST_SUBDIRS =
 BUILT_SOURCES =
diff --git a/src/Makefile.sources b/src/Makefile.sources
index 4349e0a7..213aa22f 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -1,5 +1,3 @@
-NULL =
-
 # Base and default-included sources and headers
 
 HB_BASE_sources = \
diff --git a/test/shaping/data/text-rendering-tests/update.sh b/test/shaping/data/text-rendering-tests/update.sh
index 31960a14..47545bcd 100755
--- a/test/shaping/data/text-rendering-tests/update.sh
+++ b/test/shaping/data/text-rendering-tests/update.sh
@@ -21,8 +21,6 @@ test -d tests && git rm -rf tests || true
 test -d tests && (echo "tests/ dir not empty; investigate."; false)
 mkdir tests
 
-echo "NULL =" > Makefile.sources
-echo > Makefile.sources
 echo "TESTS = \\" > Makefile.sources
 
 DISABLED="DISBALED_TESTS = \\"
diff --git a/util/Makefile.am b/util/Makefile.am
index 2543a609..e6620a23 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,5 +1,6 @@
 # Process this file with automake to produce Makefile.in
 
+NULL =
 EXTRA_DIST =
 CLEANFILES =
 DISTCLEANFILES =
diff --git a/util/Makefile.sources b/util/Makefile.sources
index 368fdb04..d6c00cc4 100644
--- a/util/Makefile.sources
+++ b/util/Makefile.sources
@@ -1,5 +1,3 @@
-NULL =
-
 HB_VIEW_sources = \
 	hb-view.cc \
 	options.cc \