Build the removed keys keyring

Also improve cleanup

diff --git a/Makefile b/Makefile
index 65e1f60970e43ac21bd1b81fe1204ab6c584adc3..3b0b58f2dc97b6710e5a4175f2d43d314e538ee5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ TMPRING := trusted.gpg/build-area
 
 GPG_OPTIONS := --no-options --no-default-keyring --no-auto-check-trustdb --trustdb-name ./trustdb.gpg
 
-build: keyrings/mh-archive-keyring.gpg $(TRUSTED-LIST)
+build: keyrings/mh-archive-keyring.gpg keyrings/mh-archive-removed-keys.gpg $(TRUSTED-LIST)
 
 keyrings/mh-archive-keyring.gpg: active-keys/index
        jetring-build -I $@ active-keys
@@ -24,10 +24,15 @@ $(TRUSTED-LIST) :: trusted.gpg/mh-archive-%.gpg : active-keys/add-% active-keys/
 
 clean:
        rm -f keyrings/mh-archive-keyring.gpg \
-               keyrings/mh-archive-keyring.gpg.lastchangeset
-       rm -f keyrings/team-members.gpg \
-               keyrings/team-members.gpg.lastchangeset
+               keyrings/mh-archive-keyring.gpg~ \
+               keyrings/mh-archive-keyring.gpg.lastchangeset \
+               $(EOL)
+       rm -f keyrings/mh-archive-removed-keys.gpg \
+               keyrings/mh-archive-removed-keys.gpg~ \
+               keyrings/mh-archive-removed-keys.gpg.lastchangeset \
+               $(EOL)
        rm -rf $(TMPRING) trusted.gpg trustdb.gpg
+       rm -f keyrings/*.cache
 
 install: build
        install -d $(DESTDIR)/usr/share/keyrings/