9.3.0beta2

3 files changed, 41 insertions, 41 deletions

diff --git a/make/Makefile.in b/make/Makefile.in
index 65c3a32b..73efb1f7 100644
--- a/make/Makefile.in
+++ b/make/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.13.2.1 2004/03/09 06:12:46 marka Exp $
+# $Id: Makefile.in,v 1.13.206.1 2004/03/06 13:16:21 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/make/includes.in b/make/includes.in
index e14ca1de..8d170a42 100644
--- a/make/includes.in
+++ b/make/includes.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: includes.in,v 1.15.2.2 2004/12/09 03:18:36 marka Exp $
+# $Id: includes.in,v 1.15.12.3 2004/03/08 09:05:14 marka Exp $
 
 # Search for machine-generated header files in the build tree,
 # and for normal headers in the source tree (${top_srcdir}).
@@ -34,11 +34,15 @@ ISCCFG_INCLUDES = @BIND9_ISCCFG_BUILDINCLUDE@ \
        -I${top_srcdir}/lib/isccfg/include
 
 DNS_INCLUDES = @BIND9_DNS_BUILDINCLUDE@ \
-	-I${top_srcdir}/lib/dns/include
+	-I${top_srcdir}/lib/dns/include \
+	-I${top_srcdir}/lib/dns/sec/dst/include
 
 LWRES_INCLUDES = @BIND9_LWRES_BUILDINCLUDE@ \
 	-I${top_srcdir}/lib/lwres/unix/include \
 	-I${top_srcdir}/lib/lwres/include
 
+BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \
+	-I${top_srcdir}/lib/bind9/include
+
 TEST_INCLUDES = \
 	-I${top_srcdir}/lib/tests/include
diff --git a/make/rules.in b/make/rules.in
index abb41039..00cfa615 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.40.2.17 2007/01/29 23:57:17 marka Exp $
+# $Id: rules.in,v 1.40.2.5.4.3 2004/03/06 13:16:21 marka Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
@@ -87,7 +87,6 @@ install clean distclean maintainer-clean doc docclean man manclean::
 ###	CC
 ### Makefile may define
 ###	CFLAGS
-###	LDFLAGS
 ###	CINCLUDES
 ###	CDEFINES
 ###	CWARNINGS
@@ -96,17 +95,10 @@ install clean distclean maintainer-clean doc docclean man manclean::
 
 CC = 		@CC@
 CFLAGS =	@CFLAGS@
-LDFLAGS =	@LDFLAGS@
 STD_CINCLUDES =	@STD_CINCLUDES@
 STD_CDEFINES =	@STD_CDEFINES@
 STD_CWARNINGS =	@STD_CWARNINGS@
 
-BUILD_CC = @BUILD_CC@
-BUILD_CFLAGS = @BUILD_CFLAGS@
-BUILD_CPPFLAGS = @BUILD_CPPFLAGS@
-BUILD_LDFAGS = @BUILD_LDFAGS@
-BUILD_LIBS = @BUILD_LIBS@
-
 .SUFFIXES:
 .SUFFIXES: .c .@O@
 
@@ -118,7 +110,8 @@ ALL_CPPFLAGS = \
 	${ALWAYS_INCLUDES} ${CINCLUDES} ${STD_CINCLUDES} \
 	${ALWAYS_DEFINES} ${CDEFINES} ${STD_CDEFINES}
 
-ALL_CFLAGS = ${EXT_CFLAGS} ${ALL_CPPFLAGS} ${CFLAGS} \
+ALL_CFLAGS = ${EXT_CFLAGS} ${CFLAGS} \
+	${ALL_CPPFLAGS} \
 	${ALWAYS_WARNINGS} ${STD_CWARNINGS} ${CWARNINGS}
 
 .c.@O@:
@@ -137,7 +130,7 @@ cleandir: distclean
 superclean: maintainer-clean
 
 clean distclean maintainer-clean::
-	rm -f *.@O@ *.o *.lo *.la core *.core .depend
+	rm -f *.@O@ *.lo *.la core *.core .depend
 	rm -rf .libs
 
 distclean maintainer-clean::
@@ -186,45 +179,48 @@ INSTALL_SCRIPT =	@INSTALL_SCRIPT@
 INSTALL_DATA =		@INSTALL_DATA@
 
 ###
-### Programs used when generating documentation.  It's ok for these
-### not to exist when not generating documentation.
-###
-
-XSLTPROC =		@XSLTPROC@ --novalid --xinclude --nonet
-PERL =			@PERL@
-LATEX =			@LATEX@
-PDFLATEX =		@PDFLATEX@
-
-###
 ### DocBook -> HTML
 ### DocBook -> man page
 ###
 
 .SUFFIXES: .docbook .html .1 .2 .3 .4 .5 .6 .7 .8
 
+OPENJADE = @OPENJADE@
+SGMLCATALOG = @SGMLCATALOG@
+HTMLSTYLE = @HTMLSTYLE@
+XMLDCL = @XMLDCL@
+DOCBOOK2MANSPEC = @DOCBOOK2MANSPEC@
+JADETEX = @JADETEX@
+PDFJADETEX = @PDFJADETEX@
+
+ONSGMLS = onsgmls
+SGMLSPL = sgmlspl
+
+#
+# Note: this rule assumes the docbook.dsl stylesheet
+# is being used.  If another stylesheet is used, the
+# filename 'r1.htm' in the rule might have to be
+# be changed.
+#
 .docbook.html:
-	${XSLTPROC} -o $@ ${top_srcdir}/doc/xsl/isc-docbook-html.xsl $<
+	${OPENJADE} -c ${SGMLCATALOG} -t sgml -d ${HTMLSTYLE} $<
+	echo "" >> r1.htm
+	cat ${top_srcdir}/docutil/HTML_COPYRIGHT r1.htm > $@
+	rm -f r1.htm
 
 .docbook.1:
-	${XSLTPROC} -o $@ ${top_srcdir}/doc/xsl/isc-manpage.xsl $<
-
+	sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
 .docbook.2:
-	${XSLTPROC} -o $@ ${top_srcdir}/doc/xsl/isc-manpage.xsl $<
-
+	sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
 .docbook.3:
-	${XSLTPROC} -o $@ ${top_srcdir}/doc/xsl/isc-manpage.xsl $<
-
+	sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
 .docbook.4:
-	${XSLTPROC} -o $@ ${top_srcdir}/doc/xsl/isc-manpage.xsl $<
-
+	sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
 .docbook.5:
-	${XSLTPROC} -o $@ ${top_srcdir}/doc/xsl/isc-manpage.xsl $<
-
+	sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
 .docbook.6:
-	${XSLTPROC} -o $@ ${top_srcdir}/doc/xsl/isc-manpage.xsl $<
-
+	sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
 .docbook.7:
-	${XSLTPROC} -o $@ ${top_srcdir}/doc/xsl/isc-manpage.xsl $<
-
+	sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@
 .docbook.8:
-	${XSLTPROC} -o $@ ${top_srcdir}/doc/xsl/isc-manpage.xsl $<
+	sh ${top_srcdir}/docutil/docbook2man-wrapper.sh ${top_srcdir} $< $@