Upgrade to 0.99.8 cleanup of spec and makefiles to include doc, Daniel.

7 files changed, 68 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index c71dcce3..a76b4854 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 16 17:27:29 CET 1999 Daniel Veillard <Daniel.Veillard@w3.org>
+
+	* Makefile.am, spec, doc/Makefile.am : upgrading to 0.99.8, fixing
+	  the tar and spec file to include the beginning of the doc.
+
 1999-02-13  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
 
 	* doc/.cvsignore: Added this file.
diff --git a/Makefile.am b/Makefile.am
index 0ee69591..b8bcdbfe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,7 +57,7 @@ tests : tester
 confexecdir=$(libdir)
 confexec_DATA = xmlConf.sh
 
-EXTRA_DIST = xmlConf.sh.in libxml.spec
+EXTRA_DIST = xmlConf.sh.in libxml.spec doc/*.html doc/*.gif
 
 ## We create xmlConf.sh here and not from configure because we want
 ## to get the paths expanded correctly.  Macros like srcdir are given
diff --git a/config.h.in b/config.h.in
index dea57996..6778ed02 100644
--- a/config.h.in
+++ b/config.h.in
@@ -63,3 +63,10 @@
 
 /* Define if you have the <zlib.h> header file.  */
 #undef HAVE_ZLIB_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Version number of package */
+#undef VERSION
+
diff --git a/configure.in b/configure.in
index 7608694d..fb6b5131 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,9 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.2)
 AC_INIT(entities.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libxml, 0.99.5)
+AM_INIT_AUTOMAKE(libxml, 0.99.8)
+
+AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -28,6 +30,15 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h unistd.h ctype.h dirent.h errno.h malloc.h)
 AC_CHECK_HEADERS(stdarg.h sys/stat.h sys/types.h time.h zlib.h)
 
+dnl Specific dir for HTML output ?
+if test "x$with_html_dir" = "x" ; then
+  HTML_DIR='${datadir}/gtk-doc/html'
+else
+  HTML_DIR=$with_html_dir
+fi
+
+AC_SUBST(HTML_DIR)
+
 XML_LIBDIR='-L${libdir}'
 XML_INCLUDEDIR='-I${includedir}'
 XML_LIBS="-lxml $Z_LIBS"
@@ -35,6 +46,7 @@ XML_LIBS="-lxml $Z_LIBS"
 AC_SUBST(XML_LIBDIR)
 AC_SUBST(XML_LIBS)
 AC_SUBST(XML_INCLUDEDIR)
+AC_SUBST(HTML_DIR)
 
 AC_ARG_ENABLE(corba,    [  --enable-corba           Add Corba support (default)])
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ca7fb5bd..059dff87 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,41 @@
-htmldir = $(prefix)/html
-html_DATA = xml.html structure.gif DOM.gif
+## Process this file with automake to produce Makefile.in
 
+# The name of the module.
+DOC_MODULE=gnome-xml
+
+# The top-level SGML file.
+DOC_MAIN_SGML_FILE=gnome-xml.sgml
+
+# The directory containing the source code (if it contains documentation).
+DOC_SOURCE_DIR=..
+
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+scan:
+	gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h"
+
+templates: scan
+	gtkdoc-mktmpl --module=$(DOC_MODULE)
+
+sgml:
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
+
+html:
+	if ! test -d html ; then mkdir html ; fi
+	-cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+
+clean-local:
+	rm -f *~ *.bak *.hierarchy *.signals *-unused.txt
+
+maintainer-clean-local: clean
+	rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt 
+
+install-data-local:
+	install -d -m 0755 $(TARGET_DIR)
+	install -m 0644 xml.html structure.gif DOM.gif $(TARGET_DIR)
+#	install -m 0644 html/*.html $(TARGET_DIR)
+#	install -m 0644 html/index.sgml $(TARGET_DIR)
+#	gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)
+
+.PHONY : html sgml templates scan
diff --git a/libxml.spec b/libxml.spec
index c3d1020d..e1188516 100644
--- a/libxml.spec
+++ b/libxml.spec
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      0.99.5
+%define ver      0.99.8
 %define rel      SNAP
 %define prefix   /usr
 
@@ -73,7 +73,6 @@ make prefix=$RPM_BUILD_ROOT%{prefix} install
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README COPYING COPYING.LIB TODO
-%doc doc/DOM.gif doc/structure.gif doc/xml.html
 %{prefix}/lib/lib*.so.*
 %{prefix}/bin/xml-config
 
diff --git a/parser.c b/parser.c
index fd6b6d0d..671bf73d 100644
--- a/parser.c
+++ b/parser.c
@@ -4677,6 +4677,7 @@ xmlClearNodeInfoSeq(xmlParserNodeInfoSeqPtr seq)
  * 
  * xmlParserFindNodeInfoIndex : Find the index that the info record for
  *   the given node is or should be at in a sorted sequence
+ *
  * return values: a long indicating the position of the record
  */
 unsigned long xmlParserFindNodeInfoIndex(const xmlParserNodeInfoSeq* seq,