Give an error for the use of * and *@ with a query-style lookup.

[exim.git] / doc / doc-docbook / Makefile

diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile
index 802f7408508d00032e7c623c11704609c368f6fa..f422bdda8711ffaa6b87ebc6b961f82e90ac8028 100644 (file)
--- a/doc/doc-docbook/Makefile
+++ b/doc/doc-docbook/Makefile
@@ -1,6 +1,6 @@
-# $Cambridge: exim/doc/doc-docbook/Makefile,v 1.1 2005/06/16 10:32:31 ph10 Exp $
+# $Cambridge: exim/doc/doc-docbook/Makefile,v 1.8 2006/04/04 14:03:49 ph10 Exp $

 
 

-# Make file for Exim documentation from Asciidoc source.
+# Make file for Exim documentation from xfpt source.

 
 notarget:;    @echo "** You must specify a target, in the form x.y, where x is 'filter', 'spec',"
              @echo "** or 'test', and y is 'xml', 'fo', 'ps', 'pdf', 'html', 'txt', or 'info'."
 
 notarget:;    @echo "** You must specify a target, in the form x.y, where x is 'filter', 'spec',"
              @echo "** or 'test', and y is 'xml', 'fo', 'ps', 'pdf', 'html', 'txt', or 'info'."


@@ -10,7 +10,7 @@ notarget:;    @echo "** You must specify a target, in the form x.y, where x is '
 
 ############################## MAN PAGE ################################
 
 
 ############################## MAN PAGE ################################
 

-exim.8: spec.xml
+exim.8:       spec.xml x2man

              ./x2man
 
 ########################################################################
              ./x2man
 
 ########################################################################


@@ -18,46 +18,58 @@ exim.8: spec.xml
 
 ############################### FILTER #################################
 
 
 ############################### FILTER #################################
 

-filter.xml:   filter.ascd MyAsciidoc.conf
-             asciidoc -d book -b docbook -f MyAsciidoc.conf filter.ascd
+filter.xml:   filter.xfpt
+             xfpt filter.xfpt

 
 filter-fo.xml: filter.xml Pre-xml
 
 filter-fo.xml: filter.xml Pre-xml

-             Pre-xml -bookinfo <filter.xml >filter-fo.xml
+             ./Pre-xml -bookinfo <filter.xml >filter-fo.xml

 
 filter-html.xml: filter.xml Pre-xml
 
 filter-html.xml: filter.xml Pre-xml

-             Pre-xml <filter.xml >filter-html.xml
+             ./Pre-xml -html <filter.xml >filter-html.xml

 
 filter-txt.xml: filter.xml Pre-xml
 
 filter-txt.xml: filter.xml Pre-xml

-             Pre-xml -ascii <filter.xml >filter-txt.xml
+             ./Pre-xml -ascii -html -quoteliteral <filter.xml >filter-txt.xml
+
+filter-info.xml: filter.xml Pre-xml
+             ./Pre-xml -ascii -html <filter.xml >filter-info.xml

 
 filter.fo:    filter-fo.xml MyStyle-filter-fo.xsl MyStyle-fo.xsl MyStyle.xsl
              /bin/rm -rf filter.fo filter-fo.fo
              xmlto -x MyStyle-filter-fo.xsl fo filter-fo.xml
              /bin/mv -f filter-fo.fo filter.fo
 
 
 filter.fo:    filter-fo.xml MyStyle-filter-fo.xsl MyStyle-fo.xsl MyStyle.xsl
              /bin/rm -rf filter.fo filter-fo.fo
              xmlto -x MyStyle-filter-fo.xsl fo filter-fo.xml
              /bin/mv -f filter-fo.fo filter.fo
 

+# Do not use pdf2ps from the PDF version; better PS is generated directly.
+

 filter.ps:    filter.fo
 filter.ps:    filter.fo

-             fop filter.fo -ps filter.ps
+             fop filter.fo -ps filter-tmp.ps
+             mv filter-tmp.ps filter.ps
+
+# Do not use ps2pdf from the PS version; better PDF is generated directly. It
+# contains cross links etc.

 
 

-filter.pdf:   filter.fo
-             fop filter.fo -pdf filter.pdf
+filter.pdf:   filter.fo PageLabelPDF
+             fop filter.fo -pdf filter-tmp.pdf
+             ./PageLabelPDF 2 <filter-tmp.pdf >filter.pdf

 
 

-filter.html:  filter-html.xml TidyHTML-filter MyStyle-nochunk-html.xsl MyStyle-html.xsl MyStyle.xsl
+filter.html:  filter-html.xml TidyHTML-filter MyStyle-nochunk-html.xsl \
+                MyStyle-html.xsl MyStyle.xsl

              /bin/rm -rf filter.html filter-html.html
              xmlto -x MyStyle-nochunk-html.xsl html-nochunks filter-html.xml
              /bin/mv -f filter-html.html filter.html
              /bin/rm -rf filter.html filter-html.html
              xmlto -x MyStyle-nochunk-html.xsl html-nochunks filter-html.xml
              /bin/mv -f filter-html.html filter.html

-              ./TidyHTML-filter
+             ./TidyHTML-filter

 
 

-filter.txt:   filter-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl MyStyle.xsl
+filter.txt:   filter-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl \
+                MyStyle.xsl

              /bin/rm -rf filter-txt.html
              xmlto -x MyStyle-txt-html.xsl html-nochunks filter-txt.xml
              /bin/rm -rf filter-txt.html
              xmlto -x MyStyle-txt-html.xsl html-nochunks filter-txt.xml

-             w3m -dump filter-txt.html >filter.txt
+             w3m -dump filter-txt.html | ./Tidytxt >filter.txt

 
 # I have not found a way of making docbook2texi write its output anywhere
 # other than the file name that it makes up. The --to-stdout option does not
 # work.
 
 
 # I have not found a way of making docbook2texi write its output anywhere
 # other than the file name that it makes up. The --to-stdout option does not
 # work.
 

-filter.info:  filter-txt.xml
-             docbook2texi filter-txt.xml
+filter.info:  filter-info.xml
+             docbook2texi filter-info.xml

              perl -ne 's/conceptindex/cindex/;s/optionindex/findex/;print;' \
                <exim_filtering.texi | Tidytxt >filter.texinfo
              /bin/rm -rf exim_filtering.texi
              perl -ne 's/conceptindex/cindex/;s/optionindex/findex/;print;' \
                <exim_filtering.texi | Tidytxt >filter.texinfo
              /bin/rm -rf exim_filtering.texi


@@ -68,47 +80,62 @@ filter.info:  filter-txt.xml
 
 ################################ SPEC ##################################
 
 
 ################################ SPEC ##################################
 

-spec.xml:     spec.ascd MyAsciidoc.conf
-             asciidoc -d book -b docbook -f MyAsciidoc.conf spec.ascd
+spec.xml:     spec.xfpt
+             xfpt spec.xfpt

 
 spec-fo.xml:  spec.xml Pre-xml
 
 spec-fo.xml:  spec.xml Pre-xml

-             Pre-xml <spec.xml >spec-fo.xml
+             ./Pre-xml -optbreak <spec.xml >spec-fo.xml

 
 spec-html.xml: spec.xml Pre-xml
 
 spec-html.xml: spec.xml Pre-xml

-             Pre-xml -abstract -oneindex <spec.xml >spec-html.xml
+             ./Pre-xml -html -oneindex \
+               <spec.xml >spec-html.xml

 
 spec-txt.xml: spec.xml Pre-xml
 
 spec-txt.xml: spec.xml Pre-xml

-             Pre-xml -abstract -ascii -noindex <spec.xml >spec-txt.xml
+             ./Pre-xml -ascii -html -noindex -quoteliteral \
+               <spec.xml >spec-txt.xml

 
 

-spec.fo:      spec-fo.xml MyStyle-spec-fo.xsl MyStyle-fo.xsl MyStyle.xsl MyTitleStyle.xsl
+spec-info.xml: spec.xml Pre-xml
+             ./Pre-xml -ascii -html -noindex <spec.xml >spec-info.xml
+
+spec.fo:      spec-fo.xml MyStyle-spec-fo.xsl MyStyle-fo.xsl MyStyle.xsl \
+              MyTitleStyle.xsl

              /bin/rm -rf spec.fo spec-fo.fo
              xmlto -x MyStyle-spec-fo.xsl fo spec-fo.xml
              /bin/mv -f spec-fo.fo spec.fo
 
              /bin/rm -rf spec.fo spec-fo.fo
              xmlto -x MyStyle-spec-fo.xsl fo spec-fo.xml
              /bin/mv -f spec-fo.fo spec.fo
 

+# Do not use pdf2ps from the PDF version; better PS is generated directly.
+

 spec.ps:      spec.fo
 spec.ps:      spec.fo

-             FOP_OPTS=-Xmx512m fop spec.fo -ps spec.ps
+             FOP_OPTS=-Xmx512m fop spec.fo -ps spec-tmp.ps
+             mv spec-tmp.ps spec.ps
+
+# Do not use ps2pdf from the PS version; better PDF is generated directly. It
+# contains cross links etc. We post-process it to add page label information
+# so that the page identifiers shown by acroread are the correct page numbers.

 
 

-spec.pdf:     spec.fo
-             FOP_OPTS=-Xmx512m fop spec.fo -pdf spec.pdf
+spec.pdf:     spec.fo PageLabelPDF
+             FOP_OPTS=-Xmx512m fop spec.fo -pdf spec-tmp.pdf
+             ./PageLabelPDF 12 <spec-tmp.pdf >spec.pdf

 
 

-spec.html:    spec-html.xml TidyHTML-spec MyStyle-chunk-html.xsl MyStyle-html.xsl MyStyle.xsl
-             /bin/rm -rf spec.html
-             xmlto -x MyStyle-chunk-html.xsl -o spec.html html spec-html.xml
+spec.html:    spec-html.xml TidyHTML-spec MyStyle-chunk-html.xsl \
+                MyStyle-html.xsl MyStyle.xsl
+             /bin/rm -rf spec_html
+             xmlto -x MyStyle-chunk-html.xsl -o spec_html html spec-html.xml

              ./TidyHTML-spec
 
              ./TidyHTML-spec
 

-spec.txt:     spec-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl MyStyle.xsl
+spec.txt:     spec-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl \
+                MyStyle.xsl

              /bin/rm -rf spec-txt.html
              xmlto -x MyStyle-txt-html.xsl html-nochunks spec-txt.xml
              /bin/rm -rf spec-txt.html
              xmlto -x MyStyle-txt-html.xsl html-nochunks spec-txt.xml

-             w3m -dump spec-txt.html | Tidytxt >spec.txt
+             w3m -dump spec-txt.html | ./Tidytxt >spec.txt

 
 # I have not found a way of making docbook2texi write its output anywhere
 # other than the file name that it makes up. The --to-stdout option does not
 # work.
 
 
 # I have not found a way of making docbook2texi write its output anywhere
 # other than the file name that it makes up. The --to-stdout option does not
 # work.
 

-spec.info:    spec-txt.xml
-             docbook2texi spec-txt.xml
-             perl -ne 's/conceptindex/cindex/;s/optionindex/findex/;print;' \
-               <the_exim_mta.texi >spec.texinfo
+spec.info:    spec-info.xml
+             docbook2texi spec-info.xml
+             ./TidyInfo <the_exim_mta.texi >spec.texinfo

              /bin/rm -rf the_exim_mta.texi
              makeinfo -o spec.info spec.texinfo
 
              /bin/rm -rf the_exim_mta.texi
              makeinfo -o spec.info spec.texinfo
 


@@ -119,35 +146,49 @@ spec.info:    spec-txt.xml
 
 # These targets (similar to the above)  are for running little tests.
 
 
 # These targets (similar to the above)  are for running little tests.
 

-test.xml:     test.ascd MyAsciidoc.conf
-             asciidoc -d book -b docbook -f MyAsciidoc.conf test.ascd
+test.xml:     test.xfpt
+             xfpt test.xfpt

 
 test-fo.xml:  test.xml Pre-xml
              ./Pre-xml <test.xml >test-fo.xml
 
 test-html.xml: test.xml Pre-xml
 
 test-fo.xml:  test.xml Pre-xml
              ./Pre-xml <test.xml >test-fo.xml
 
 test-html.xml: test.xml Pre-xml

-             ./Pre-xml -abstract -oneindex <test.xml >test-html.xml
+             ./Pre-xml -html -oneindex <test.xml >test-html.xml

 
 test-txt.xml: test.xml Pre-xml
 
 test-txt.xml: test.xml Pre-xml

-             ./Pre-xml -abstract -ascii -noindex <test.xml >test-txt.xml
+             ./Pre-xml -ascii -html -noindex -quoteinfo \
+               <test.xml >test-txt.xml
+
+test-info.xml: test.xml Pre-xml
+             ./Pre-xml -ascii -html -noindex <test.xml >test-info.xml

 
 

-test.fo:      test-fo.xml MyStyle-spec-fo.xsl MyStyle-fo.xsl MyStyle.xsl MyTitleStyle.xsl
+test.fo:      test-fo.xml MyStyle-spec-fo.xsl MyStyle-fo.xsl MyStyle.xsl \
+                MyTitleStyle.xsl

              /bin/rm -rf test.fo test-fo.fo
              xmlto -x MyStyle-spec-fo.xsl fo test-fo.xml
              /bin/mv -f test-fo.fo test.fo
 
              /bin/rm -rf test.fo test-fo.fo
              xmlto -x MyStyle-spec-fo.xsl fo test-fo.xml
              /bin/mv -f test-fo.fo test.fo
 

+# Do not use pdf2ps from the PDF version; better PS is generated directly.
+

 test.ps:      test.fo
 test.ps:      test.fo

-             fop test.fo -ps test.ps
+             fop test.fo -ps test-tmp.ps
+             mv test-tmp.ps test.ps
+
+# Do not use ps2pdf from the PS version; better PDF is generated directly. It
+# contains cross links etc.

 
 test.pdf:     test.fo
 
 test.pdf:     test.fo

-             fop test.fo -pdf test.pdf
+             fop test.fo -pdf test-tmp.pdf
+             mv test-tmp.pdf test.pdf

 
 

-test.html:    test-html.xml MyStyle-nochunk-html.xsl MyStyle-html.xsl MyStyle.xsl
+test.html:    test-html.xml MyStyle-nochunk-html.xsl MyStyle-html.xsl \
+                MyStyle.xsl

              /bin/rm -rf test.html test-html.html
              xmlto -x MyStyle-nochunk-html.xsl html-nochunks test-html.xml
              /bin/mv -f test-html.html test.html
 
              /bin/rm -rf test.html test-html.html
              xmlto -x MyStyle-nochunk-html.xsl html-nochunks test-html.xml
              /bin/mv -f test-html.html test.html
 

-test.txt:     test-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl MyStyle.xsl
+test.txt:     test-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl \
+                MyStyle.xsl

              /bin/rm -rf test-txt.html
              xmlto -x MyStyle-txt-html.xsl html-nochunks test-txt.xml
              w3m -dump test-txt.html | Tidytxt >test.txt
              /bin/rm -rf test-txt.html
              xmlto -x MyStyle-txt-html.xsl html-nochunks test-txt.xml
              w3m -dump test-txt.html | Tidytxt >test.txt


@@ -156,10 +197,9 @@ test.txt:     test-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl MyStyle
 # other than the file name that it makes up. The --to-stdout option does not
 # work.
 
 # other than the file name that it makes up. The --to-stdout option does not
 # work.
 

-test.info:    test-txt.xml
-             docbook2texi test-txt.xml
-             perl -ne 's/conceptindex/cindex/;s/optionindex/findex/;print;' \
-               <short_title.texi >test.texinfo
+test.info:    test-info.xml
+             docbook2texi test-info.xml
+             ./TidyInfo <short_title.texi >test.texinfo

              /bin/rm -rf short_title.texi
              makeinfo -o test.info test.texinfo
 
              /bin/rm -rf short_title.texi
              makeinfo -o test.info test.texinfo