gpg: Make sure that internal key import is done with a binary stream.
[gnupg.git] / doc / Makefile.am
index 9a46a07..52ac398 100644 (file)
 
 ## Process this file with automake to produce Makefile.in
 
+AM_CPPFLAGS =
+
+include $(top_srcdir)/am/cmacros.am
+
 examples = examples/README examples/scd-event examples/trustlist.txt \
           examples/gpgconf.conf examples/pwpattern.list
 
@@ -28,22 +32,23 @@ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt            \
             help.pt_BR.txt help.ro.txt help.ru.txt help.sk.txt         \
             help.sv.txt help.tr.txt help.zh_CN.txt help.zh_TW.txt
 
-EXTRA_DIST = samplekeys.asc mksamplekeys \
-            gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png gnupg-logo-tr.png\
-             gnupg-card-architecture.eps gnupg-card-architecture.png \
-             gnupg-card-architecture.pdf \
-             FAQ gnupg7.texi \
+EXTRA_DIST = samplekeys.asc mksamplekeys com-certs.pem qualified.txt \
+            gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png gnupg-logo-tr.png \
+            gnupg-module-overview.png gnupg-module-overview.pdf \
+             gnupg-card-architecture.png gnupg-card-architecture.pdf \
+             FAQ gnupg7.texi mkdefsinc.c defsincdate \
              opt-homedir.texi see-also-note.texi specify-user-id.texi \
-            gpgv.texi texi.css yat2m.c ChangeLog-2011
+            gpgv.texi yat2m.c ChangeLog-2011 whats-new-in-2.1.txt
 
-BUILT_SOURCES = gnupg-card-architecture.eps gnupg-card-architecture.png \
-                gnupg-card-architecture.pdf
+BUILT_SOURCES = gnupg-module-overview.png gnupg-module-overview.pdf \
+                gnupg-card-architecture.png gnupg-card-architecture.pdf \
+                defsincdate defs.inc
 
 info_TEXINFOS = gnupg.texi
 
-dist_pkgdata_DATA = qualified.txt com-certs.pem $(helpfiles)
+dist_pkgdata_DATA =  $(helpfiles)
 
-nobase_dist_doc_DATA = FAQ DETAILS HACKING TRANSLATE OpenPGP KEYSERVER \
+nobase_dist_doc_DATA = FAQ DETAILS HACKING DCO TRANSLATE OpenPGP KEYSERVER \
                        $(examples)
 
 #dist_html_DATA =
@@ -52,43 +57,71 @@ nobase_dist_doc_DATA = FAQ DETAILS HACKING TRANSLATE OpenPGP KEYSERVER \
 gnupg_TEXINFOS = \
        gpg.texi gpgsm.texi gpg-agent.texi scdaemon.texi instguide.texi \
        tools.texi debugging.texi glossary.texi contrib.texi gpl.texi \
-       sysnotes.texi gnupg-card-architecture.fig dirmngr.texi \
+       sysnotes.texi dirmngr.texi \
+        gnupg-module-overview.svg \
+        gnupg-card-architecture.fig \
        howtos.texi howto-create-a-server-cert.texi
 
+gnupg.texi : defs.inc
+
+# We need EPS files for "make distcheck" but we do not want to distribute
+# them due to their size.  Let's build them as needed.
+gnupg.dvi : gnupg-module-overview.eps gnupg-card-architecture.eps
+
+
 DVIPS = TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" dvips
 
-AM_MAKEINFOFLAGS = -I $(srcdir) --css-include=$(srcdir)/texi.css -D gpgtwoone
+AM_MAKEINFOFLAGS = -I $(srcdir) --css-ref=/share/site.css
 
-YAT2M_OPTIONS = -I $(srcdir) -D gpgtwoone \
-        --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard"
+YAT2M_OPTIONS = -I $(srcdir) \
+        --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.1"
 
 myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \
                dirmngr.texi scdaemon.texi tools.texi
-myman_pages   = gpg2.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 gpgv2.1 \
+myman_pages   = gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \
                 watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
                gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \
-               gpgsm-gencert.sh.1 applygnupgdefaults.8 gpg-zip.1 \
+               applygnupgdefaults.8 \
                dirmngr-client.1
+if USE_GPG2_HACK
+myman_pages += gpg2.1 gpgv2.1
+else
+myman_pages += gpg.1 gpgv.1
+endif
 
 man_MANS = $(myman_pages) gnupg.7
 
 watchgnupg_SOURCE = gnupg.texi
 
 
-CLEANFILES = yat2m faq.txt faq.html
+CLEANFILES = yat2m mkdefsinc defs.inc
 
 DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
-                $(myman_pages) gnupg.7
+                 gnupg-card-architecture.eps \
+                 gnupg-module-overview.eps \
+                $(myman_pages) gpg-zip.1 gnupg.7
 
 yat2m: yat2m.c
        $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
 
+mkdefsinc: mkdefsinc.c Makefile ../config.h
+       $(CC_FOR_BUILD) -I. -I.. -I$(srcdir) $(AM_CPPFLAGS) \
+                        -o $@ $(srcdir)/mkdefsinc.c
+
+.svg.eps:
+       convert `test -f '$<' || echo '$(srcdir)/'`$< $@
+
+.svg.png:
+       convert `test -f '$<' || echo '$(srcdir)/'`$< $@
+
+.svg.pdf:
+       convert `test -f '$<' || echo '$(srcdir)/'`$< $@
 
 .fig.png:
        fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@
 
 .fig.jpg:
-       fig2dev -L jpg `test -f '$<' || echo '$(srcdir)/'`$< $@
+       fig2dev -L jpeg `test -f '$<' || echo '$(srcdir)/'`$< $@
 
 .fig.eps:
        fig2dev -L eps `test -f '$<' || echo '$(srcdir)/'`$< $@
@@ -97,17 +130,19 @@ yat2m: yat2m.c
        fig2dev -L pdf `test -f '$<' || echo '$(srcdir)/'`$< $@
 
 
-yat2m-stamp: $(myman_sources)
+yat2m-stamp: $(myman_sources) defs.inc
        @rm -f yat2m-stamp.tmp
        @touch yat2m-stamp.tmp
+       incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
        for file in $(myman_sources) ; do \
               ./yat2m $(YAT2M_OPTIONS) --store \
+                  --date "`cat $$incd 2>/dev/null`" \
                  `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
        @mv -f yat2m-stamp.tmp $@
 
 yat2m-stamp: yat2m
 
-$(myman_pages) gnupg.7 : yat2m-stamp
+$(myman_pages) gnupg.7 : yat2m-stamp defs.inc
        @if test -f $@; then :; else \
             trap 'rm -rf yat2m-stamp yat2m-lock' 1 2 13 15; \
                if mkdir yat2m-lock 2>/dev/null; then \
@@ -120,43 +155,34 @@ $(myman_pages) gnupg.7 : yat2m-stamp
                fi; \
              fi
 
-# Make sure that gnupg.texi is touched if any other source file has
-# been modified.  This is required so that the version.texi magic
-# updates the release date.
-gnupg.texi : $(gnupg_TEXINFOS)
-       touch $(srcdir)/gnupg.texi
+dist-hook: defsincdate
+
+defsincdate: $(gnupg_TEXINFOS)
+       : >defsincdate ; \
+       if test -e $(top_srcdir)/.git; then \
+         (cd $(srcdir) && git log -1 --format='%ct' \
+               -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
+       fi
 
-online: gnupg.html gnupg.pdf
+defs.inc : defsincdate Makefile mkdefsinc
+       incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
+       ./mkdefsinc -C $(srcdir) --date "`cat $$incd 2>/dev/null`" \
+           $(gnupg_TEXINFOS) >$@
+
+
+online: gnupg.html gnupg.pdf gnupg-module-overview.png \
+           gnupg-card-architecture.png
        set -e; \
        echo "Uploading current manuals to www.gnupg.org ..."; \
        cp $(srcdir)/gnupg-logo-tr.png gnupg.html/; \
-        user=werner ; dashdevel="" ; \
-        if echo "@PACKAGE_VERSION@" | grep -- "-git" >/dev/null; then \
+       cp gnupg-module-overview.png gnupg.html/; \
+       cp gnupg-card-architecture.png gnupg.html/; \
+        user=werner ; webhost="ftp.gnupg.org" ; dashdevel="" ; \
+        if echo "@PACKAGE_VERSION@" | grep -- "-beta" >/dev/null; then \
          dashdevel="-devel" ; \
        else \
-          rsync -v gnupg.pdf $${user}@cvs.gnupg.org:webspace/manuals/ ; \
+          rsync -v gnupg.pdf $${user}@$${webhost}:webspace/manuals/ ; \
         fi ; \
        cd gnupg.html ; \
-        rsync -vr --exclude='.svn' .  \
-         $${user}@cvs.gnupg.org:webspace/manuals/gnupg$${dashdevel}/
-
-# Note that you need a recent version of emacs23 with org-mode 7.01h
-faq.txt faq.html: faq.org
-       @set -e; expopt="t nil nil nil \"$$(pwd)\""; \
-        emacs  --batch \
-         --eval "(require 'org)" \
-         --visit "$(srcdir)/faq.org" \
-          --eval "(setq org-export-ascii-entities 'utf8)" \
-          --eval "(org-export-as-ascii org-export-headline-levels $${expopt})"\
-         --visit "$(srcdir)/faq.org" \
-          --eval "(setq org-export-html-style-include-default nil)" \
-          --eval "(setq org-export-html-style-include-scripts nil)" \
-          --eval "(org-export-as-html org-export-headline-levels $${expopt})"
-
-faq-online: faq.txt faq.html
-       set -e; \
-        user=werner ; \
-       echo "Uploading current FAQ to {www,ftp}.gnupg.org ..."; \
-       scp faq.html $${user}@ftp.gnupg.org:webspace/manuals/GnuPG-FAQ.html ; \
-       scp faq.txt  $${user}@ftp.gnupg.org:gcrypt/gnupg/GnuPG-FAQ.txt ; \
-       echo "...ready"
+        rsync -vr --exclude='.git' .  \
+         $${user}@$${webhost}:webspace/manuals/gnupg$${dashdevel}/