From f9e0552debc45afedd86c848484bcd169af62dc2 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sat, 10 Nov 2018 21:01:49 -0500 Subject: [PATCH] [fuzzing] Make "make lib" faster and more usable --- src/Makefile.am | 2 +- test/fuzzing/Makefile.am | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index fbd8f6023..9632b4df6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -195,7 +195,7 @@ libharfbuzz_subset_fuzzing_la_LINK = $(chosen_linker) $(libharfbuzz_subset_fuzzi libharfbuzz_subset_fuzzing_la_SOURCES = $(libharfbuzz_subset_la_SOURCES) libharfbuzz_subset_fuzzing_la_CPPFLAGS = $(HBCFLAGS) $(FUZZING_CPPFLAGS) libharfbuzz_subset_fuzzing_la_LDFLAGS = $(AM_LDFLAGS) -libharfbuzz_subset_fuzzing_la_LIBADD = $(libharfbuzz_subset_la_LIBADD) +libharfbuzz_subset_fuzzing_la_LIBADD = libharfbuzz-fuzzing.la EXTRA_libharfbuzz_subset_fuzzing_la_DEPENDENCIES = $(EXTRA_libharfbuzz_subset_la_DEPENDENCIES) CLEANFILES += libharfbuzz-subset-fuzzing.la diff --git a/test/fuzzing/Makefile.am b/test/fuzzing/Makefile.am index 54178ff43..ed67eee8c 100644 --- a/test/fuzzing/Makefile.am +++ b/test/fuzzing/Makefile.am @@ -7,11 +7,13 @@ DISTCLEANFILES = MAINTAINERCLEANFILES = # Convenience targets: -lib: +lib-only: @$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src fuzzing +lib: lib-only + @$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) -$(top_builddir)/src/libharfbuzz-fuzzing.la: lib -$(top_builddir)/src/libharfbuzz-subset-fuzzing.la: lib +$(top_builddir)/src/libharfbuzz-fuzzing.la: lib-only +$(top_builddir)/src/libharfbuzz-subset-fuzzing.la: lib-only EXTRA_DIST += \ README \ @@ -47,7 +49,7 @@ hb_shape_fuzzer_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(NULL) hb_shape_fuzzer_DEPENDENCIES = \ - lib \ + $(top_builddir)/src/libharfbuzz-fuzzing.la $(NULL) hb_subset_fuzzer_SOURCES = \ @@ -62,7 +64,7 @@ hb_subset_fuzzer_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(NULL) hb_subset_fuzzer_DEPENDENCIES = \ - lib \ + $(top_builddir)/src/libharfbuzz-subset-fuzzing.la $(NULL) check: