From ac8f6d2c8a51317bbf17baf5589fc91a5748823b Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Sun, 26 May 2002 19:51:53 +0000 Subject: [PATCH] 2002-05-26 Marcus Brinkmann * gpg/Makefile.am (all-local): Remove dependency on ./secring.gpg. (./secring.gpg): Remove target, and move all rules for this target to ... (./pubring.gpg): ... here. This was necessary because GnuPG 1.0.7 does create an empty secring.gpg file when importing public keys. --- tests/ChangeLog | 8 ++++++++ tests/gpg/Makefile.am | 6 ++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index 8087dfb0..c511ae12 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,11 @@ +2002-05-26 Marcus Brinkmann + + * gpg/Makefile.am (all-local): Remove dependency on ./secring.gpg. + (./secring.gpg): Remove target, and move all rules for this target + to ... + (./pubring.gpg): ... here. This was necessary because GnuPG 1.0.7 + does create an empty secring.gpg file when importing public keys. + 2002-05-08 Marcus Brinkmann * gpgsm/t-verify.c (validity_string): New. diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index 7518716e..04c0d110 100644 --- a/tests/gpg/Makefile.am +++ b/tests/gpg/Makefile.am @@ -43,12 +43,10 @@ noinst_PROGRAMS = $(TESTS) t-genkey clean-local: $(srcdir)/mkdemodirs --clean -all-local: ./pubring.gpg ./secring.gpg +all-local: ./pubring.gpg -./pubring.gpg: $(srcdir)/pubdemo.asc +./pubring.gpg: $(srcdir)/pubdemo.asc ./Alpha/Secret.gpg $(GPG) --homedir . --import $(srcdir)/pubdemo.asc - -./secring.gpg: ./Alpha/Secret.gpg $(GPG) --homedir . --allow-secret-key-import --import Alpha/Secret.gpg Zulu/Secret.gpg ./Alpha/Secret.gpg: secdemo.asc