From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 30 Dec 2019 12:02:26 +0000 (+0000)
Subject: test-example: Use subdirmk's new &:macro feature
X-Git-Tag: v0.6.0~17
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7e311a0bf071a2fb1fc6857a9e9828b8c8f7da54;p=secnet.git

test-example: Use subdirmk's new &:macro feature

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/test-example/Dir.sd.mk b/test-example/Dir.sd.mk
index 809aa0a..2e79067 100644
--- a/test-example/Dir.sd.mk
+++ b/test-example/Dir.sd.mk
@@ -16,17 +16,17 @@ include common.make
 &clean::
 	rm -rf &pubkeys
 
-define privkey
-&/$1.privkeys/priv.$2: &/$3
-	mkdir -p $$(dir $$@) && cp $$< $$@.tmp && mv -f $$@.tmp $$@
-&PRIVKEYS += &/$3 &/$1.privkeys/priv.$2
+&:macro &privkey
+&/&$1.privkeys/priv.&$2: &/&$3
+	mkdir -p $(dir $@) && cp $< $@.tmp && mv -f $@.tmp $@
+&PRIVKEYS += &/&$3 &/&$1.privkeys/priv.&$2
 &clean::
-	rm -rf &/$1.privkeys
-endef
+	rm -rf &/&$1.privkeys
+&:endm
 
-$(eval $(call privkey,outside,5dc36a4700,rsa1-sites2.key))
-$(eval $(call privkey,outside,0000000000,outside.key))
-$(eval $(call privkey,inside,0000000000,inside.key))
+&${&privkey,outside,5dc36a4700,rsa1-sites2.key}
+&${&privkey,outside,0000000000,outside.key}
+&${&privkey,inside,0000000000,inside.key}
 
 &all-privkeys:: $(&PRIVKEYS)