[svn] GnuPG - r5448 - in trunk: dirmngr tests/openpgp

[svn author wk]

Author: wk
Date: 2010-10-15 11:16:39 +0200 (Fri, 15 Oct 2010)
New Revision: 5448

Modified:
   trunk/dirmngr/ChangeLog
   trunk/dirmngr/Makefile.am
   trunk/tests/openpgp/ChangeLog
   trunk/tests/openpgp/Makefile.am
Log:
Tweaks to make make distcheck work.


Modified: trunk/dirmngr/ChangeLog
===================================================================
--- trunk/dirmngr/ChangeLog	2010-10-14 16:36:47 UTC (rev 5447)
+++ trunk/dirmngr/ChangeLog	2010-10-15 09:16:39 UTC (rev 5448)
@@ -1,3 +1,7 @@
+2010-10-15  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (CLEANFILES): Add no-libgcrypt.c.
+
 2010-09-16  Werner Koch  <wk at g10code.com>
 
 	* validate.c (validate_cert_chain): Use GPG_ERR_MISSING_ISSUER_CERT.

Modified: trunk/tests/openpgp/ChangeLog
===================================================================
--- trunk/tests/openpgp/ChangeLog	2010-10-14 16:36:47 UTC (rev 5447)
+++ trunk/tests/openpgp/ChangeLog	2010-10-15 09:16:39 UTC (rev 5448)
@@ -1,3 +1,7 @@
+2010-10-15  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (clean-local): New.
+
 2010-10-14  Werner Koch  <wk at g10code.com>
 
 	* genkey1024.test: Use the new no-protection option.

Modified: trunk/dirmngr/Makefile.am
===================================================================
--- trunk/dirmngr/Makefile.am	2010-10-14 16:36:47 UTC (rev 5447)
+++ trunk/dirmngr/Makefile.am	2010-10-15 09:16:39 UTC (rev 5448)
@@ -36,6 +36,8 @@
 
 BUILT_SOURCES = no-libgcrypt.c
 
+CLEANFILES = no-libgcrypt.c
+
 if HAVE_W32_SYSTEM
 ldap_url = ldap-url.h ldap-url.c
 else

Modified: trunk/tests/openpgp/Makefile.am
===================================================================
--- trunk/tests/openpgp/Makefile.am	2010-10-14 16:36:47 UTC (rev 5447)
+++ trunk/tests/openpgp/Makefile.am	2010-10-15 09:16:39 UTC (rev 5448)
@@ -68,14 +68,14 @@
 	     plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \
 	     *.test.log gpg_dearmor gpg.conf gpg-agent.conf S.gpg-agent \
 	     pubring.gpg secring.gpg pubring.pkr secring.skr \
-	     gnupg-test.stop
+	     gnupg-test.stop pubring.gpg~ random_seed
 
-DISTCLEANFILES = pubring.gpg~ random_seed
+clean-local:
+	-rm -rf private-keys-v1.d
 
+
 # We need to depend on a couple of programs so that the tests don't
 # start before all programs are built.
 all-local: $(required_pgms)
 
-distclean-local:
-	$(srcdir)/mkdemodirs --clean