Commit 5eb0594f authored by Daniel Veillard's avatar Daniel Veillard
Browse files

Makefile/doc maintenance:

- doc/Makefile.am: fixed make rebuild in doc
- doc/html/*.html: rebuilt the docs
Daniel
parent f37927f9
Sat Jan 27 18:49:02 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* doc/Makefile.am: fixed make rebuild in doc
* doc/html/*.html: rebuilt the docs
Fri Jan 26 10:30:58 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* tree.c: patch from Bjorn Reese on xmlBufferCCat
......
......@@ -620,31 +620,35 @@ esac
])
# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
# the libltdl convenience library, adds --enable-ltdl-convenience to
# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
# to be `${top_builddir}/libltdl'. Make sure you start DIR with
# '${top_builddir}/' (note the single quotes!) if your package is not
# flat, and, if you're not using automake, define top_builddir as
# appropriate in the Makefiles.
# the libltdl convenience library and INCLTDL to the include flags for
# the libltdl header and adds --enable-ltdl-convenience to the
# configure arguments. Note that LIBLTDL and INCLTDL are not
# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
# with '${top_builddir}/' and INCLTDL will be prefixed with
# '${top_srcdir}/' (note the single quotes!). If your package is not
# flat and you're not using automake, define top_builddir and
# top_srcdir appropriately in the Makefiles.
AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case "$enable_ltdl_convenience" in
no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
"") enable_ltdl_convenience=yes
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
])
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
# the libltdl installable library, and adds --enable-ltdl-install to
# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
# to be `${top_builddir}/libltdl'. Make sure you start DIR with
# '${top_builddir}/' (note the single quotes!) if your package is not
# flat, and, if you're not using automake, define top_builddir as
# appropriate in the Makefiles.
# the libltdl installable library and INCLTDL to the include flags for
# the libltdl header and adds --enable-ltdl-install to the configure
# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
# with '${top_srcdir}/' (note the single quotes!). If your package is
# not flat and you're not using automake, define top_builddir and
# top_srcdir appropriately in the Makefiles.
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_CHECK_LIB(ltdl, main,
......@@ -657,8 +661,8 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
])
if test x"$enable_ltdl_install" = x"yes"; then
ac_configure_args="$ac_configure_args --enable-ltdl-install"
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
LIBLTDL="-lltdl"
......
......@@ -20,37 +20,37 @@ scan:
@(if [ -L $(DOC_SOURCE_DIR)/libxml ] ; then rm -f $(DOC_SOURCE_DIR)/libxml ; fi)
@(if [ -L $(DOC_SOURCE_DIR)/include ] ; then rm -f $(DOC_SOURCE_DIR)/include ; fi)
@(if [ -L $(DOC_SOURCE_DIR)/include/libxml ] ; then rm -f $(DOC_SOURCE_DIR)/include/libxml ; fi)
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h"
gtkdoc-scan --module=libxml --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h"
templates: scan
gtkdoc-mktmpl --module=$(DOC_MODULE)
gtkdoc-mktmpl --module=libxml
sgml:
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
gtkdoc-mkdb --module=libxml --source-dir=$(DOC_SOURCE_DIR)
html:
if ! test -d html ; then mkdir html ; fi
-cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-cd html && gtkdoc-mkhtml libxml ../$(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
rm -rf sgml html libxml-decl-list.txt libxml-decl.txt
gnome-xml-decl-list.txt : templates
libxml-decl-list.txt : templates
gnome-xml-sections.txt : scan
cp gnome-xml-decl-list.txt gnome-xml-sections.txt
libxml-sections.txt : scan
cp libxml-decl-list.txt libxml-sections.txt
rebuild: gnome-xml-sections.txt templates sgml html
rebuild: libxml-sections.txt templates sgml html
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-@INSTALL@ -m 0644 $(srcdir)/xml.html $(srcdir)/encoding.html $(srcdir)/FAQ.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(DESTDIR)$(TARGET_DIR)
-@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
-(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR))
-(cd $(DESTDIR); gtkdoc-fixxref --module=libxml --html-dir=$(HTML_DIR))
dist-hook:
(cd $(srcdir) ; tar cvf - *.html *.gif html/*.html html/*.sgml) | (cd $(distdir); tar xf -)
......
......@@ -116,97 +116,97 @@ HREF="libxml-lib.html"
><DL
><DT
><A
HREF="gnome-xml-parser.html"
HREF="libxml-parser.html"
>parser</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-sax.html"
HREF="libxml-sax.html"
>SAX</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-tree.html"
HREF="libxml-tree.html"
>tree</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-entities.html"
HREF="libxml-entities.html"
>entities</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-valid.html"
HREF="libxml-valid.html"
>valid</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-uri.html"
HREF="libxml-uri.html"
>uri</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-htmlparser.html"
HREF="libxml-htmlparser.html"
>HTMLparser</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-htmltree.html"
HREF="libxml-htmltree.html"
>HTMLtree</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-xpath.html"
HREF="libxml-xpath.html"
>xpath</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-xpathinternals.html"
HREF="libxml-xpathinternals.html"
>xpathInternals</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-xpointer.html"
HREF="libxml-xpointer.html"
>xpointer</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-xinclude.html"
HREF="libxml-xinclude.html"
>xinclude</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-nanohttp.html"
HREF="libxml-nanohttp.html"
>nanohttp</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-nanoftp.html"
HREF="libxml-nanoftp.html"
>nanoftp</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-xmlio.html"
HREF="libxml-xmlio.html"
>xmlIO</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-parserinternals.html"
HREF="libxml-parserinternals.html"
>parserInternals</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-encoding.html"
HREF="libxml-encoding.html"
>encoding</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-debugxml.html"
HREF="libxml-debugxml.html"
>debugXML</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-xmlmemory.html"
HREF="libxml-xmlmemory.html"
>xmlmemory</A
> &#8212; </DT
></DL
......
This diff is collapsed.
......@@ -13,7 +13,7 @@ TITLE="Libxml Programming Notes"
HREF="libxml-notes.html"><LINK
REL="NEXT"
TITLE="parser"
HREF="gnome-xml-parser.html"></HEAD
HREF="libxml-parser.html"></HEAD
><BODY
BGCOLOR="#FFFFFF"
TEXT="#000000"
......@@ -89,7 +89,7 @@ WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="right"
><A
HREF="gnome-xml-parser.html"
HREF="libxml-parser.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
......@@ -117,97 +117,97 @@ CLASS="TOC"
></DT
><DT
><A
HREF="gnome-xml-parser.html"
HREF="libxml-parser.html"
>parser</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-sax.html"
HREF="libxml-sax.html"
>SAX</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-tree.html"
HREF="libxml-tree.html"
>tree</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-entities.html"
HREF="libxml-entities.html"
>entities</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-valid.html"
HREF="libxml-valid.html"
>valid</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-uri.html"
HREF="libxml-uri.html"
>uri</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-htmlparser.html"
HREF="libxml-htmlparser.html"
>HTMLparser</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-htmltree.html"
HREF="libxml-htmltree.html"
>HTMLtree</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-xpath.html"
HREF="libxml-xpath.html"
>xpath</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-xpathinternals.html"
HREF="libxml-xpathinternals.html"
>xpathInternals</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-xpointer.html"
HREF="libxml-xpointer.html"
>xpointer</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-xinclude.html"
HREF="libxml-xinclude.html"
>xinclude</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-nanohttp.html"
HREF="libxml-nanohttp.html"
>nanohttp</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-nanoftp.html"
HREF="libxml-nanoftp.html"
>nanoftp</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-xmlio.html"
HREF="libxml-xmlio.html"
>xmlIO</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-parserinternals.html"
HREF="libxml-parserinternals.html"
>parserInternals</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-encoding.html"
HREF="libxml-encoding.html"
>encoding</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-debugxml.html"
HREF="libxml-debugxml.html"
>debugXML</A
> &#8212; </DT
><DT
><A
HREF="gnome-xml-xmlmemory.html"
HREF="libxml-xmlmemory.html"
>xmlmemory</A
> &#8212; </DT
></DL
......@@ -277,7 +277,7 @@ WIDTH="25%"
BGCOLOR="#C00000"
ALIGN="right"
><A
HREF="gnome-xml-parser.html"
HREF="libxml-parser.html"
><FONT
COLOR="#FFFFFF"
SIZE="3"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment