[SCM] GNU gnutls branch, finston_0, updated. gnutls_2_9_10-328-gfe6b1aa

[Laurence Finston]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=fe6b1aabccf32d915fea66a16edef71f363376b7

The branch, finston_0 has been updated
       via  fe6b1aabccf32d915fea66a16edef71f363376b7 (commit)
       via  85d6c1ff2d9997580816e054d6e10bb723bdb014 (commit)
       via  9b19beff93b60af21a7edf040e689df80d72f2ad (commit)
       via  36ebc1b4ae29876658c38212c2560b08ff3d08a8 (commit)
       via  bd2cc937e9cb177b8f2989dce7600b55fef28ba8 (commit)
       via  d522977e6f1e2183de30a94d5aca3acc9e1f24a6 (commit)
       via  8fe1ec01373cbbe42b576af450ff97ad4d1ec725 (commit)
      from  be3055dfa28a598e152db4451220965978cf5f47 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fe6b1aabccf32d915fea66a16edef71f363376b7
Author: Laurence Finston <address@hidden>
Date:   Thu Jul 15 15:45:47 2010 +0200

    Removed the multiple-target rule for generated Texinfo files.
    
    This didn't work.  Now using individual rules again.

commit 85d6c1ff2d9997580816e054d6e10bb723bdb014
Author: Laurence Finston <address@hidden>
Date:   Thu Jul 15 15:25:55 2010 +0200

    Edited.

commit 9b19beff93b60af21a7edf040e689df80d72f2ad
Author: Laurence Finston <address@hidden>
Date:   Thu Jul 15 14:53:11 2010 +0200

    Added 'cha-datatypes.texi' to 'gnutls_TEXINFOS'.

commit 36ebc1b4ae29876658c38212c2560b08ff3d08a8
Author: Laurence Finston <address@hidden>
Date:   Thu Jul 15 14:51:49 2010 +0200

    Initial version.

commit bd2cc937e9cb177b8f2989dce7600b55fef28ba8
Author: Laurence Finston <address@hidden>
Date:   Thu Jul 15 14:33:41 2010 +0200

    Added "2010" to copyright notice.

commit d522977e6f1e2183de30a94d5aca3acc9e1f24a6
Author: Laurence Finston <address@hidden>
Date:   Thu Jul 15 14:31:52 2010 +0200

    Edited.

commit 8fe1ec01373cbbe42b576af450ff97ad4d1ec725
Author: Laurence Finston <address@hidden>
Date:   Thu Jul 15 14:29:01 2010 +0200

    Edited.

-----------------------------------------------------------------------

Summary of changes:
 doc/Makefile.am        |   94 +++++++++++++++++++++++++++++++++--------------
 doc/cha-datatypes.texi |   10 +++++
 doc/scripts/gdoc       |    2 +-
 3 files changed, 77 insertions(+), 29 deletions(-)
 create mode 100644 doc/cha-datatypes.texi

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d88eaa5..0b22b03 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -30,9 +30,13 @@ SUBDIRS += reference
 endif
 
 info_TEXINFOS = gnutls.texi
+
+#### LDF 2010.07.15.
+#### Added 'cha-datatypes.texi' to 'gnutls_TEXINFOS'.
+
 gnutls_TEXINFOS = gnutls.texi fdl-1.3.texi lgpl-2.1.texi gpl-3.0.texi \
        cha-auth.texi cha-bib.texi cha-cert-auth.texi cha-ciphersuites.texi \
-       cha-copying.texi cha-functions.texi cha-gtls-app.texi \
+       cha-copying.texi cha-datatypes.texi cha-functions.texi 
cha-gtls-app.texi \
        cha-internals.texi cha-intro-tls.texi cha-library.texi \
        cha-preface.texi cha-programs.texi cha-tls-app.texi
 
@@ -100,51 +104,77 @@ MAINTAINERCLEANFILES =
 
 # Generated texinfos.
 
-
 gnutls_TEXINFOS += gnutls-api.texi extra-api.texi ia-api.texi  \
        x509-api.texi pgp-api.texi
 MAINTAINERCLEANFILES += gnutls-api.texi extra-api.texi ia-api.texi     \
        x509-api.texi pgp-api.texi
 
-#### LDF 2010.07.15.
-#### Added variable 'generated_TEXINFOS_1' and a rule with multiple
-#### targets to generate the files to which it refers.
-#### In addition, a header is now written to these files.
-####
-#### Added a "phony" rule 'generated_texinfo_files' to generate
-#### these files (and 'error_codes.texi' and 'algorithms.texi' as well)
-#### for testing purposes.
-
-.PHONY: generated_texinfo_files
-
-generated_texinfo_files: $(generated_TEXINFOS_1) error_codes.texi 
algorithms.texi
-
-generated_TEXINFOS_1 = gnutls-api.texi extra-api.texi ia-api.texi      \
-       x509-api.texi pgp-api.texi
+gnutls-api.texi: $(srcdir)/../lib/*.c
+       echo "" > address@hidden
+       for i in $^; do \
+               echo -n "Creating documentation for file $$i... " && \
+               $(srcdir)/scripts/gdoc -texinfo $$i >> address@hidden && \
+               echo "ok"; \
+       done
+       @echo -e "@c address@hidden@c DO NOT EDIT THIS FILE!!\n"\
+"@c It was generated automatically on `date`\n" > address@hidden
+       $(srcdir)/scripts/sort2.pl < address@hidden >> address@hidden
+       rm -f address@hidden
+       mv -f address@hidden $@
 
+x509-api.texi: $(srcdir)/../lib/x509/*.c
+       echo "" > address@hidden
+       for i in $^; do \
+               echo -n "Creating documentation for file $$i... " && \
+               $(srcdir)/scripts/gdoc -texinfo $$i >> address@hidden && \
+               echo "ok"; \
+       done
+       @echo -e "@c address@hidden@c DO NOT EDIT THIS FILE!!\n"\
+"@c It was generated automatically on `date`\n" > address@hidden
+       $(srcdir)/scripts/sort2.pl < address@hidden >> address@hidden
+       rm -f address@hidden
+       mv -f address@hidden $@
 
-$(generated_TEXINFOS_1): $(srcdir)/../lib/*.c
+pgp-api.texi: $(srcdir)/../lib/openpgp/*.c
        echo "" > address@hidden
        for i in $^; do \
                echo -n "Creating documentation for file $$i... " && \
                $(srcdir)/scripts/gdoc -texinfo $$i >> address@hidden && \
                echo "ok"; \
        done
-       rm -f address@hidden
        @echo -e "@c address@hidden@c DO NOT EDIT THIS FILE!!\n"\
 "@c It was generated automatically on `date`\n" > address@hidden
        $(srcdir)/scripts/sort2.pl < address@hidden >> address@hidden
        rm -f address@hidden
        mv -f address@hidden $@
 
+extra-api.texi: $(srcdir)/../libextra/gnutls_extra.c
+       echo "" > address@hidden
+       for i in $^; do \
+               echo -n "Creating documentation for file $$i... " && \
+               $(srcdir)/scripts/gdoc -texinfo $$i >> address@hidden && \
+               echo "ok"; \
+       done
+       @echo -e "@c address@hidden@c DO NOT EDIT THIS FILE!!\n"\
+"@c It was generated automatically on `date`\n" > address@hidden
+       $(srcdir)/scripts/sort2.pl < address@hidden >> address@hidden
+       rm -f address@hidden
+       mv -f address@hidden $@
 
-# More generated texinfos.
+ia-api.texi: $(srcdir)/../libextra/gnutls_ia.c
+       echo "" > address@hidden
+       for i in $^; do \
+               echo -n "Creating documentation for file $$i... " && \
+               $(srcdir)/scripts/gdoc -texinfo $$i >> address@hidden && \
+               echo "ok"; \
+       done
+       @echo -e "@c address@hidden@c DO NOT EDIT THIS FILE!!\n"\
+"@c It was generated automatically on `date`\n" > address@hidden
+       $(srcdir)/scripts/sort2.pl < address@hidden >> address@hidden
+       rm -f address@hidden
+       mv -f address@hidden $@
 
-#### LDF 2010.07.15.
-#### The rules for generating 'error_codes.texi' 'algorithms.texi'
-#### don't follow the same pattern as the rule for the generated 
-#### Texinfo files above, and they also differ from each other, 
-#### so they must be handled individually.
+# Generated texinfos.
 
 gnutls_TEXINFOS += error_codes.texi algorithms.texi
 MAINTAINERCLEANFILES += error_codes.texi algorithms.texi
@@ -163,7 +193,6 @@ printlist_LDADD = ../lib/libgnutls.la ../gl/libgnu.la
 #### Now writing header to 'error_codes.texi' and 'algorithms.texi'.
 
 error_codes.texi: $(top_srcdir)/lib/gnutls_errors.c $(srcdir)/errcodes.c
-       echo "HERE I AM"
        make $(builddir)/errcodes
        @echo -e "@c address@hidden@c DO NOT EDIT THIS FILE!!\n"\
 "@c It was generated automatically on `date`\n" > address@hidden
@@ -179,6 +208,11 @@ algorithms.texi: $(srcdir)/printlist.c
 
 # Guile texinfos.
 
+#### This would seem to be for the files of C code that implement
+#### the Guile binding for GNUTLS.
+#### I don't plan on doing anything with this at present.
+#### LDF 2010.07.15.
+
 guile_texi           = core.c.texi extra.c.texi
 gnutls_TEXINFOS      += guile.texi $(guile_texi)
 BUILT_SOURCES        = $(guile_texi)
@@ -223,8 +257,12 @@ extra.c.texi:
 endif !HAVE_GUILE
 
 
+#### LDF 2010.07.15.
+#### Added phony target 'query'.
+
 .PHONY: query
 
 query:
-       echo "srcdir == $(srcdir)"
-
+       @echo "srcdir == $(srcdir)"
+       @echo "HAVE_GUILE == $(HAVE_GUILE)"
+       @echo "gnutls_TEXINFOS == $(gnutls_TEXINFOS)"
diff --git a/doc/cha-datatypes.texi b/doc/cha-datatypes.texi
new file mode 100644
index 0000000..d7281d4
--- /dev/null
+++ b/doc/cha-datatypes.texi
@@ -0,0 +1,10 @@
address@hidden cha-datatypes.texi
address@hidden Created by Laurence D. Finston (LDF) Thu Jul 15 14:51:42 CEST 
2010
+
address@hidden Data type reference
address@hidden Data type reference
address@hidden Data type reference
+
address@hidden
address@hidden menu
+
diff --git a/doc/scripts/gdoc b/doc/scripts/gdoc
index 05dfb91..ab5a09c 100755
--- a/doc/scripts/gdoc
+++ b/doc/scripts/gdoc
@@ -5,7 +5,7 @@
 #### Modified by Laurence D. Finston (LDF) starting Thu Jul 15 12:37:26 CEST 
2010
 
 
-## Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson
+## Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon 
Josefsson
 ##                    added -texinfo, -listfunc, -pkg-name
 ##                    man page revamp
 ##                    various improvements


hooks/post-receive
-- 
GNU gnutls