Fix.

2 files changed, 22 insertions, 26 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index c1aa38e496..9d720dcb68 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,32 +3,30 @@ EXTRA_DIST = TODO README.CVS README.autoconf certtool.cfg \
 SUBDIRS = tex examples scripts manpages
 
 info_TEXINFOS = gnutls.texi
-gnutls_TEXINFOS = gnutls.texi fdl.texi error_codes.texi \
-	gnutls-api.texi gnutls-extra-api.texi x509-api.texi pgp-api.texi \
-	internals.eps internals.png layers.eps layers.png \
-	pgp1.eps pgp1.png x509-1.eps x509-1.png
+gnutls_TEXINFOS = gnutls.texi fdl.texi error_codes.texi			\
+	gnutls-api.texi gnutls-extra-api.texi x509-api.texi		\
+	pgp-api.texi examples/ex-client2.c examples/ex-session-info.c	\
+	examples/ex-verify.c examples/ex-cert-select.c			\
+	examples/ex-client-resume.c examples/ex-client-srp.c		\
+	examples/ex-serv1.c examples/ex-serv-export.c			\
+	examples/ex-serv-pgp.c examples/ex-serv-srp.c			\
+	examples/ex-alert.c examples/ex-x509-info.c examples/ex-crq.c	\
+	examples/ex-pkcs12.c internals.eps internals.png layers.eps	\
+	layers.png pgp1.eps pgp1.png x509-1.eps x509-1.png
 
 AM_MAKEINFOHTMLFLAGS = --no-split
 
-gnutls.info: build_api_pgp build_api_lib build_api_x509 build_api_extra examples
-
-build_api_lib:
+../lib/gnutls-api.texi:
 	cd ../lib && make gnutls-api.texi
 
-build_api_x509:
-	cd ../lib/x509 && make x509-api.texi
-
-build_api_pgp:
-	cd ../libextra/openpgp && make pgp-api.texi
-
-build_api_extra:
+../libextra/gnutls-extra-api.texi:
 	cd ../libextra && make gnutls-extra-api.texi
 
-examples:
-	cd tex && make examples
+../lib/x509/x509-api.texi:
+	cd ../lib/x509 && make x509-api.texi
 
-error_codes.texi: ../lib/gnutls_errors_int.h ../lib/gnutls_errors.c ../src/errcodes.c
-	-../src/errcodes > error_codes.texi
+../libextra/openpgp/pgp-api.texi:
+	cd ../libextra/openpgp && make pgp-api.texi
 
 gnutls-api.texi: ../lib/gnutls-api.texi
 	-scripts/sort2.pl < ../lib/gnutls-api.texi > gnutls-api.texi
@@ -42,5 +40,8 @@ x509-api.texi: ../lib/x509/x509-api.texi
 pgp-api.texi: ../libextra/openpgp/pgp-api.texi
 	-scripts/sort2.pl < ../libextra/openpgp/pgp-api.texi > pgp-api.texi
 
-.PHONY: build_api_lib build_api_x509 build_api_pgp build_api_extra examples
+examples/ex-client2.c examples/ex-session-info.c examples/ex-verify.c examples/ex-cert-select.c examples/ex-client-resume.c examples/ex-client-srp.c examples/ex-serv1.c examples/ex-serv-export.c examples/ex-serv-pgp.c examples/ex-serv-srp.c examples/ex-alert.c examples/ex-x509-info.c examples/ex-crq.c examples/ex-pkcs12.c:
+	cd tex && make examples
 
+error_codes.texi: ../lib/gnutls_errors_int.h ../lib/gnutls_errors.c ../src/errcodes.c
+	-../src/errcodes > error_codes.texi
diff --git a/doc/README.CVS b/doc/README.CVS
index 2048ff1029..2124a6635c 100644
--- a/doc/README.CVS
+++ b/doc/README.CVS
@@ -9,9 +9,9 @@ following software:
 * libtool (http://www.gnu.org/software/libtoool/)
 * automake (http://www.gnu.org/software/automake/)
 * libgcrypt (ftp://ftp.gnupg.org/pub/gcrypt/alpha/libgcrypt/)
+* texinfo (http://www.gnu.org/software/texinfo/)
 
 Those are optional:
-* latex2html (in order to create gnutls.html)
 * latex/dvips (in order to create gnutls.ps)
 * cvs2cl (in order to create ChangeLog) (http://www.red-bean.com/cvs2cl/)
 * gaa (to handle example programs' parameters) (http://gaa.sf.net)
@@ -26,16 +26,11 @@ $ cd gnutls
 $ ./buildconf
 
 3. Compile the sources
-$ ./configure --enable-developer-mode
+$ ./configure
 $ make
 
 * Create the ChangeLog
 $ make ChangeLog
 
-* Create documentation
-$ cd doc/tex
-$ make gnutls.ps
-$ make gnutls.html
-
 4. If you intend to change any code in gnutls, check the file
  doc/README.CODING_STYLE.