From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 25 Mar 2020 20:06:32 +0000 (-0400)
Subject: add explicit dependencies for all products
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc23f79ff6ab4e30ded4abdebf15d2477e9f443c;p=thirdparty%2Ffreeradius-server.git

add explicit dependencies for all products

so that gnu make can properly do -j 8
---

diff --git a/raddb/all.mk b/raddb/all.mk
index 1b731da7e9b..e5a19ce4dbd 100644
--- a/raddb/all.mk
+++ b/raddb/all.mk
@@ -152,16 +152,33 @@ ${top_srcdir}/raddb/certs/ecc:
 	@mkdir -p $@
 
 define BUILD_CERT
-$$(addprefix $${top_srcdir}/raddb/certs/,${1}): $(wildcard raddb/certs/*cnf) | $$(dir $$@)
-	$${Q}echo CERT ${1}
-	$${Q}$$(MAKE) -C $${top_srcdir}/raddb/certs/ ${1}
+${1}/${2}/${3}.key: ${1}/${3}.cnf $$(dir $$@)
+	$${Q}echo CERT-KEY ${1}
+	$${Q}$$(MAKE) -C $${top_srcdir}/raddb/certs/ ${2}/${3}.key
+
+${1}/${2}/${3}.csr: ${1}/${2}/${3}.key
+	$${Q}echo CERT-CSR ${1}
+	$${Q}$$(MAKE) -C $${top_srcdir}/raddb/certs/ ${2}/${3}.csr
+
+${1}/${2}/${3}.pem: ${1}/${2}/${3}.key
+	$${Q}echo CERT-PEM ${1}
+	$${Q}$$(MAKE) -C $${top_srcdir}/raddb/certs/ ${2}/${3}.pem
+
+${1}/${2}/${3}.crt: ${1}/${2}/${3}.csr ${1}/${2}/${3}.pem
+	$${Q}echo CERT-CRT ${1}
+	$${Q}$$(MAKE) -C $${top_srcdir}/raddb/certs/ ${2}/${3}.crt
 endef
 
 #
 #  Generate local certificate products when doing a non-package
 #  (i.e. developer) build.
 #
-$(foreach x,$(LOCAL_CERT_FILES),$(eval $(call BUILD_CERT,$x)))
+$(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 $@)
 
 #
 #  If we're not packaging the server, install the various