From 8b7166f0d46ca73ac4a241aebf153101da23012c Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 2 Jun 2006 08:43:11 +0000 Subject: [PATCH] Generate doc/local.ent via configure instead of doc/yazpp.xml. Use {HTML,TKL,MAN}_COMPILE macros for documentation. --- configure.ac | 4 +-- doc/.cvsignore | 8 +++--- doc/Makefile.am | 22 ++++++++------- doc/local.ent.in | 3 +++ doc/yazpp.xml | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ doc/yazpp.xml.in | 76 ---------------------------------------------------- 6 files changed, 99 insertions(+), 92 deletions(-) create mode 100644 doc/local.ent.in create mode 100644 doc/yazpp.xml delete mode 100644 doc/yazpp.xml.in diff --git a/configure.ac b/configure.ac index 0cef813..6cdcd56 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl YAZ++ Toolkit, Index Data 1994-2006 dnl See the file LICENSE for details. -dnl $Id: configure.ac,v 1.5 2006-05-26 19:46:37 adam Exp $ +dnl $Id: configure.ac,v 1.6 2006-06-02 08:43:11 adam Exp $ AC_PREREQ(2.59) AC_INIT([yazpp],[1.0.0],[adam@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) @@ -38,7 +38,7 @@ AC_OUTPUT([ yazpp-config zoom/Makefile doc/Makefile - doc/yazpp.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 4ad41ad..7c736ea 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -1,7 +1,6 @@ *.log Makefile Makefile.in -yazpp.xml *.html *.tkl yazpp-config.8 @@ -14,6 +13,7 @@ manpage.links manpage.refs html tkl.xsl -yazhtml.dsl -yazphp.dsl -yazprint.dsl +htmlhelp.hhp +local.ent.in +toc.hhc + diff --git a/doc/Makefile.am b/doc/Makefile.am index 8a67151..4998205 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.20 2006-05-26 19:46:37 adam Exp $ +## $Id: Makefile.am,v 1.21 2006-06-02 08:43:12 adam Exp $ docdir=$(datadir)/doc/@PACKAGE@ SUBDIRS = common @@ -9,9 +9,9 @@ XMLFILES = \ zoom.xml \ api.xml \ license.xml \ - yazpp.xml.in + yazpp.xml -TOP = yazpp.xml +TOP = $(srcdir)/yazpp.xml MANFILES = yazpp-config.8 @@ -36,10 +36,17 @@ doc_DATA = $(HTMLFILES) man_MANS = $(MANFILES) -EXTRA_DIST = $(XMLFILES) $(doc_DATA) $(man_MANS) $(REFFILES) entities.ent +EXTRA_DIST = $(XMLFILES) $(doc_DATA) $(man_MANS) $(REFFILES) \ + entities.ent local.ent.in $(HTMLFILES): $(XMLFILES) - xsltproc common/html.xsl $(TOP) + $(HTML_COMPILE) $(TOP) + +index.tkl: $(XMLFILES) common/tkl.xsl + $(TKL_COMPILE) $(TOP) + +yazpp-config.8: yazpp-config-man.xml + $(MAN_COMPILE) $(srcdir)/yazpp-config-man.xml yazpp.pdf: $(XMLFILES) if test ! -f common/id.png ; then cp $(srcdir)/common/id.png common/; fi @@ -48,11 +55,6 @@ yazpp.pdf: $(XMLFILES) pdfjadetex yazpp.tex >pdfjadetex.log 2>&1 pdfjadetex yazpp.tex >pdfjadetex.log 2>&1 -index.tkl: $(XMLFILES) common/tkl.xsl - xsltproc common/tkl.xsl $(TOP) - -yazpp-config.8: yazpp-config-man.xml - xsltproc common/man.xsl $(srcdir)/yazpp-config-man.xml clean-data-hook: rm -f [0-9]* *.bak diff --git a/doc/local.ent.in b/doc/local.ent.in new file mode 100644 index 0000000..5408bd5 --- /dev/null +++ b/doc/local.ent.in @@ -0,0 +1,3 @@ + + + diff --git a/doc/yazpp.xml b/doc/yazpp.xml new file mode 100644 index 0000000..7e00524 --- /dev/null +++ b/doc/yazpp.xml @@ -0,0 +1,78 @@ + + + %local; + + %entities; + + %common; +]> + + + + YAZ++ User's Guide and Reference + + MikeTaylor + AdamDickmeiss + + + 1999 + 2000 + 2001 + 2002 + 2003 + 2004 + 2005 + 2006 + Index Data Aps and Mike Taylor + + + + YAZ++ + is a set of libraries and header files that make it easier + to use the popular C-language + YAZ toolkit + from C++, together with some utilities written using these + libraries. It includes an implementation of the C++ binding for + ZOOM (ZOOM-C++). + + + This manual covers version 1.0.0. + + + CVS ID: $Id: yazpp.xml,v 1.1 2006-06-02 08:43:12 adam Exp $ + + + + + + + + + + + + &chap-introduction; + &chap-installation; + &chap-zoom; + &chap-api; + &app-license; + + + + diff --git a/doc/yazpp.xml.in b/doc/yazpp.xml.in deleted file mode 100644 index 8b10307..0000000 --- a/doc/yazpp.xml.in +++ /dev/null @@ -1,76 +0,0 @@ - - - %entities; - - %common; -]> - - - - YAZ++ User's Guide and Reference - - MikeTaylor - AdamDickmeiss - - - 1999 - 2000 - 2001 - 2002 - 2003 - 2004 - 2005 - 2006 - Index Data Aps and Mike Taylor - - - - YAZ++ - is a set of libraries and header files that make it easier - to use the popular C-language - YAZ toolkit - from C++, together with some utilities written using these - libraries. It includes an implementation of the C++ binding for - ZOOM (ZOOM-C++). - - - This manual covers version @VERSION@. - - - CVS ID: $Id: yazpp.xml.in,v 1.6 2006-05-26 19:46:37 adam Exp $ - - - - - - - - - - - - &chap-introduction; - &chap-installation; - &chap-zoom; - &chap-api; - &app-license; - - - - -- 1.7.10.4