From ff1628191d8002f21b84801c124c1924a3f57b6b Mon Sep 17 00:00:00 2001 From: Icarus Sparry Date: Fri, 22 Sep 2017 15:44:57 -0700 Subject: [PATCH] Fix for issue 260, make portability Use = rather than := on the line. It is only an efficiency gain. replace patsubst and filter with a new variable and standard substitution. Replace %-style pattern with suffix rule. Signed-off-by: Icarus Sparry --- Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 78b27a08..2ca78eeb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +SUFFIXES= .rst + EXTRA_DIST = COPYING scripts/findstatic.pl swupd.bash AM_CFLAGS = -fPIC -Iinclude/ -O2 -g -Wall -W -Wformat-security -D_FORTIFY_SOURCE=2 -fno-common -std=gnu99 @@ -135,7 +137,7 @@ BATS_LOG_DRIVER = $(tap_driver) TESTS = $(dist_check_SCRIPTS) -dist_check_SCRIPTS = \ +BATS = \ test/functional/bundleadd/add-directory/test.bats \ test/functional/bundleadd/add-existing/test.bats \ test/functional/bundleadd/add-multiple/test.bats \ @@ -214,10 +216,11 @@ dist_check_SCRIPTS = \ test/functional/verify/install-latest-directory/test.bats \ test/functional/verify/latest-missing/test.bats +dist_check_SCRIPTS = $(BATS) # Must be run before all other tests dist_check_SCRIPTS += test/functional/generate-cert.prereq -parallel_tests := $(patsubst %.bats,%.log,$(filter %.bats,$(dist_check_SCRIPTS))) +parallel_tests = $(BATS:.bats=.log) $(parallel_tests) : test/functional/generate-cert.log endif @@ -283,7 +286,7 @@ clean-local: man: $(dist_man_MANS) -%: %.rst +.rst: rst2man.py $< > $@ swupd.bash: $(top_srcdir)/scripts/swupd-completion.sh $(top_srcdir)/swupd