New openssl_options items: no_sslv2 no_sslv3 no_ticket no_tlsv1

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

diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile
index e6f6487d302020660dc685a08ef4fa5d1f02da27..4f92328121212cc64558a7621740da679490e699 100644 (file)
--- a/doc/doc-docbook/Makefile
+++ b/doc/doc-docbook/Makefile
@@ -1,4 +1,4 @@
-# $Cambridge: exim/doc/doc-docbook/Makefile,v 1.13 2009/10/16 10:36:52 nm4 Exp $
+# $Cambridge: exim/doc/doc-docbook/Makefile,v 1.14 2010/05/28 15:38:18 nm4 Exp $
 
 # Make file for Exim documentation from xfpt source.
 
@@ -12,8 +12,10 @@ notarget:;    @echo "** You must specify a target, in the form x.y, where x is '
 #
 # Generate all the documentation files...
 #
-everything:            spec.pdf        spec.ps         spec.html       spec.info       spec.txt \
-                               filter.pdf      filter.ps       filter.html filter.info filter.txt \
+## removed info files as I cannot generate them -  spec.info filter.info
+## removed html files as superceded by new website code
+everything:            spec.pdf        spec.ps         spec.txt \
+                               filter.pdf      filter.ps filter.txt \
                                exim.8
 
 ############################## MAN PAGE ################################
@@ -32,9 +34,6 @@ filter.xml:      filter.xfpt
 filter-pr.xml:   filter.xml Pre-xml
                 ./Pre-xml -bookinfo <filter.xml >filter-pr.xml
 
-filter-html.xml: filter.xml Pre-xml
-                ./Pre-xml -html <filter.xml >filter-html.xml
-
 filter-txt.xml:  filter.xml Pre-xml
                 ./Pre-xml -ascii -html -quoteliteral <filter.xml >filter-txt.xml
 
@@ -84,18 +83,12 @@ filter.pdf: sdop-filter.pdf
 ###
 ###
 
-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
-             ./TidyHTML-filter
-
 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
              w3m -dump filter-txt.html | ./Tidytxt >filter.txt
+             ./SanityTestText 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
@@ -119,10 +112,6 @@ spec.xml:      spec.xfpt
 spec-pr.xml:   spec.xml Pre-xml
               ./Pre-xml -optbreak <spec.xml >spec-pr.xml
 
-spec-html.xml: spec.xml Pre-xml
-              ./Pre-xml -html -oneindex \
-                <spec.xml >spec-html.xml
-
 spec-txt.xml:  spec.xml Pre-xml
               ./Pre-xml -ascii -html -noindex -quoteliteral \
                 <spec.xml >spec-txt.xml
@@ -175,17 +164,12 @@ spec.pdf: sdop-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
-             ./TidyHTML-spec
-
 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
              w3m -dump spec-txt.html | ./Tidytxt >spec.txt
+             ./SanityTestText 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
@@ -265,12 +249,6 @@ test.pdf: sdop-test.pdf
 ###
 
 
-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
-
 test.txt:     test-txt.xml Tidytxt MyStyle-txt-html.xsl MyStyle-html.xsl \
                 MyStyle.xsl
              /bin/rm -rf test-txt.html