cleanups

3 files changed, 16 insertions, 17 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..69fa449
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+_build/
diff --git a/Makefile b/Makefile
index 909b444..576a889 100644
--- a/Makefile
+++ b/Makefile
@@ -1,43 +1,41 @@
 SHELL = bash
 .DELETE_ON_ERROR: y
-SUDO != [ "$$(id -u)" = 0 ] || echo sudo
-
+ifneq ($(UID),0)
+SUDO = sudo
+endif
 .DEFAULT_TARGET = testall
 
-target = testfile
-
+target = _build/testfile
 signature = $(target).sig
 
 hostname != hostname
 identity = root@$(hostname)
+
+hostkey = /etc/ssh/ssh_host_ed25519_key
+key = $(hostkey)
+
 quoted_identity != printf %q $(identity)
 
-.PHONY: test validate
+.PHONY: testall clean install
+.PHONY: validate check-novalidate find-principals verify
 
 testall: $(signature) check-novalidate find-principals verify
-
 validate: $(signature) verify
 
-testfile:
+$(dir $(target)):
+        mkdir -p $@
+$(target): | $(dir $(target))
         echo hello world > $@
 
-hostkey = /etc/ssh/ssh_host_ed25519_key
-key = $(hostkey)
-
 %.sig: % | /usr/bin/ssh-keygen
         $(SUDO) ssh-keygen -n file -I $(quoted_identity) -f $(key) -Y sign $^
         $(MAKE) verify
 
-dirs = $(dir $(hostkey))
-$(dirs):
-        mkdir -p $@
-
-$(hostkey): | /usr/sbin/sshd /usr/bin/ssh-keygen $(dir $(hostkey))
+$(hostkey): | /usr/sbin/sshd /usr/bin/ssh-keygen
         test -e $@ || $(SUDO) ssh-keygen -t ed25519 -N '' -f $@
 
-.PHONY: check-novalidate verify find-principals clean
 clean:
-        rm -f test test.sig
+        rm -rf _build
 check-novalidate: $(signature) | /usr/bin/ssh-keygen
         ssh-keygen -n file -s $(signature) -f $(key).pub \
           -Y $@ < $(target)
diff --git a/extract-ed25519-pubkey b/src/extract-ed25519-pubkey
index ed66db4..ed66db4 100755
--- a/extract-ed25519-pubkey
+++ b/src/extract-ed25519-pubkey