gpg: Also detect a plaintext packet before an encrypted packet.
[gnupg.git] / doc / Makefile.am
index 6e0bc15..cb69cd9 100644 (file)
@@ -13,7 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
 
 ## Process this file with automake to produce Makefile.in
 
@@ -21,7 +21,16 @@ AM_CPPFLAGS =
 
 include $(top_srcdir)/am/cmacros.am
 
 
 include $(top_srcdir)/am/cmacros.am
 
-examples = examples/README examples/scd-event examples/trustlist.txt \
+examples = examples/README examples/scd-event examples/trustlist.txt   \
+          examples/vsnfd.prf examples/debug.prf examples/qualified.txt \
+          examples/systemd-user/README                                 \
+          examples/systemd-user/dirmngr.service                        \
+          examples/systemd-user/dirmngr.socket                         \
+          examples/systemd-user/gpg-agent.service                      \
+          examples/systemd-user/gpg-agent.socket                       \
+          examples/systemd-user/gpg-agent-ssh.socket                   \
+          examples/systemd-user/gpg-agent-browser.socket               \
+          examples/systemd-user/gpg-agent-extra.socket                 \
           examples/gpgconf.conf examples/pwpattern.list
 
 helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt               \
           examples/gpgconf.conf examples/pwpattern.list
 
 helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt               \
@@ -32,20 +41,24 @@ 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
 
             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 \
+profiles =
+
+EXTRA_DIST = samplekeys.asc mksamplekeys com-certs.pem \
+            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 \
              FAQ gnupg7.texi mkdefsinc.c defsincdate \
              opt-homedir.texi see-also-note.texi specify-user-id.texi \
-            gpgv.texi yat2m.c ChangeLog-2011 whats-new-in-2.1.txt
+            gpgv.texi yat2m.c ChangeLog-2011 whats-new-in-2.1.txt \
+             trust-values.texi
 
 
-BUILT_SOURCES = gnupg-card-architecture.eps gnupg-card-architecture.png \
-                gnupg-card-architecture.pdf defsincdate defs.inc
+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
 
 
 info_TEXINFOS = gnupg.texi
 
-dist_pkgdata_DATA = qualified.txt com-certs.pem $(helpfiles)
+dist_pkgdata_DATA =  $(helpfiles) $(profiles)
 
 nobase_dist_doc_DATA = FAQ DETAILS HACKING DCO TRANSLATE OpenPGP KEYSERVER \
                        $(examples)
 
 nobase_dist_doc_DATA = FAQ DETAILS HACKING DCO TRANSLATE OpenPGP KEYSERVER \
                        $(examples)
@@ -56,25 +69,37 @@ nobase_dist_doc_DATA = FAQ DETAILS HACKING DCO 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 \
 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 wks.texi \
+        gnupg-module-overview.svg \
+        gnupg-card-architecture.fig \
        howtos.texi howto-create-a-server-cert.texi
 
 gnupg.texi : defs.inc
 
        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-ref=/share/site.css
 
 YAT2M_OPTIONS = -I $(srcdir) \
 DVIPS = TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" dvips
 
 AM_MAKEINFOFLAGS = -I $(srcdir) --css-ref=/share/site.css
 
 YAT2M_OPTIONS = -I $(srcdir) \
-        --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.1"
+        --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.2"
 
 myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \
 
 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 \
+               dirmngr.texi scdaemon.texi tools.texi wks.texi
+myman_pages   = gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \
                 watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
                 watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
-               gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \
-               applygnupgdefaults.8 \
+               gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 gpgtar.1 \
+               applygnupgdefaults.8 gpg-wks-client.1 gpg-wks-server.1 \
                dirmngr-client.1
                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
 
 
 man_MANS = $(myman_pages) gnupg.7
 
@@ -84,7 +109,9 @@ watchgnupg_SOURCE = gnupg.texi
 CLEANFILES = yat2m mkdefsinc defs.inc
 
 DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
 CLEANFILES = yat2m mkdefsinc defs.inc
 
 DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
-                $(myman_pages) gpg-zip.1 gpgkey2ssh.1 gnupg.7
+                 gnupg-card-architecture.eps \
+                 gnupg-module-overview.eps \
+                $(myman_pages) gnupg.7
 
 yat2m: yat2m.c
        $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
 
 yat2m: yat2m.c
        $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
@@ -93,6 +120,14 @@ mkdefsinc: mkdefsinc.c Makefile ../config.h
        $(CC_FOR_BUILD) -I. -I.. -I$(srcdir) $(AM_CPPFLAGS) \
                         -o $@ $(srcdir)/mkdefsinc.c
 
        $(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.png:
        fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@
@@ -112,12 +147,12 @@ yat2m-stamp: $(myman_sources) defs.inc
        @touch yat2m-stamp.tmp
        incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
        for file in $(myman_sources) ; do \
        @touch yat2m-stamp.tmp
        incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
        for file in $(myman_sources) ; do \
-              ./yat2m $(YAT2M_OPTIONS) --store \
+              $(YAT2M) $(YAT2M_OPTIONS) --store \
                   --date "`cat $$incd 2>/dev/null`" \
                  `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
        @mv -f yat2m-stamp.tmp $@
 
                   --date "`cat $$incd 2>/dev/null`" \
                  `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
        @mv -f yat2m-stamp.tmp $@
 
-yat2m-stamp: yat2m
+yat2m-stamp: $(YAT2M)
 
 $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
        @if test -f $@; then :; else \
 
 $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
        @if test -f $@; then :; else \
@@ -136,7 +171,7 @@ dist-hook: defsincdate
 
 defsincdate: $(gnupg_TEXINFOS)
        : >defsincdate ; \
 
 defsincdate: $(gnupg_TEXINFOS)
        : >defsincdate ; \
-       if test -d $(top_srcdir)/.git; then \
+       if test -e $(top_srcdir)/.git; then \
          (cd $(srcdir) && git log -1 --format='%ct' \
                -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
        fi
          (cd $(srcdir) && git log -1 --format='%ct' \
                -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
        fi
@@ -147,10 +182,13 @@ defs.inc : defsincdate Makefile mkdefsinc
            $(gnupg_TEXINFOS) >$@
 
 
            $(gnupg_TEXINFOS) >$@
 
 
-online: gnupg.html gnupg.pdf
+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/; \
        set -e; \
        echo "Uploading current manuals to www.gnupg.org ..."; \
        cp $(srcdir)/gnupg-logo-tr.png gnupg.html/; \
+       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" ; \
         user=werner ; webhost="ftp.gnupg.org" ; dashdevel="" ; \
         if echo "@PACKAGE_VERSION@" | grep -- "-beta" >/dev/null; then \
          dashdevel="-devel" ; \