summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2010-10-15 11:16:39 +0200
committerWerner Koch <wk@gnupg.org>2010-10-15 11:16:39 +0200
commitd1bdc3f6ea32c802589eb4f3060cb02cb51a8301 (patch)
tree3660be7d229d9bd838df268db86aa2ad1aa67592
parentRemove debug options (diff)
downloadgnupg2-d1bdc3f6ea32c802589eb4f3060cb02cb51a8301.tar.xz
gnupg2-d1bdc3f6ea32c802589eb4f3060cb02cb51a8301.zip
Tweaks to make make distcheck work.
-rw-r--r--dirmngr/ChangeLog4
-rw-r--r--dirmngr/Makefile.am2
-rw-r--r--tests/openpgp/ChangeLog4
-rw-r--r--tests/openpgp/Makefile.am8
4 files changed, 14 insertions, 4 deletions
diff --git a/dirmngr/ChangeLog b/dirmngr/ChangeLog
index ffe9bbd24..d88822e9d 100644
--- a/dirmngr/ChangeLog
+++ b/dirmngr/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-15 Werner Koch <wk@g10code.com>
+
+ * Makefile.am (CLEANFILES): Add no-libgcrypt.c.
+
2010-09-16 Werner Koch <wk@g10code.com>
* validate.c (validate_cert_chain): Use GPG_ERR_MISSING_ISSUER_CERT.
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index 849b5afc3..7e1ce9df6 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -36,6 +36,8 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) \
BUILT_SOURCES = no-libgcrypt.c
+CLEANFILES = no-libgcrypt.c
+
if HAVE_W32_SYSTEM
ldap_url = ldap-url.h ldap-url.c
else
diff --git a/tests/openpgp/ChangeLog b/tests/openpgp/ChangeLog
index 46da4fe33..d7c444b97 100644
--- a/tests/openpgp/ChangeLog
+++ b/tests/openpgp/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-15 Werner Koch <wk@g10code.com>
+
+ * Makefile.am (clean-local): New.
+
2010-10-14 Werner Koch <wk@g10code.com>
* genkey1024.test: Use the new no-protection option.
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 9ea2237b9..54132a944 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -68,14 +68,14 @@ CLEANFILES = prepared.stamp x y yy z out err $(data_files) \
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
+
+clean-local:
+ -rm -rf private-keys-v1.d
-DISTCLEANFILES = pubring.gpg~ random_seed
# 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