From 1f89315ec71ab6668c72b02c47f39ca1794808eb Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Tue, 30 Nov 2021 09:35:30 -0800 Subject: AX_VALGRIND_CHECK: Correct recursive target names. Recursive targets associated with AM_EXTRA_RECURSIVE_TARGETS() macro calls should end with "-local", not "-am". Correct the check-valgrind{-vgtool}-am rules accordingly. This addresses a problem where the calling "make check-valgrind" resulted in "nothing to be done". See the Automake manual Section "Recursing subdirectories" for details: https://www.gnu.org/software/automake/manual/automake.html#Subdirectories --- m4/ax_valgrind_check.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'm4') diff --git a/m4/ax_valgrind_check.m4 b/m4/ax_valgrind_check.m4 index f30d8da..399c7bf 100644 --- a/m4/ax_valgrind_check.m4 +++ b/m4/ax_valgrind_check.m4 @@ -177,7 +177,7 @@ valgrind_quiet_ = $(valgrind_quiet_$(AM_DEFAULT_VERBOSITY)) valgrind_quiet_0 = --quiet valgrind_v_use = $(valgrind_v_use_$(V)) valgrind_v_use_ = $(valgrind_v_use_$(AM_DEFAULT_VERBOSITY)) -valgrind_v_use_0 = @echo " USE " $(patsubst check-valgrind-%-am,%,$''@):; +valgrind_v_use_0 = @echo " USE " $(patsubst check-valgrind-%-local,%,$''@):; # Support running with and without libtool. ifneq ($(LIBTOOL),) @@ -187,7 +187,7 @@ valgrind_lt = endif # Use recursive makes in order to ignore errors during check -check-valgrind-am: +check-valgrind-local: ifeq ($(VALGRIND_ENABLED),yes) $(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k \ $(foreach tool, $(valgrind_enabled_tools), check-valgrind-$(tool)) @@ -207,7 +207,7 @@ VALGRIND_LOG_COMPILER = \ $(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS) define valgrind_tool_rule -check-valgrind-$(1)-am: +check-valgrind-$(1)-local: ifeq ($$(VALGRIND_ENABLED)-$$(ENABLE_VALGRIND_$(1)),yes-yes) ifneq ($$(TESTS),) $$(valgrind_v_use)$$(MAKE) check-TESTS \ -- cgit v1.2.1