From 7baa22c8197791cfe496d4bb8cca74353d568f62 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 8 Dec 2025 04:51:33 +0100 Subject: [PATCH] Downgrade ax_valgrind_check.m4 --- Makefile.in | 36 +-------------------- aclocal.m4 | 17 ---------- builds/Makefile.in | 36 +-------------------- configure | 29 ++++++++++------- contrib/Makefile.in | 36 +-------------------- dist-build/Makefile.in | 36 +-------------------- m4/ax_valgrind_check.m4 | 48 ++++++++++++++-------------- src/Makefile.in | 42 +++---------------------- src/libsodium/Makefile.in | 36 +-------------------- src/libsodium/include/Makefile.in | 49 +++++------------------------ test/Makefile.in | 42 +++---------------------- test/default/Makefile.in | 52 ++++++------------------------- 12 files changed, 72 insertions(+), 387 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3494f1ea..5db821d2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -178,10 +178,6 @@ am__recursive_targets = \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__extra_recursive_targets = check-valgrind-recursive \ - check-valgrind-memcheck-recursive \ - check-valgrind-helgrind-recursive check-valgrind-drd-recursive \ - check-valgrind-sgcheck-recursive am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -555,11 +551,6 @@ $(am__recursive_targets): if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -check-valgrind-local: -check-valgrind-memcheck-local: -check-valgrind-helgrind-local: -check-valgrind-drd-local: -check-valgrind-sgcheck-local: ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -874,26 +865,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -check-valgrind: check-valgrind-recursive - -check-valgrind-am: check-valgrind-local - -check-valgrind-drd: check-valgrind-drd-recursive - -check-valgrind-drd-am: check-valgrind-drd-local - -check-valgrind-helgrind: check-valgrind-helgrind-recursive - -check-valgrind-helgrind-am: check-valgrind-helgrind-local - -check-valgrind-memcheck: check-valgrind-memcheck-recursive - -check-valgrind-memcheck-am: check-valgrind-memcheck-local - -check-valgrind-sgcheck: check-valgrind-sgcheck-recursive - -check-valgrind-sgcheck-am: check-valgrind-sgcheck-local - clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -967,12 +938,7 @@ uninstall-am: uninstall-pkgconfigDATA .MAKE: $(am__recursive_targets) install-am install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--refresh check check-am check-valgrind-am \ - check-valgrind-drd-am check-valgrind-drd-local \ - check-valgrind-helgrind-am check-valgrind-helgrind-local \ - check-valgrind-local check-valgrind-memcheck-am \ - check-valgrind-memcheck-local check-valgrind-sgcheck-am \ - check-valgrind-sgcheck-local clean clean-cscope clean-generic \ + am--refresh check check-am clean clean-cscope clean-generic \ clean-libtool cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-bzip3 dist-gzip dist-lzip dist-shar \ dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \ diff --git a/aclocal.m4 b/aclocal.m4 index 4def0473..b42f7d6c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -418,23 +418,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) -# AM_EXTRA_RECURSIVE_TARGETS -*- Autoconf -*- - -# Copyright (C) 2012-2025 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_EXTRA_RECURSIVE_TARGETS -# -------------------------- -# Define the list of user recursive targets. This macro exists only to -# be traced by Automake, which will ensure that a proper definition of -# user-defined recursive targets (and associated rules) is propagated -# into all the generated Makefiles. -# TODO: We should really reject non-literal arguments here... -AC_DEFUN([AM_EXTRA_RECURSIVE_TARGETS], []) - # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996-2025 Free Software Foundation, Inc. diff --git a/builds/Makefile.in b/builds/Makefile.in index f9f35bbf..2679d0a0 100644 --- a/builds/Makefile.in +++ b/builds/Makefile.in @@ -129,10 +129,6 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__extra_recursive_targets = check-valgrind-recursive \ - check-valgrind-memcheck-recursive \ - check-valgrind-helgrind-recursive check-valgrind-drd-recursive \ - check-valgrind-sgcheck-recursive am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -433,11 +429,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -check-valgrind-local: -check-valgrind-memcheck-local: -check-valgrind-helgrind-local: -check-valgrind-drd-local: -check-valgrind-sgcheck-local: tags TAGS: ctags CTAGS: @@ -512,26 +503,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -check-valgrind: check-valgrind-am - -check-valgrind-am: check-valgrind-local - -check-valgrind-drd: check-valgrind-drd-am - -check-valgrind-drd-am: check-valgrind-drd-local - -check-valgrind-helgrind: check-valgrind-helgrind-am - -check-valgrind-helgrind-am: check-valgrind-helgrind-local - -check-valgrind-memcheck: check-valgrind-memcheck-am - -check-valgrind-memcheck-am: check-valgrind-memcheck-local - -check-valgrind-sgcheck: check-valgrind-sgcheck-am - -check-valgrind-sgcheck-am: check-valgrind-sgcheck-local - clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am @@ -600,12 +571,7 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: all all-am check check-am check-valgrind-am \ - check-valgrind-drd-am check-valgrind-drd-local \ - check-valgrind-helgrind-am check-valgrind-helgrind-local \ - check-valgrind-local check-valgrind-memcheck-am \ - check-valgrind-memcheck-local check-valgrind-sgcheck-am \ - check-valgrind-sgcheck-local clean clean-generic clean-libtool \ +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ cscopelist-am ctags-am distclean distclean-generic \ distclean-libtool distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff --git a/configure b/configure index 6ee64536..5976c455 100755 --- a/configure +++ b/configure @@ -1548,6 +1548,7 @@ Optional Features: --enable-opt Optimize for the native CPU - The resulting library will be faster but not portable --enable-valgrind Whether to enable Valgrind on the unit tests + (requires GNU make) --disable-valgrind-memcheck Whether to skip memcheck during the Valgrind tests --disable-valgrind-helgrind @@ -7540,15 +7541,12 @@ fi - - - # Check whether --enable-valgrind was given. if test ${enable_valgrind+y} then : enableval=$enable_valgrind; enable_valgrind=$enableval else case e in #( - e) enable_valgrind= ;; + e) enable_valgrind=no ;; esac fi @@ -7947,7 +7945,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-%-local,%,$''@):; +valgrind_v_use_0 = @echo " USE " $(patsubst check-valgrind-%,%,$''@):; # Support running with and without libtool. ifneq ($(LIBTOOL),) @@ -7957,12 +7955,12 @@ valgrind_lt = endif # Use recursive makes in order to ignore errors during check -check-valgrind-local: +check-valgrind: ifeq ($(VALGRIND_ENABLED),yes) $(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k \ $(foreach tool, $(valgrind_enabled_tools), check-valgrind-$(tool)) else - @echo "Need to reconfigure with --enable-valgrind" + @echo "Need to use GNU make and reconfigure with --enable-valgrind" endif # Valgrind running @@ -7976,16 +7974,14 @@ VALGRIND_LOG_COMPILER = \ $(valgrind_lt) \ $(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS) -define valgrind_tool_rule -check-valgrind-$(1)-local: +define valgrind_tool_rule = +check-valgrind-$(1): ifeq ($$(VALGRIND_ENABLED)-$$(ENABLE_VALGRIND_$(1)),yes-yes) -ifneq ($$(TESTS),) $$(valgrind_v_use)$$(MAKE) check-TESTS \ TESTS_ENVIRONMENT="$$(VALGRIND_TESTS_ENVIRONMENT)" \ LOG_COMPILER="$$(VALGRIND_LOG_COMPILER)" \ LOG_FLAGS="$$(valgrind_$(1)_flags)" \ TEST_SUITE_LOG=test-suite-$(1).log -endif else ifeq ($$(VALGRIND_ENABLED),yes) @echo "Need to reconfigure with --enable-valgrind-$(1)" else @@ -8001,9 +7997,18 @@ A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind MOSTLYCLEANFILES ?= MOSTLYCLEANFILES += $(valgrind_log_files) -.PHONY: check-valgrind $(addprefix check-valgrind-,$(valgrind_tools)) +.PHONY: check-valgrind $(add-prefix check-valgrind-,$(valgrind_tools)) ' + if test "$enable_valgrind" != "yes" +then : + + VALGRIND_CHECK_RULES=' +check-valgrind: + @echo "Need to use GNU make and reconfigure with --enable-valgrind"' + +fi + diff --git a/contrib/Makefile.in b/contrib/Makefile.in index aab4aab2..9b98b076 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -129,10 +129,6 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__extra_recursive_targets = check-valgrind-recursive \ - check-valgrind-memcheck-recursive \ - check-valgrind-helgrind-recursive check-valgrind-drd-recursive \ - check-valgrind-sgcheck-recursive am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -348,11 +344,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -check-valgrind-local: -check-valgrind-memcheck-local: -check-valgrind-helgrind-local: -check-valgrind-drd-local: -check-valgrind-sgcheck-local: tags TAGS: ctags CTAGS: @@ -427,26 +418,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -check-valgrind: check-valgrind-am - -check-valgrind-am: check-valgrind-local - -check-valgrind-drd: check-valgrind-drd-am - -check-valgrind-drd-am: check-valgrind-drd-local - -check-valgrind-helgrind: check-valgrind-helgrind-am - -check-valgrind-helgrind-am: check-valgrind-helgrind-local - -check-valgrind-memcheck: check-valgrind-memcheck-am - -check-valgrind-memcheck-am: check-valgrind-memcheck-local - -check-valgrind-sgcheck: check-valgrind-sgcheck-am - -check-valgrind-sgcheck-am: check-valgrind-sgcheck-local - clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am @@ -515,12 +486,7 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: all all-am check check-am check-valgrind-am \ - check-valgrind-drd-am check-valgrind-drd-local \ - check-valgrind-helgrind-am check-valgrind-helgrind-local \ - check-valgrind-local check-valgrind-memcheck-am \ - check-valgrind-memcheck-local check-valgrind-sgcheck-am \ - check-valgrind-sgcheck-local clean clean-generic clean-libtool \ +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ cscopelist-am ctags-am distclean distclean-generic \ distclean-libtool distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff --git a/dist-build/Makefile.in b/dist-build/Makefile.in index 13a5cd11..42281814 100644 --- a/dist-build/Makefile.in +++ b/dist-build/Makefile.in @@ -129,10 +129,6 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__extra_recursive_targets = check-valgrind-recursive \ - check-valgrind-memcheck-recursive \ - check-valgrind-helgrind-recursive check-valgrind-drd-recursive \ - check-valgrind-sgcheck-recursive am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -359,11 +355,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -check-valgrind-local: -check-valgrind-memcheck-local: -check-valgrind-helgrind-local: -check-valgrind-drd-local: -check-valgrind-sgcheck-local: tags TAGS: ctags CTAGS: @@ -438,26 +429,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -check-valgrind: check-valgrind-am - -check-valgrind-am: check-valgrind-local - -check-valgrind-drd: check-valgrind-drd-am - -check-valgrind-drd-am: check-valgrind-drd-local - -check-valgrind-helgrind: check-valgrind-helgrind-am - -check-valgrind-helgrind-am: check-valgrind-helgrind-local - -check-valgrind-memcheck: check-valgrind-memcheck-am - -check-valgrind-memcheck-am: check-valgrind-memcheck-local - -check-valgrind-sgcheck: check-valgrind-sgcheck-am - -check-valgrind-sgcheck-am: check-valgrind-sgcheck-local - clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am @@ -526,12 +497,7 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: all all-am check check-am check-valgrind-am \ - check-valgrind-drd-am check-valgrind-drd-local \ - check-valgrind-helgrind-am check-valgrind-helgrind-local \ - check-valgrind-local check-valgrind-memcheck-am \ - check-valgrind-memcheck-local check-valgrind-sgcheck-am \ - check-valgrind-sgcheck-local clean clean-generic clean-libtool \ +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ cscopelist-am ctags-am distclean distclean-generic \ distclean-libtool distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff --git a/m4/ax_valgrind_check.m4 b/m4/ax_valgrind_check.m4 index e0d8a2f3..876f8876 100644 --- a/m4/ax_valgrind_check.m4 +++ b/m4/ax_valgrind_check.m4 @@ -36,19 +36,21 @@ # AX_VALGRIND_DFLT([sgcheck], [off]) # AX_VALGRIND_CHECK # -# in each Makefile.am with tests: +# Makefile.am: # # @VALGRIND_CHECK_RULES@ # VALGRIND_SUPPRESSIONS_FILES = my-project.supp # EXTRA_DIST = my-project.supp # -# This results in a "check-valgrind" rule being added. Running `make -# check-valgrind` in that directory will recursively run the module's test -# suite (`make check`) once for each of the available Valgrind tools (out -# of memcheck, helgrind and drd) while the sgcheck will be skipped unless -# enabled again on the commandline with --enable-valgrind-sgcheck. The -# results for each check will be output to test-suite-$toolname.log. The -# target will succeed if there are zero errors and fail otherwise. +# This results in a "check-valgrind" rule being added to any Makefile.am +# which includes "@VALGRIND_CHECK_RULES@" (assuming the module has been +# configured with --enable-valgrind). Running `make check-valgrind` in +# that directory will run the module's test suite (`make check`) once for +# each of the available Valgrind tools (out of memcheck, helgrind and drd) +# while the sgcheck will be skipped unless enabled again on the +# commandline with --enable-valgrind-sgcheck. The results for each check +# will be output to test-suite-$toolname.log. The target will succeed if +# there are zero errors and fail otherwise. # # Alternatively, a "check-valgrind-$TOOL" rule will be added, for $TOOL in # memcheck, helgrind, drd and sgcheck. These are useful because often only @@ -65,7 +67,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 23 +#serial 15 dnl Configured tools m4_define([valgrind_tool_list], [[memcheck], [helgrind], [drd], [sgcheck]]) @@ -78,14 +80,10 @@ AC_DEFUN([AX_VALGRIND_DFLT],[ ])dnl AC_DEFUN([AX_VALGRIND_CHECK],[ - AM_EXTRA_RECURSIVE_TARGETS([check-valgrind]) - m4_foreach([vgtool], [valgrind_tool_list], - [AM_EXTRA_RECURSIVE_TARGETS([check-valgrind-]vgtool)]) - dnl Check for --enable-valgrind AC_ARG_ENABLE([valgrind], - [AS_HELP_STRING([--enable-valgrind], [Whether to enable Valgrind on the unit tests])], - [enable_valgrind=$enableval],[enable_valgrind=]) + [AS_HELP_STRING([--enable-valgrind], [Whether to enable Valgrind on the unit tests (requires GNU make)])], + [enable_valgrind=$enableval],[enable_valgrind=no]) AS_IF([test "$enable_valgrind" != "no"],[ # Check for Valgrind. @@ -177,7 +175,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-%-local,%,$''@):; +valgrind_v_use_0 = @echo " USE " $(patsubst check-valgrind-%,%,$''@):; # Support running with and without libtool. ifneq ($(LIBTOOL),) @@ -187,12 +185,12 @@ valgrind_lt = endif # Use recursive makes in order to ignore errors during check -check-valgrind-local: +check-valgrind: ifeq ($(VALGRIND_ENABLED),yes) $(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k \ $(foreach tool, $(valgrind_enabled_tools), check-valgrind-$(tool)) else - @echo "Need to reconfigure with --enable-valgrind" + @echo "Need to use GNU make and reconfigure with --enable-valgrind" endif # Valgrind running @@ -206,16 +204,14 @@ VALGRIND_LOG_COMPILER = \ $(valgrind_lt) \ $(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS) -define valgrind_tool_rule -check-valgrind-$(1)-local: +define valgrind_tool_rule = +check-valgrind-$(1): ifeq ($$(VALGRIND_ENABLED)-$$(ENABLE_VALGRIND_$(1)),yes-yes) -ifneq ($$(TESTS),) $$(valgrind_v_use)$$(MAKE) check-TESTS \ TESTS_ENVIRONMENT="$$(VALGRIND_TESTS_ENVIRONMENT)" \ LOG_COMPILER="$$(VALGRIND_LOG_COMPILER)" \ LOG_FLAGS="$$(valgrind_$(1)_flags)" \ TEST_SUITE_LOG=test-suite-$(1).log -endif else ifeq ($$(VALGRIND_ENABLED),yes) @echo "Need to reconfigure with --enable-valgrind-$(1)" else @@ -231,9 +227,15 @@ A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind MOSTLYCLEANFILES ?= MOSTLYCLEANFILES += $(valgrind_log_files) -.PHONY: check-valgrind $(addprefix check-valgrind-,$(valgrind_tools)) +.PHONY: check-valgrind $(add-prefix check-valgrind-,$(valgrind_tools)) '] + AS_IF([test "$enable_valgrind" != "yes"], [ + VALGRIND_CHECK_RULES=' +check-valgrind: + @echo "Need to use GNU make and reconfigure with --enable-valgrind"' + ]) + AC_SUBST([VALGRIND_CHECK_RULES]) m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([VALGRIND_CHECK_RULES])]) ]) diff --git a/src/Makefile.in b/src/Makefile.in index b531e879..187e1cdb 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -145,10 +145,6 @@ am__recursive_targets = \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir distdir-am -am__extra_recursive_targets = check-valgrind-recursive \ - check-valgrind-memcheck-recursive \ - check-valgrind-helgrind-recursive check-valgrind-drd-recursive \ - check-valgrind-sgcheck-recursive am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -440,11 +436,6 @@ $(am__recursive_targets): if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -check-valgrind-local: -check-valgrind-memcheck-local: -check-valgrind-helgrind-local: -check-valgrind-drd-local: -check-valgrind-sgcheck-local: ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -604,26 +595,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -check-valgrind: check-valgrind-recursive - -check-valgrind-am: check-valgrind-local - -check-valgrind-drd: check-valgrind-drd-recursive - -check-valgrind-drd-am: check-valgrind-drd-local - -check-valgrind-helgrind: check-valgrind-helgrind-recursive - -check-valgrind-helgrind-am: check-valgrind-helgrind-local - -check-valgrind-memcheck: check-valgrind-memcheck-recursive - -check-valgrind-memcheck-am: check-valgrind-memcheck-local - -check-valgrind-sgcheck: check-valgrind-sgcheck-recursive - -check-valgrind-sgcheck-am: check-valgrind-sgcheck-local - clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -693,15 +664,10 @@ uninstall-am: .MAKE: $(am__recursive_targets) install-am install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am check-valgrind-am check-valgrind-drd-am \ - check-valgrind-drd-local check-valgrind-helgrind-am \ - check-valgrind-helgrind-local check-valgrind-local \ - check-valgrind-memcheck-am check-valgrind-memcheck-local \ - check-valgrind-sgcheck-am check-valgrind-sgcheck-local clean \ - clean-generic clean-libtool cscopelist-am ctags ctags-am \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ diff --git a/src/libsodium/Makefile.in b/src/libsodium/Makefile.in index d33f9410..e6fdbba9 100644 --- a/src/libsodium/Makefile.in +++ b/src/libsodium/Makefile.in @@ -752,10 +752,6 @@ am__recursive_targets = \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir distdir-am -am__extra_recursive_targets = check-valgrind-recursive \ - check-valgrind-memcheck-recursive \ - check-valgrind-helgrind-recursive check-valgrind-drd-recursive \ - check-valgrind-sgcheck-recursive am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -3423,11 +3419,6 @@ $(am__recursive_targets): if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -check-valgrind-local: -check-valgrind-memcheck-local: -check-valgrind-helgrind-local: -check-valgrind-drd-local: -check-valgrind-sgcheck-local: ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -3745,26 +3736,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -check-valgrind: check-valgrind-recursive - -check-valgrind-am: check-valgrind-local - -check-valgrind-drd: check-valgrind-drd-recursive - -check-valgrind-drd-am: check-valgrind-drd-local - -check-valgrind-helgrind: check-valgrind-helgrind-recursive - -check-valgrind-helgrind-am: check-valgrind-helgrind-local - -check-valgrind-memcheck: check-valgrind-memcheck-recursive - -check-valgrind-memcheck-am: check-valgrind-memcheck-local - -check-valgrind-sgcheck: check-valgrind-sgcheck-recursive - -check-valgrind-sgcheck-am: check-valgrind-sgcheck-local - clean: clean-recursive clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ @@ -4079,12 +4050,7 @@ uninstall-am: uninstall-defexecDATA uninstall-libLTLIBRARIES .MAKE: $(am__recursive_targets) install-am install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--depfiles check check-am check-valgrind-am \ - check-valgrind-drd-am check-valgrind-drd-local \ - check-valgrind-helgrind-am check-valgrind-helgrind-local \ - check-valgrind-local check-valgrind-memcheck-am \ - check-valgrind-memcheck-local check-valgrind-sgcheck-am \ - check-valgrind-sgcheck-local clean clean-generic \ + am--depfiles check check-am clean clean-generic \ clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ cscopelist-am ctags ctags-am distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ diff --git a/src/libsodium/include/Makefile.in b/src/libsodium/include/Makefile.in index a9e9cfeb..5ebfbb58 100644 --- a/src/libsodium/include/Makefile.in +++ b/src/libsodium/include/Makefile.in @@ -159,10 +159,6 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" HEADERS = $(nobase_include_HEADERS) $(nobase_nodist_include_HEADERS) -am__extra_recursive_targets = check-valgrind-recursive \ - check-valgrind-memcheck-recursive \ - check-valgrind-helgrind-recursive check-valgrind-drd-recursive \ - check-valgrind-sgcheck-recursive am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -514,11 +510,6 @@ uninstall-nobase_nodist_includeHEADERS: @list='$(nobase_nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) -check-valgrind-local: -check-valgrind-memcheck-local: -check-valgrind-helgrind-local: -check-valgrind-drd-local: -check-valgrind-sgcheck-local: ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -642,26 +633,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -check-valgrind: check-valgrind-am - -check-valgrind-am: check-valgrind-local - -check-valgrind-drd: check-valgrind-drd-am - -check-valgrind-drd-am: check-valgrind-drd-local - -check-valgrind-helgrind: check-valgrind-helgrind-am - -check-valgrind-helgrind-am: check-valgrind-helgrind-local - -check-valgrind-memcheck: check-valgrind-memcheck-am - -check-valgrind-memcheck-am: check-valgrind-memcheck-local - -check-valgrind-sgcheck: check-valgrind-sgcheck-am - -check-valgrind-sgcheck-am: check-valgrind-sgcheck-local - clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am @@ -732,18 +703,14 @@ uninstall-am: uninstall-nobase_includeHEADERS \ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-valgrind-am \ - check-valgrind-drd-am check-valgrind-drd-local \ - check-valgrind-helgrind-am check-valgrind-helgrind-local \ - check-valgrind-local check-valgrind-memcheck-am \ - check-valgrind-memcheck-local check-valgrind-sgcheck-am \ - check-valgrind-sgcheck-local clean clean-generic clean-libtool \ - cscopelist-am ctags ctags-am distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-nobase_includeHEADERS \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man \ + install-nobase_includeHEADERS \ install-nobase_nodist_includeHEADERS install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ diff --git a/test/Makefile.in b/test/Makefile.in index 9e347137..37b1bb5c 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -145,10 +145,6 @@ am__recursive_targets = \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir distdir-am -am__extra_recursive_targets = check-valgrind-recursive \ - check-valgrind-memcheck-recursive \ - check-valgrind-helgrind-recursive check-valgrind-drd-recursive \ - check-valgrind-sgcheck-recursive am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -443,11 +439,6 @@ $(am__recursive_targets): if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -check-valgrind-local: -check-valgrind-memcheck-local: -check-valgrind-helgrind-local: -check-valgrind-drd-local: -check-valgrind-sgcheck-local: ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -607,26 +598,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -check-valgrind: check-valgrind-recursive - -check-valgrind-am: check-valgrind-local - -check-valgrind-drd: check-valgrind-drd-recursive - -check-valgrind-drd-am: check-valgrind-drd-local - -check-valgrind-helgrind: check-valgrind-helgrind-recursive - -check-valgrind-helgrind-am: check-valgrind-helgrind-local - -check-valgrind-memcheck: check-valgrind-memcheck-recursive - -check-valgrind-memcheck-am: check-valgrind-memcheck-local - -check-valgrind-sgcheck: check-valgrind-sgcheck-recursive - -check-valgrind-sgcheck-am: check-valgrind-sgcheck-local - clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -696,15 +667,10 @@ uninstall-am: .MAKE: $(am__recursive_targets) install-am install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am check-valgrind-am check-valgrind-drd-am \ - check-valgrind-drd-local check-valgrind-helgrind-am \ - check-valgrind-helgrind-local check-valgrind-local \ - check-valgrind-memcheck-am check-valgrind-memcheck-local \ - check-valgrind-sgcheck-am check-valgrind-sgcheck-local clean \ - clean-generic clean-libtool cscopelist-am ctags ctags-am \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ diff --git a/test/default/Makefile.in b/test/default/Makefile.in index cabee2e2..b64781c5 100644 --- a/test/default/Makefile.in +++ b/test/default/Makefile.in @@ -525,10 +525,6 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__extra_recursive_targets = check-valgrind-recursive \ - check-valgrind-memcheck-recursive \ - check-valgrind-helgrind-recursive check-valgrind-drd-recursive \ - check-valgrind-sgcheck-recursive am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -1767,11 +1763,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -check-valgrind-local: -check-valgrind-memcheck-local: -check-valgrind-helgrind-local: -check-valgrind-drd-local: -check-valgrind-sgcheck-local: ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -2639,26 +2630,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -check-valgrind: check-valgrind-am - -check-valgrind-am: check-valgrind-local - -check-valgrind-drd: check-valgrind-drd-am - -check-valgrind-drd-am: check-valgrind-drd-local - -check-valgrind-helgrind: check-valgrind-helgrind-am - -check-valgrind-helgrind-am: check-valgrind-helgrind-local - -check-valgrind-memcheck: check-valgrind-memcheck-am - -check-valgrind-memcheck-am: check-valgrind-memcheck-local - -check-valgrind-sgcheck: check-valgrind-sgcheck-am - -check-valgrind-sgcheck-am: check-valgrind-sgcheck-local - clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ @@ -2891,20 +2862,15 @@ uninstall-am: .MAKE: check-am install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \ - check-am check-valgrind-am check-valgrind-drd-am \ - check-valgrind-drd-local check-valgrind-helgrind-am \ - check-valgrind-helgrind-local check-valgrind-local \ - check-valgrind-memcheck-am check-valgrind-memcheck-local \ - check-valgrind-sgcheck-am check-valgrind-sgcheck-local clean \ - clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ - ctags ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + check-am clean clean-checkPROGRAMS clean-generic clean-libtool \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am