From 66c95f05fae6734144fcd9cee8937457b67c71ed Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 1 Apr 2025 11:06:27 +0200 Subject: [PATCH] tests/certs/Makefile.am: avoid superfluous cert re-generation Fixes #16897 Closes #16899 --- tests/Makefile.am | 2 +- tests/certs/Makefile.am | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 7af7800d94..33b41f4c3c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -158,7 +158,7 @@ perlcheck: @if ! test -x "$(PERL)"; then echo "No perl!"; exit 2; fi build-certs: - (cd certs && $(MAKE) build-certs) + (cd certs && $(MAKE)) test: perlcheck all $(TEST) $(TFLAGS) diff --git a/tests/certs/Makefile.am b/tests/certs/Makefile.am index 1da0286889..78303c2526 100644 --- a/tests/certs/Makefile.am +++ b/tests/certs/Makefile.am @@ -30,9 +30,16 @@ EXTRA_DIST = $(CERTCONFIG_CA) $(CERTCONFIGS) $(SRPFILES) CMakeLists.txt \ DISTCLEANFILES = $(GENERATEDCERTS) +all-am: test-ca.cacert + # Rebuild the certificates -clean-certs: +# Generate all certs in a single shot, but declare just a single target file +# to support GNU Make <4.3 without the "grouped explicit targets" feature. +test-ca.cacert: $(CERTCONFIG_CA) $(CERTCONFIGS) genserv.pl + $(PERL) $(srcdir)/genserv.pl test $(CERTCONFIGS) + +clean-local: rm -f $(GENERATEDCERTS) \ test-*.csr \ test-*.der \ @@ -41,10 +48,3 @@ clean-certs: test-ca.db* \ test-ca.raw* \ test-ca.srl - -build-certs: test-ca.cacert - -# Generate all certs in a single shot, but declare just a single target file -# to support GNU Make <4.3 without the "grouped explicit targets" feature. -test-ca.cacert: $(CERTCONFIG_CA) $(CERTCONFIGS) genserv.pl - $(PERL) $(srcdir)/genserv.pl test $(CERTCONFIGS)