gpg: Change --print-pka-records into an option.
[gnupg.git] / Makefile.am
index 08b5d32..57529b6 100644 (file)
 
 ## Process this file with automake to produce Makefile.in
 
-ACLOCAL_AMFLAGS = -I m4 -I gl/m4
+ACLOCAL_AMFLAGS = -I m4
 DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
-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 \
-            scripts/speedo.mk
+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 \
+            build-aux/git-log-fix build-aux/git-log-footer \
+            build-aux/getswdb.sh                           \
+            build-aux/speedo.mk                            \
+             build-aux/speedo/zlib.pc                      \
+             build-aux/speedo/w32/inst-options.ini         \
+             build-aux/speedo/w32/inst.nsi                 \
+             build-aux/speedo/w32/pkg-copyright.txt        \
+             build-aux/speedo/w32/g4wihelp.c               \
+             build-aux/speedo/w32/pango.modules                    \
+             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
+
+
 DISTCLEANFILES = g10defs.h
 
 if BUILD_GPGSM
@@ -39,12 +56,8 @@ endif
 
 if BUILD_GPG
 gpg = g10
-if !HAVE_W32CE_SYSTEM
-keyserver =
-endif
 else
 gpg =
-keyserver =
 endif
 if BUILD_GPGSM
 sm = sm
@@ -88,25 +101,24 @@ else
 tests =
 endif
 
-SUBDIRS = m4 gl include common ${kbx} \
-          ${gpg} ${keyserver} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
+SUBDIRS = m4 common ${kbx} \
+          ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
           ${tools} po ${doc} ${tests}
 
 dist_doc_DATA = README
 
 
 dist-hook: gen-ChangeLog
-       echo "$(VERSION)" > $(distdir)/VERSION
 
 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
@@ -118,9 +130,9 @@ gen-ChangeLog:
        if test -d $(top_srcdir)/.git; then                             \
          (cd $(top_srcdir) &&                                          \
            $(GITLOG_TO_CHANGELOG) --append-dot --tear-off              \
-           --amend=scripts/git-log-fix                                 \
+           --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