From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 26 Mar 2020 13:43:04 +0000 (-0400)
Subject: clean up rules so that they don't run all of the time
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f65c979fc3abed6bcc451cb4313f541908706f85;p=thirdparty%2Ffreeradius-server.git

clean up rules so that they don't run all of the time
---

diff --git a/raddb/all.mk b/raddb/all.mk
index 0a5b7cea3fa..53987112e43 100644
--- a/raddb/all.mk
+++ b/raddb/all.mk
@@ -153,24 +153,30 @@ ${top_srcdir}/raddb/certs/ecc:
 
 define BUILD_CERT
 ${1}/${2}/${3}.key: ${1}/${3}.cnf $$(dir $$@)
-	$${Q}echo CERT-KEY ${1}
+	$${Q}echo CERT-KEY ${3}
 	$${Q}$$(MAKE) -C $${top_srcdir}/raddb/certs/ ${2}/${3}.key
+	@touch $$@
 
 ${1}/${2}/${3}.csr: ${1}/${2}/${3}.key
-	$${Q}echo CERT-CSR ${1}
+	$${Q}echo CERT-CSR ${3}
 	$${Q}$$(MAKE) -C $${top_srcdir}/raddb/certs/ ${2}/${3}.csr
+	@touch $$@
 
 ${1}/${2}/${3}.pem: ${1}/${2}/${3}.key
-	$${Q}echo CERT-PEM ${1}
+	$${Q}echo CERT-PEM ${3}
 	$${Q}$$(MAKE) -C $${top_srcdir}/raddb/certs/ ${2}/${3}.pem
+	@touch $$@
 
-${1}/${2}/${3}.crt: ${1}/${2}/${3}.csr ${1}/${2}/${3}.pem
-	$${Q}echo CERT-CRT ${1}
+${1}/${2}/${3}.crt: ${1}/${2}/${3}.pem
+	$${Q}echo CERT-CRT ${3}
 	$${Q}$$(MAKE) -C $${top_srcdir}/raddb/certs/ ${2}/${3}.crt
+	@touch $$@
 
 ifneq "${3}" "ca"
 #  client, server, and OCSP certs need the CA key.
 ${1}/${2}/${3}.crt: ${1}/${2}/ca.crt
+
+${1}/${2}/${3}.crt: ${1}/${2}/${3}.csr
 endif
 
 endef
@@ -181,7 +187,6 @@ endef
 #
 $(foreach dir,rsa ecc,$(foreach file,ca server client ocsp,$(eval $(call BUILD_CERT,${top_srcdir}/raddb/certs,${dir},${file}))))
 
-.PHONY: ${top_srcdir}/raddb/certs/dh
 ${top_srcdir}/raddb/certs/dh:
 	${Q}echo CERT-DH $@
 	${Q}$(MAKE) -C ${top_srcdir}/raddb/certs/ $(notdir $@)