agent: Adjust supervised mode for the new default socket names.
[gnupg.git] / Makefile.am
index 466c011..7950980 100644 (file)
 
 ## Process this file with automake to produce Makefile.in
 
-ACLOCAL_AMFLAGS = -I m4 -I gl/m4
-DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
+ACLOCAL_AMFLAGS = -I m4
+DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-g13 \
+  --enable-gpg2-is-gpg
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
 EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh autogen.rc \
-            ChangeLog-2011 po/ChangeLog-2011 build-aux/ChangeLog-2011 \
-            VERSION README.GIT build-aux/gitlog-to-changelog \
+            ChangeLog-2011 po/ChangeLog-2011 build-aux/ChangeLog-2011     \
+            VERSION README.GIT build-aux/gitlog-to-changelog COPYING.CC0  \
             build-aux/git-log-fix build-aux/git-log-footer \
             build-aux/getswdb.sh                           \
             build-aux/speedo.mk                            \
@@ -38,20 +39,16 @@ EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh autogen.rc \
              build-aux/speedo/w32/gdk-pixbuf-loaders.cache  \
              build-aux/speedo/w32/exdll.h                  \
              build-aux/speedo/w32/README.txt               \
+             build-aux/speedo/w32/gnupg-logo-150x57.bmp            \
+             build-aux/speedo/w32/gnupg-logo-164x314.bmp    \
              build-aux/speedo/patches/atk-1.32.0.patch     \
              build-aux/speedo/patches/libiconv-1.14.patch   \
-             build-aux/speedo/patches/pango-1.29.4.patch
+             build-aux/speedo/patches/pango-1.29.4.patch    \
+             build-aux/speedo/patches/sqlite.patch
 
 
 DISTCLEANFILES = g10defs.h
 
-if BUILD_GPGSM
-kbx = kbx
-else
-kbx =
-endif
-
-
 if BUILD_GPG
 gpg = g10
 else
@@ -93,21 +90,30 @@ else
 doc =
 endif
 
-if RUN_TESTS
-tests = tests
-else
-tests =
-endif
-
-SUBDIRS = m4 gl common ${kbx} \
+SUBDIRS = m4 common kbx \
           ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
-          ${tools} po ${doc} ${tests}
+          ${tools} po ${doc} tests
 
 dist_doc_DATA = README
 
 
 dist-hook: gen-ChangeLog
 
+distcheck-hook:
+       set -e; ( \
+       pref="#+macro: gnupg21_" ;\
+       reldate="$$(date -u +%Y-%m-%d)" ;\
+        echo "$${pref}ver  $(PACKAGE_VERSION)"  ;\
+        echo "$${pref}date $${reldate}" ;\
+        list='$(DIST_ARCHIVES)'; for i in $$list; do \
+         case "$$i" in *.tar.bz2) \
+            echo "$${pref}size $$(wc -c <$$i|awk '{print int($$1/1024)}')k" ;\
+           echo "$${pref}sha1 $$(sha1sum <$$i|cut -d' ' -f1)" ;\
+           echo "$${pref}sha2 $$(sha256sum <$$i|cut -d' ' -f1)" ;;\
+         esac;\
+       done ) | tee $(distdir).swdb
+
+
 if HAVE_W32_SYSTEM
 install-data-hook:
        set -e; \
@@ -125,7 +131,7 @@ endif
 gen_start_date = 2011-12-01T06:00:00
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
-       if test -d $(top_srcdir)/.git; then                             \
+       if test -e $(top_srcdir)/.git; then                             \
          (cd $(top_srcdir) &&                                          \
            $(GITLOG_TO_CHANGELOG) --append-dot --tear-off              \
            --amend=build-aux/git-log-fix                               \