Generate doc/local.ent via configure instead of doc/yazpp.xml.

Use {HTML,TKL,MAN}_COMPILE macros for documentation.

diff --git a/configure.ac b/configure.ac
index 2baae3e..c65cb4d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,7 @@ AC_CONFIG_FILES([
        src/Makefile
        src/Jamfile
        doc/Makefile
-       doc/main.xml
+       doc/local.ent
         doc/common/Makefile
        doc/common/tkl.xsl doc/common/html.xsl doc/common/man.xsl 
        doc/common/print.dsl doc/common/html.dsl

diff --git a/doc/.cvsignore b/doc/.cvsignore
index 3f4e989..9f17e21 100644 (file)
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -7,14 +7,16 @@ metaproxy.aux
 metaproxy.pdf
 manpage.links
 manpage.refs
-*.8
-*.1
+local.ent
 *.html
 *.tkl
+*.8
+*.1
 *.3mp
-main.xml
 manref.xml
 progref.xml
 multi.eps
 multi.png
 multi.pdf
+htmlhelp.hhp
+toc.hhc

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b36e004..2bf23e6 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,16 +1,15 @@
-## $Id: Makefile.am,v 1.22 2006-05-27 08:04:23 adam Exp $
+## $Id: Makefile.am,v 1.23 2006-06-02 10:23:49 adam Exp $
 docdir=$(datadir)/doc/@PACKAGE@
 
 SUBDIRS = common
 
 SUFFIXES=.3mp .1
 
-XMLFILES = main.xml.in book.xml manref.xml progref.xml copyright.xml \
-       metaproxy.xml
+XMLFILES = book.xml manref.xml progref.xml copyright.xml metaproxy.xml
 
-MAINXML = main.xml
+MAINXML = $(srcdir)/book.xml
 
-XMLMAN   = auth_simple.xml backend_test.xml frontend_net.xml \
+XMLMAN = auth_simple.xml backend_test.xml frontend_net.xml \
        http_file.xml log.xml multi.xml query_rewrite.xml \
        session_shared.xml template.xml virt_db.xml z3950_client.xml
 MANFILES = auth_simple.3mp backend_test.3mp frontend_net.3mp \
@@ -43,7 +42,7 @@ HTMLFILES = architecture.html \
        overview.xml.structure.html \
        refguide.html
 
-PNGFILES=multi.png
+PNGFILES = multi.png
 
 doc_DATA = $(HTMLFILES) $(PNGFILES)
 man_MANS = $(MANFILES)
@@ -51,13 +50,16 @@ man_MANS = $(MANFILES)
 EXTRA_DIST = $(XMLFILES) $(XMLMAN) $(doc_DATA) $(man_MANS) multi.svg
 
 $(HTMLFILES): $(XMLFILES) multi.png
-       xsltproc common/html.xsl $(MAINXML)
+       $(HTML_COMPILE) $(MAINXML)
 
 .xml.3mp:
-       xsltproc common/man.xsl $<
+       $(MAN_COMPILE) $<
 
 .xml.1:
-       xsltproc common/man.xsl $<
+       $(MAN_COMPILE) $<
+
+index.tkl: $(XMLFILES)
+       $(TKL_COMPILE) $(MAINXML)
 
 metaproxy.pdf: $(XMLFILES) multi.pdf
        for i in $(PNGFILES) common/id.png multi.pdf; do \
@@ -65,14 +67,11 @@ metaproxy.pdf: $(XMLFILES) multi.pdf
        done
        jade -E14 -D $(srcdir) -d common/print.dsl -t tex $(srcdir)/common/xml.dcl $(MAINXML)
        rm -f metaproxy.tex
-       mv main.tex metaproxy.tex
+       mv book.tex metaproxy.tex
        pdfjadetex metaproxy.tex >/dev/null
        pdfjadetex metaproxy.tex >/dev/null
        pdfjadetex metaproxy.tex >/dev/null
 
-index.tkl: $(XMLFILES) common/tkl.xsl
-       xsltproc common/tkl.xsl $(MAINXML)
-
 manref.xml: $(XMLMAN) $(srcdir)/common/ref2dbinc.xsl
        rm -f manref.xml
        for i in $(XMLMAN); do \

diff --git a/doc/book.xml b/doc/book.xml
index 44025aa..41dfd01 100644 (file)
--- a/doc/book.xml
+++ b/doc/book.xml
@@ -1,4 +1,24 @@
-<!-- $Id: book.xml,v 1.32 2006-05-16 10:34:48 mike Exp $ -->
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
+    "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" 
+[
+     <!ENTITY local SYSTEM "local.ent">
+     <!ENTITY manref SYSTEM "manref.xml">
+     <!ENTITY progref SYSTEM "progref.xml">
+     <!ENTITY % common SYSTEM "common/common.ent">
+     %common;
+     <!-- Next line allows imagedata/@format="PDF" and is taken from 
+         http://lists.oasis-open.org/archives/docbook/200303/msg00163.html
+     -->
+     <!ENTITY % local.notation.class "| PDF">
+     <!-- Next line is necessary for some XML parsers, for reasons I
+          don't understand.  I got this from
+         http://lists.oasis-open.org/archives/docbook/200303/msg00180.html
+     -->
+     <!NOTATION PDF SYSTEM "PDF">
+]>
+<!-- $Id: book.xml,v 1.33 2006-06-02 10:23:49 adam Exp $ -->
+<book id="metaproxy">
  <bookinfo>
   <title>Metaproxy - User's Guide and Reference</title>
   <author>
@@ -1638,8 +1658,7 @@ Z>
    &manref;
   </section>
  </chapter>
-
-
+</book>
 
  <!-- Keep this comment at the end of the file
  Local variables:
@@ -1650,7 +1669,7 @@ Z>
  sgml-always-quote-attributes:t
  sgml-indent-step:1
  sgml-indent-data:t
- sgml-parent-document: "main.xml"
+ sgml-parent-document: nil
  sgml-local-catalogs: nil
  sgml-namecase-general:t
  End:

diff --git a/doc/local.ent.in b/doc/local.ent.in
new file mode 100644 (file)
index 0000000..9c05687
--- /dev/null
+++ b/doc/local.ent.in
@@ -0,0 +1,3 @@
+<!-- $Id: local.ent.in,v 1.1 2006-06-02 10:23:49 adam Exp $ -->
+<!ENTITY version "@VERSION@">
+<!ENTITY prefix "@prefix@">

diff --git a/doc/main.xml.in b/doc/main.xml.in
deleted file mode 100644 (file)
index 90d0621..0000000
--- a/doc/main.xml.in
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
-    "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" 
-[
-     <!ENTITY book SYSTEM "@srcdir@/book.xml">
-     <!ENTITY manref SYSTEM "manref.xml">
-     <!ENTITY progref SYSTEM "progref.xml">
-     <!ENTITY version "@VERSION@">
-     <!ENTITY % common SYSTEM "@srcdir@/common/common.ent">
-     %common;
-     <!-- Next line allows imagedata/@format="PDF" and is taken from 
-http://lists.oasis-open.org/archives/docbook/200303/msg00163.html
-     -->
-     <!ENTITY % local.notation.class "| PDF">
-     <!-- Next line is necessary for some XML parsers, for reasons I
-          don't understand.  I got this from
-http://lists.oasis-open.org/archives/docbook/200303/msg00180.html
-     -->
-     <!NOTATION PDF SYSTEM "PDF">
-]>
-<!-- $Id: main.xml.in,v 1.7 2006-05-26 20:20:51 adam Exp $ -->
-<book id="metaproxy">
- &book;
-</book>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-local-catalogs: nil
-sgml-namecase-general:t
-End:
--->