commit 817e70b6ac0446d9abb6b832963c3473e71b640c
author Daniel Veillard <veillard@src.gnome.org> Tue Nov 19 22:28:48 2002 +0000
committer Daniel Veillard <veillard@src.gnome.org> Tue Nov 19 22:28:48 2002 +0000
tree 00f6cbd49180a39866d93170aaa83b2827276a2f
parent a7e05b4fce8fe80ca033735476705662c62f40f6

repair some problem if gtk-doc fail or such patch for Solaris on new

* doc/Makefile.am: repair some problem if gtk-doc fail or such
* configure.in: patch for Solaris on new autoconf closes #98880
* doc/parsedecl.py: repair the frigging API building script,
  did I say that python xmllib sucks ?
* doc/libxml2-api.xml doc/libxml2-refs.xml: regenerated, reordering
  and some comment are no more truncated.
Daniel

doc/Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
index fa53daf..be18b46 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -37,21 +37,19 @@
 	  $(bindir)/xsltproc --html $(top_srcdir)/doc/api.xsl $(top_srcdir)/doc/xml.html ; fi );
 
 scan:
-	gtkdoc-scan --module=libxml --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h win32config.h trio.h triostr.h triop.h config-mac.h XMLTestPrefix2.h  XMLTestPrefix.h triodef.h trionan.h xlink.h libxml.h libxml2-py.h libxml_wrap.h xmlschemas.h xmlschemastypes.h"
+	-gtkdoc-scan --module=libxml --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h win32config.h trio.h triostr.h triop.h config-mac.h XMLTestPrefix2.h  XMLTestPrefix.h triodef.h trionan.h xlink.h libxml.h libxml2-py.h libxml_wrap.h xmlschemas.h xmlschemastypes.h"
 
 templates: scan
-	gtkdoc-mktmpl --module=libxml
+	-gtkdoc-mktmpl --module=libxml
 
-sgml:
-	gtkdoc-mkdb --module=libxml --source-dir=$(DOC_SOURCE_DIR)
+sgml: templates
+	-gtkdoc-mkdb --module=libxml --source-dir=$(DOC_SOURCE_DIR)
 
-xml: sgml
+xml: sgml 
 	if test -d xml ; then rm xml/* ; else mkdir xml ; fi
 	-@(for s in sgml/*.sgml ; do name=`basename $$s .sgml` ; \
-	   echo '<!DOCTYPE refentry [ <!ENTITY nbsp   "&#x00A0;"> ]>' > \
-	       xml/"$$name".xml ;\
-	   grep -v "^<colspec" $$s | sed 's+<anchor(.*>+<anchor\1/>+' >> xml/"$$name".xml ; done)
-	   
+	   xmllint --sgml $$s > xml/"$$name".xml ; done)
+
 libxml2-api.xml libxml2-refs.xml: xml parsedecl.py libxml-decl.txt libxml-decl-list.txt
 	-(./parsedecl.py)
 
@@ -67,7 +65,7 @@
 maintainer-clean-local: clean
 	rm -rf sgml html libxml-decl-list.txt libxml-decl.txt 
 
-libxml-decl-list.txt : templates
+libxml-decl-list.txt libxml-decl.txt : templates
 
 libxml-sections.txt : scan
 	cp libxml-decl-list.txt libxml-sections.txt