[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/Makefile.am          |    2 +-
 test/shaping/Makefile.am |    2 ++
 test/subset/Makefile.am  |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit cc126f2817844a2e83e973129e5b2caa18de599f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Oct 9 01:10:15 2018 -0400

    Minor

diff --git a/src/Makefile.am b/src/Makefile.am
index 73631992..2eca356b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@ TESTS =
 check_PROGRAMS =
 
 # Convenience targets:
-lib: $(BUILT_SOURCES) libharfbuzz.la libharfbuzz-subset.la
+lib: $(BUILT_SOURCES) libharfbuzz.la
 libs: $(BUILT_SOURCES) $(lib_LTLIBRARIES)
 fuzzing: $(BUILT_SOURCES) libharfbuzz-fuzzing.la libharfbuzz-subset-fuzzing.la
 
diff --git a/test/shaping/Makefile.am b/test/shaping/Makefile.am
index 73203365..5ca9bc19 100644
--- a/test/shaping/Makefile.am
+++ b/test/shaping/Makefile.am
@@ -8,6 +8,8 @@ SUBDIRS = data
 # Convenience targets:
 lib:
 	@$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src lib
+libs:
+	@$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src libs
 
 EXTRA_DIST += \
 	README.md \
diff --git a/test/subset/Makefile.am b/test/subset/Makefile.am
index 336d33df..1673cfbd 100644
--- a/test/subset/Makefile.am
+++ b/test/subset/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = data
 
 # Convenience targets:
 lib:
-	@$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src lib
+	@$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src libs
 
 EXTRA_DIST += \
 	CMakeLists.txt \