2002-05-26 Marcus Brinkmann <marcus@g10code.de>

	* 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 8087dfb01f66121803b3329b50350e5121059727..c511ae121ade3332ad2d1e87d1c80cbd5589f5e9 100644 (file)
--- a/trunk/tests/ChangeLog
+++ b/trunk/tests/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-26  Marcus Brinkmann  <marcus@g10code.de>
+
+       * 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  <marcus@g10code.de>
 
        * gpgsm/t-verify.c (validity_string): New.

diff --git a/trunk/tests/gpg/Makefile.am b/trunk/tests/gpg/Makefile.am
index 7518716e7f2083c8dd652c92adafbc8f0ff767e0..04c0d11029f862edf758453fc019e10ce2abaf79 100644 (file)
--- 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