From b8cfb6c6c8d24b79d6063b358bdf9a33a4b4f3d6 Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Wed, 9 May 2001 03:12:11 +0000 Subject: [PATCH] HTML files in doc/arm are now regenerated using 'make doc' instead of 'sh genhtml.sh'; you can also do 'make Bv9ARM-book.pdf' and 'make Bv9ARM-book.dvi' --- configure.in | 5 +---- doc/arm/Makefile.in | 41 ++++++++++++++++++++++++++++++++++++++++- doc/arm/gendvi.sh.in | 30 ------------------------------ doc/arm/genhtml.sh.in | 25 ------------------------- doc/arm/genpdf.sh.in | 31 ------------------------------- util/copyrights | 3 --- 6 files changed, 41 insertions(+), 94 deletions(-) delete mode 100644 doc/arm/gendvi.sh.in delete mode 100644 doc/arm/genhtml.sh.in delete mode 100644 doc/arm/genpdf.sh.in diff --git a/configure.in b/configure.in index 7aea7e0ae9..cb65d62470 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.250 $) +AC_REVISION($Revision: 1.251 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.13) @@ -1600,9 +1600,6 @@ AC_OUTPUT( doc/arm/nominum-docbook-html.dsl doc/arm/nominum-docbook-print.dsl doc/arm/validate.sh - doc/arm/genhtml.sh - doc/arm/gendvi.sh - doc/arm/genpdf.sh isc-config.sh ) chmod a+x isc-config.sh diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in index 3ee7889d80..682ae72eba 100644 --- a/doc/arm/Makefile.in +++ b/doc/arm/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.3 2001/02/16 18:49:27 halley Exp $ +# $Id: Makefile.in,v 1.4 2001/05/09 03:12:08 gson Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -21,6 +21,45 @@ top_srcdir = @top_srcdir@ @BIND9_MAKE_RULES@ +MANOBJS = Bv9ARM.html + distclean:: rm -f catalog gendvi.sh genhtml.sh genpdf.sh validate.sh rm -f nominum-docbook-html.dsl nominum-docbook-print.dsl + +doc man:: ${MANOBJS} + +docclean manclean maintainer-clean:: + rm -f *.html + +Bv9ARM.html: Bv9ARM-book.xml + @JADE@ -v \ + -c @SGMLDIR@/catalog \ + -t sgml \ + -d ./nominum-docbook-html.dsl \ + @SGMLDIR@/docbook/dsssl/modular/dtds/decls/xml.dcl \ + ./Bv9ARM-book.xml + +Bv9ARM-book.dvi: Bv9ARM-book.pdf + @JADE@ -v \ + -d ./nominum-docbook-print.dsl \ + -t tex \ + @SGMLDIR@/docbook/dsssl/modular/dtds/decls/xml.dcl \ + ./Bv9ARM-book.xml + rm Bv9ARM-book.aux Bv9ARM-book.dvi Bv9ARM-book.log + @TEX@ "&jadetex" ./Bv9ARM-book.tex + @TEX@ "&jadetex" ./Bv9ARM-book.tex + @TEX@ "&jadetex" ./Bv9ARM-book.tex + +Bv9ARM-book.pdf: Bv9ARM-book.xml + @JADE@ -v \ + -c @SGMLDIR@/catalog \ + -d ./nominum-docbook-print.dsl \ + -t tex \ + @SGMLDIR@/docbook/dsssl/modular/dtds/decls/xml.dcl \ + ./Bv9ARM-book.xml + rm Bv9ARM-book.aux Bv9ARM-book.pdf Bv9ARM-book.log + @PDFTEX@ "&pdfjadetex" ./Bv9ARM-book.tex + @PDFTEX@ "&pdfjadetex" ./Bv9ARM-book.tex + @PDFTEX@ "&pdfjadetex" ./Bv9ARM-book.tex + diff --git a/doc/arm/gendvi.sh.in b/doc/arm/gendvi.sh.in deleted file mode 100644 index 6f7d2d8ecf..0000000000 --- a/doc/arm/gendvi.sh.in +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2001 Internet Software Consortium. -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM -# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL -# INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING -# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -# $Id: gendvi.sh.in,v 1.2 2001/04/10 21:51:06 bwelling Exp $ - -@JADE@ -v \ - -d ./nominum-docbook-print.dsl \ - -t tex \ - @SGMLDIR@/docbook/dsssl/modular/dtds/decls/xml.dcl \ - ./Bv9ARM-book.xml - -rm Bv9ARM-book.aux Bv9ARM-book.dvi Bv9ARM-book.log - -@TEX@ "&jadetex" ./Bv9ARM-book.tex -@TEX@ "&jadetex" ./Bv9ARM-book.tex -@TEX@ "&jadetex" ./Bv9ARM-book.tex diff --git a/doc/arm/genhtml.sh.in b/doc/arm/genhtml.sh.in deleted file mode 100644 index 4ec942f077..0000000000 --- a/doc/arm/genhtml.sh.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2000, 2001 Internet Software Consortium. -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM -# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL -# INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING -# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -# $Id: genhtml.sh.in,v 1.5 2001/01/09 21:46:36 bwelling Exp $ - -@JADE@ -v \ - -c @SGMLDIR@/catalog \ - -t sgml \ - -d ./nominum-docbook-html.dsl \ - @SGMLDIR@/docbook/dsssl/modular/dtds/decls/xml.dcl \ - ./Bv9ARM-book.xml diff --git a/doc/arm/genpdf.sh.in b/doc/arm/genpdf.sh.in deleted file mode 100644 index bfef28eede..0000000000 --- a/doc/arm/genpdf.sh.in +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2001 Internet Software Consortium. -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM -# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL -# INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING -# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -# $Id: genpdf.sh.in,v 1.3 2001/04/10 21:51:07 bwelling Exp $ - -@JADE@ -v \ - -c @SGMLDIR@/catalog \ - -d ./nominum-docbook-print.dsl \ - -t tex \ - @SGMLDIR@/docbook/dsssl/modular/dtds/decls/xml.dcl \ - ./Bv9ARM-book.xml - -rm Bv9ARM-book.aux Bv9ARM-book.pdf Bv9ARM-book.log - -@PDFTEX@ "&pdfjadetex" ./Bv9ARM-book.tex -@PDFTEX@ "&pdfjadetex" ./Bv9ARM-book.tex -@PDFTEX@ "&pdfjadetex" ./Bv9ARM-book.tex diff --git a/util/copyrights b/util/copyrights index 8f0f1f5900..1b7c93517c 100644 --- a/util/copyrights +++ b/util/copyrights @@ -888,9 +888,6 @@ ./doc/arm/Makefile.in MAKE 2001 ./doc/arm/README-SGML TXT.BRIEF 2000,2001 ./doc/arm/catalog.in X 2000,2001 -./doc/arm/gendvi.sh.in SH 2001 -./doc/arm/genhtml.sh.in SH 2000,2001 -./doc/arm/genpdf.sh.in SH 2001 ./doc/arm/isc.color.gif X 2000,2001 ./doc/arm/nominum-docbook-html.dsl.in X 2000,2001 ./doc/arm/nominum-docbook-print.dsl.in X 2001