summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2003-10-01 18:43:43 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2003-10-01 18:43:43 +0000
commit501eee4b336793fcdb62fba8b6c0c9a0d38134ff (patch)
tree6c345620c7a6580d2a20f0911a79385750dfcb3e
parentd36c5c143c94c6ee3d165a80ca2c7979e03db9ca (diff)
downloadgnutls-501eee4b336793fcdb62fba8b6c0c9a0d38134ff.tar.gz
Patch by Arne.
Fixes a linking problem with _gnutls_handshake2str() and _gnutls_packet2str(). Some other fixes in the documentation creation.
-rwxr-xr-xdoc/scripts/gdoc8
-rw-r--r--doc/tex/Makefile.am15
-rw-r--r--lib/gnutls_errors.c2
3 files changed, 17 insertions, 8 deletions
diff --git a/doc/scripts/gdoc b/doc/scripts/gdoc
index db582569e2..3839ee97d5 100755
--- a/doc/scripts/gdoc
+++ b/doc/scripts/gdoc
@@ -104,10 +104,10 @@ $type_env = "(\\\$\\w+)";
$type_param, "<tt><b>\$1</b></tt>" );
$blankline_html = "<p>";
-%highlights_texinfo = ( $type_constant, "@var{\$1}",
- $type_func, "@code{\$1}",
- $type_struct, "@code{\$1}",
- $type_param, "@code{\$1}" );
+%highlights_texinfo = ( $type_constant, "\@var{\$1}",
+ $type_func, "\@code{\$1}",
+ $type_struct, "\@code{\$1}",
+ $type_param, "\@code{\$1}" );
$blankline_texinfo = "";
%highlights_tex = ( $type_constant, "{\\\\it \$1}",
diff --git a/doc/tex/Makefile.am b/doc/tex/Makefile.am
index 943e436b8c..c9aaa9cfe4 100644
--- a/doc/tex/Makefile.am
+++ b/doc/tex/Makefile.am
@@ -20,10 +20,19 @@ TEX_OBJECTS = gnutls.tex ../../lib/gnutls-api.tex fdl.tex ../../lib/x509/x509-ap
tlsintro.tex compression.tex $(EXAMPLE_OBJECTS) \
tls_extensions.tex srp.tex preparation.tex callbacks.tex
-gnutls.html: $(TEX_OBJECTS)
+gnutls.html: build_api_lib build_api_x509 build_api_extra $(TEX_OBJECTS)
-latex2html gnutls.tex -no_navigation -split 0 \
-local_icons -html_version 3.2,math -info "" -white
+build_api_lib:
+ cd ../../lib && make gnutls-api.tex
+
+build_api_x509:
+ cd ../../lib/x509 && make x509-api.tex
+
+build_api_extra:
+ cd ../../libextra && make gnutls-extra-api.tex
+
error_codes.tex: ../../lib/gnutls_errors_int.h ../../lib/gnutls_errors.c
-../../src/retcodes > error_codes.tex
@@ -38,7 +47,7 @@ x509-api.tex: ../../lib/x509/x509-api.tex
DOC_OBJECTS = x509-api.tex gnutls-api.tex gnutls-extra-api.tex error_codes.tex
-gnutls.ps: $(TEX_OBJECTS) $(DOC_OBJECTS)
+gnutls.ps: build_api_lib build_api_x509 build_api_extra $(TEX_OBJECTS) $(DOC_OBJECTS)
-latex gnutls.tex
-bibtex gnutls
-makeindex gnutls.idx
@@ -59,3 +68,5 @@ examples: $(EXAMPLE_OBJECTS)
done
dist-hook: examples
+
+.PHONY: build_api_lib build_api_x509 build_api_extra
diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c
index 74901d017a..148449991c 100644
--- a/lib/gnutls_errors.c
+++ b/lib/gnutls_errors.c
@@ -286,8 +286,6 @@ void _gnutls_log( int level, const char *fmt, ...) {
* be called. This may affect performance.
*/
void _gnutls_null_log( void* x, ...) { return; }
-const char* _gnutls_handshake2str( int handshake) { return NULL; }
-const char* _gnutls_packet2str( int packet) { return NULL; }
# endif /* C99_MACROS */
#endif /* DEBUG */