gpg-connect-agent: Make it easier to connect to the dirmngr.
[gnupg.git] / Makefile.am
index 5f9bf2e..3b79226 100644 (file)
 ## Process this file with automake to produce Makefile.in
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
-AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
 
-EXTRA_DIST = scripts/config.rpath scripts/potomo autogen.sh README.GIT \
-            ChangeLog-2011 po/ChangeLog-2011 scripts/ChangeLog-2011 \
-            scripts/gitlog-to-changelog \
-            scripts/git-log-fix scripts/git-log-footer
+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 \
+            build-aux/gitlog-to-changelog \
+            build-aux/git-log-fix build-aux/git-log-footer \
+            build-aux/speedo.mk README.GIT
+
 DISTCLEANFILES = g10defs.h
 
 if BUILD_GPGSM
@@ -80,13 +83,13 @@ else
 doc =
 endif
 
-if HAVE_W32_SYSTEM
-tests =
-else
+if RUN_TESTS
 tests = tests
+else
+tests =
 endif
 
-SUBDIRS = m4 gl include common ${kbx} \
+SUBDIRS = m4 gl common ${kbx} \
           ${gpg} ${keyserver} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
           ${tools} po ${doc} ${tests}
 
@@ -99,12 +102,12 @@ dist-hook: gen-ChangeLog
 if HAVE_W32_SYSTEM
 install-data-hook:
        set -e; \
-       for i in $$($(top_srcdir)/scripts/potomo \
+       for i in $$($(top_srcdir)/build-aux/potomo \
                      --get-linguas $(top_srcdir)/po) ; do \
            $(MKDIR_P) "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES" || true; \
            rm -f "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" \
                                                  2>/dev/null || true; \
-           $(top_srcdir)/scripts/potomo $(top_srcdir)/po/$$i.po \
+           $(top_srcdir)/build-aux/potomo $(top_srcdir)/po/$$i.po \
               "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" ; \
        done
 endif
@@ -115,11 +118,10 @@ gen_start_date = 2011-12-01T06:00:00
 gen-ChangeLog:
        if test -d $(top_srcdir)/.git; then                             \
          (cd $(top_srcdir) &&                                          \
-           ./scripts/gitlog-to-changelog                               \
-           --append-dot                                                \
-           --amend=scripts/git-log-fix                                 \
+           $(GITLOG_TO_CHANGELOG) --append-dot --tear-off              \
+           --amend=build-aux/git-log-fix                               \
            --since=$(gen_start_date) ) > $(distdir)/cl-t;              \
-          cat $(top_srcdir)/scripts/git-log-footer >> $(distdir)/cl-t;  \
+          cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;  \
          rm -f $(distdir)/ChangeLog;                                   \
          mv $(distdir)/cl-t $(distdir)/ChangeLog;                      \
        fi