Move API texinfo generation into doc/.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e9a4ed3b12ca5a7cb929bfbe194eac92a138404c..429b360394ae3b62206d1aafc8c7bc31d91efcf1 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -31,7 +31,7 @@ endif
 info_TEXINFOS = gnutls.texi
 gnutls_TEXINFOS = gnutls.texi                                          \
        fdl-1.3.texi lgpl-2.1.texi gpl-3.0.texi                         \
-       gnutls-api.texi gnutls-extra-api.texi ia-api.texi               \
+       gnutls-api.texi extra-api.texi ia-api.texi                      \
        x509-api.texi pgp-api.texi                                      \
        examples/ex-client1.c examples/ex-client2.c                     \
        examples/ex-session-info.c examples/ex-verify.c                 \
@@ -93,35 +93,60 @@ TEXI2DVI = texi2dvi $(AM_MAKEINFOFLAGS)
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \
        --no-split --css-include=$(srcdir)/texinfo.css
 
-../lib/gnutls-api.texi:
-       cd ../lib && make gnutls-api.texi
-
-../libextra/gnutls-extra-api.texi:
-       cd ../libextra && make gnutls-extra-api.texi
-
-../lib/x509/x509-api.texi:
-       cd ../lib/x509 && make x509-api.texi
-
-../lib/openpgp/pgp-api.texi:
-       cd ../lib/openpgp && make pgp-api.texi
-
-../libextra/ia-api.texi:
-       cd ../libextra && make ia-api.texi
-
-gnutls-api.texi: ../lib/gnutls-api.texi
-       -$(srcdir)/scripts/sort2.pl < ../lib/gnutls-api.texi > gnutls-api.texi
-
-gnutls-extra-api.texi: ../libextra/gnutls-extra-api.texi
-       -$(srcdir)/scripts/sort2.pl < ../libextra/gnutls-extra-api.texi > gnutls-extra-api.texi
-
-x509-api.texi: ../lib/x509/x509-api.texi
-       -$(srcdir)/scripts/sort2.pl < ../lib/x509/x509-api.texi > x509-api.texi
-
-pgp-api.texi: ../lib/openpgp/pgp-api.texi
-       -$(srcdir)/scripts/sort2.pl < ../lib/openpgp/pgp-api.texi > pgp-api.texi
-
-ia-api.texi: ../libextra/ia-api.texi
-       -$(srcdir)/scripts/sort2.pl < ../libextra/ia-api.texi > ia-api.texi
+gnutls-api.texi: $(srcdir)/../lib/*.c
+       echo "" > $@-tmp
+       for i in $^; do \
+               echo -n "Creating documentation for file $$i... " && \
+               $(srcdir)/scripts/gdoc -texinfo $$i >> $@-tmp && \
+               echo "ok"; \
+       done
+       $(srcdir)/scripts/sort2.pl < $@-tmp > $@-tmp2
+       rm -f $@-tmp
+       mv $@-tmp2 $@
+
+x509-api.texi: $(srcdir)/../lib/x509/*.c
+       echo "" > $@-tmp
+       for i in $^; do \
+               echo -n "Creating documentation for file $$i... " && \
+               $(srcdir)/scripts/gdoc -texinfo $$i >> $@-tmp && \
+               echo "ok"; \
+       done
+       $(srcdir)/scripts/sort2.pl < $@-tmp > $@-tmp2
+       rm -f $@-tmp
+       mv $@-tmp2 $@
+
+pgp-api.texi: $(srcdir)/../lib/openpgp/*.c
+       echo "" > $@-tmp
+       for i in $^; do \
+               echo -n "Creating documentation for file $$i... " && \
+               $(srcdir)/scripts/gdoc -texinfo $$i >> $@-tmp && \
+               echo "ok"; \
+       done
+       $(srcdir)/scripts/sort2.pl < $@-tmp > $@-tmp2
+       rm -f $@-tmp
+       mv $@-tmp2 $@
+
+extra-api.texi: $(srcdir)/../libextra/gnutls_extra.c
+       echo "" > $@-tmp
+       for i in $^; do \
+               echo -n "Creating documentation for file $$i... " && \
+               $(srcdir)/scripts/gdoc -texinfo $$i >> $@-tmp && \
+               echo "ok"; \
+       done
+       $(srcdir)/scripts/sort2.pl < $@-tmp > $@-tmp2
+       rm -f $@-tmp
+       mv $@-tmp2 $@
+
+ia-api.texi: $(srcdir)/../libextra/gnutls_ia.c
+       echo "" > $@-tmp
+       for i in $^; do \
+               echo -n "Creating documentation for file $$i... " && \
+               $(srcdir)/scripts/gdoc -texinfo $$i >> $@-tmp && \
+               echo "ok"; \
+       done
+       $(srcdir)/scripts/sort2.pl < $@-tmp > $@-tmp2
+       rm -f $@-tmp
+       mv $@-tmp2 $@
 
 # Generated texinfos.
 
@@ -137,13 +162,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes
 
 error_codes.texi: $(top_srcdir)/lib/gnutls_errors.c $(srcdir)/errcodes.c
        make $(builddir)/errcodes
-       $(builddir)/errcodes > error_codes.texi-tmp && \
-               mv error_codes.texi-tmp error_codes.texi
+       $(builddir)/errcodes > $@-tmp
+       mv $@-tmp $@
 
 algorithms.texi: $(srcdir)/printlist.c
        make $(builddir)/printlist
-       $(builddir)/printlist > algorithms.texi-tmp && \
-               mv algorithms.texi-tmp algorithms.texi
+       $(builddir)/printlist > $@-tmp
+       mv $@-tmp $@
 
 guile_texi           = core.c.texi extra.c.texi
 BUILT_SOURCES        = $(guile_texi)

diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index d697b2023d66bbbf959c49e08874ee1dc21680ed..13998f337230b260ca7459d404a4e049c50607e3 100644 (file)
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -3588,7 +3588,7 @@ These functions are only available in the GPLv3+ version of the
 library called @code{gnutls-extra}. The prototypes for this library
 lie in @file{gnutls/extra.h}.
 
-@include gnutls-extra-api.texi
+@include extra-api.texi
 
 @node OpenPGP functions
 @section @acronym{OpenPGP} Functions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7180b3cd50c9ccc33990ed1c65f37597ad115626..171b60e161bf12b7ec3c8867ca938f68bcbe4e44 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -53,7 +53,6 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnutls.pc
 DISTCLEANFILES = $(pkgconfig_DATA)
 
-EXTRA_DIST = gnutls-api.texi
 lib_LTLIBRARIES = libgnutls.la
 
 SRP_COBJECTS = ext_srp.c gnutls_srp.c auth_srp.c auth_srp_passwd.c     \
@@ -161,13 +160,3 @@ pkix_asn1_tab.c: pkix.asn
 
 gnutls_asn1_tab.c: gnutls.asn
        -asn1Parser gnutls.asn gnutls_asn1_tab.c
-
-gnutls-api.texi: $(COBJECTS) $(SRP_COBJECTS) $(PSK_COBJECTS) $(OPRFI_COBJECTS)
-       @echo "" > gnutls-api.texi
-       @for i in $(COBJECTS) $(SRP_COBJECTS) $(PSK_COBJECTS) $(OPRFI_COBJECTS); do \
-               echo -n "Creating documentation for file $$i... " && \
-               $(srcdir)/../doc/scripts/gdoc -texinfo $$i >> gnutls-api.texi && \
-               echo "ok"; \
-       done
-
-dist-hook: gnutls-api.texi

diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am
index b1f3e4efd285f74a6eac64807ede71ccbe5ccf45..50e0b9a6bcc81d3832e2e9e8da3ceaefacf1cb51 100644 (file)
--- a/lib/openpgp/Makefile.am
+++ b/lib/openpgp/Makefile.am
@@ -39,15 +39,3 @@ COBJECTS = pgp.c pgpverify.c extras.c compat.c privkey.c output.c    \
        gnutls_openpgp.c
 
 libgnutls_openpgp_la_SOURCES = $(COBJECTS) openpgp_int.h gnutls_openpgp.h
-
-EXTRA_DIST = pgp-api.texi
-
-pgp-api.texi: $(COBJECTS)
-       @echo "" > pgp-api.texi
-       @for i in $(COBJECTS); do \
-               echo -n "Creating documentation for file $$i... " && \
-               $(srcdir)/../../doc/scripts/gdoc -texinfo $$i >> pgp-api.texi && \
-               echo "ok"; \
-       done
-
-dist-hook: pgp-api.texi

diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index bffaedd64003b3b12591dd6a966bdeaf86abd9cc..1e90732cb2368bb1ce67313831aed7fd6fccc9ad 100644 (file)
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -57,15 +57,3 @@ libgnutls_x509_la_SOURCES =  \
        x509.c                  \
        x509_int.h              \
        x509_write.c
-
-EXTRA_DIST = x509-api.texi
-
-x509-api.texi: $(libgnutls_x509_la_SOURCES)
-       @echo "" > x509-api.texi
-       @for i in $(libgnutls_x509_la_SOURCES); do \
-               echo -n "Creating documentation for file $$i... " && \
-               $(srcdir)/../../doc/scripts/gdoc -texinfo $$i >> x509-api.texi && \
-               echo "ok"; \
-       done
-
-dist-hook: x509-api.texi

diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 5899e80b4fe0a9266c7ae878080b254cd317e2a6..54af5f19d33326eadf6c338b4206aa03e4c13abe 100644 (file)
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -43,8 +43,6 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnutls-extra.pc
 DISTCLEANFILES = $(pkgconfig_DATA)
 
-EXTRA_DIST = gnutls-extra-api.texi ia-api.texi
-
 defexecdir = $(bindir)
 defexec_DATA = 
 
@@ -112,21 +110,3 @@ libgnutls_extra_la_LDFLAGS += \
 else
 libgnutls_extra_la_LDFLAGS += -export-symbols-regex '^(gnutls_).*'
 endif
-
-gnutls-extra-api.texi: gnutls_extra.c
-       @echo "" > $@
-       @for i in $<; do \
-               echo -n "Creating documentation for file $$i... " && \
-               $(srcdir)/../doc/scripts/gdoc -texinfo $$i >> $@ && \
-               echo "ok"; \
-       done
-
-ia-api.texi: gnutls_ia.c
-       @echo "" > $@
-       @for i in $<; do \
-               echo -n "Creating documentation for file $$i... " && \
-               $(srcdir)/../doc/scripts/gdoc -texinfo $$i >> $@ && \
-               echo "ok"; \
-       done
-
-dist-hook: gnutls-extra-api.texi ia-api.texi