tests/certs/Makefile.am: avoid superfluous cert re-generation

Fixes #16897
Closes #16899

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7af7800d94cff428e324edd4d33c1ccfaf47f1f7..33b41f4c3c98859b5508389b48984bf26c97603a 100644 (file)
--- 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 1da02868895259941ebdf2f527769787549141c0..78303c2526badd2ea40e202a4b158cc9b5e0a428 100644 (file)
--- 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)