From: Marcus Brinkmann Date: Sun, 26 May 2002 19:51:53 +0000 (+0000) Subject: 2002-05-26 Marcus Brinkmann X-Git-Tag: gpgme-1.2.0@1385~982 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f4a5df4933bb07db6a4a3d8aeefc5f99ec8593d8;p=gpgme.git 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. --- diff --git a/trunk/tests/ChangeLog b/trunk/tests/ChangeLog index 8087dfb..c511ae1 100644 --- a/trunk/tests/ChangeLog +++ b/trunk/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/trunk/tests/gpg/Makefile.am b/trunk/tests/gpg/Makefile.am index 7518716..04c0d11 100644 --- a/trunk/tests/gpg/Makefile.am +++ b/trunk/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