X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=test-example%2FDir.sd.mk;h=2e790679b582a661dc7bfe9f44a50f303c005a6c;hb=49b56eafcd147185c28848a7c04e31a32c49a82e;hp=d3eb7d24ddc29f5e1048bbaad102855b7b5617df;hpb=a7ca0b5b63003bd77edf3a338ebd9a2a4eb549c7;p=secnet.git

diff --git a/test-example/Dir.sd.mk b/test-example/Dir.sd.mk
index d3eb7d2..2e79067 100644
--- a/test-example/Dir.sd.mk
+++ b/test-example/Dir.sd.mk
@@ -1,21 +1,34 @@
-&TARGETS += & sites.conf inside.key outside.key
+&TARGETS += & sites.conf sites-nonego.conf
 
 include common.make
 
 &/%.key: &^/%.key.b64
 	base64 -d <$< >$@.new && mv -f $@.new $@
 
+&sites-nonego.conf: $(src)/make-secnet-sites &^/sites &/Dir.mk
+	$(src)/make-secnet-sites --output-version=1 &^/sites $@
+
 &sites.conf: $(src)/make-secnet-sites &^/sites &/Dir.mk
-	$(src)/make-secnet-sites &^/sites $@
+	mkdir -p &pubkeys
+	&~/make-secnet-sites --pubkeys-dir=&pubkeys --pubkeys-install \
+		&^/sites $@.tmp && mv -f $@.tmp $@
+
+&clean::
+	rm -rf &pubkeys
 
-define privkey
-&/$1.privkeys/priv.$2: &/$3
-	mkdir -p $$(dir $$@) && cp $$< $$@.tmp && mv -f $$@.tmp $$@
-&all-privkeys:: &/$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
+
+&${&privkey,outside,5dc36a4700,rsa1-sites2.key}
+&${&privkey,outside,0000000000,outside.key}
+&${&privkey,inside,0000000000,inside.key}
 
-$(eval $(call privkey,outside,0000000000,outside.key))
+&all-privkeys:: $(&PRIVKEYS)
 
+&TARGETS += $(&PRIVKEYS)
 &CLEAN += *.new