From owner-freebsd-doc  Tue Dec  4 16:56:12 2001
Delivered-To: freebsd-doc@freebsd.org
Received: from elvis.mu.org (elvis.mu.org [216.33.66.196])
	by hub.freebsd.org (Postfix) with ESMTP
	id 4E5AA37B416; Tue,  4 Dec 2001 16:56:09 -0800 (PST)
Received: by elvis.mu.org (Postfix, from userid 1192)
	id 02AA381D01; Tue,  4 Dec 2001 18:56:08 -0600 (CST)
Date: Tue, 4 Dec 2001 18:56:08 -0600
From: Alfred Perlstein <bright@mu.org>
To: nik@freebsd.org
Cc: doc@freebsd.org
Subject: Re: fixups for doc.docbook.mk
Message-ID: <20011204185608.D92148@elvis.mu.org>
References: <20011204182620.B92148@elvis.mu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <20011204182620.B92148@elvis.mu.org>; from bright@mu.org on Tue, Dec 04, 2001 at 06:26:20PM -0600
Sender: owner-freebsd-doc@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-doc.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-doc>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-doc>
X-Loop: FreeBSD.org

* Alfred Perlstein <bright@mu.org> [011204 18:26] wrote:
> Ok, I noticed something, basically a bunch of formats (well, html/pdf)
> rebuild the main doc if any of the images change, for html this
> is completely unncescesary, and for pdf, only the pdf, not the
> pdf-tex most likely needs to be rebuilt.

This seems to work, remove the dependancy for ${IMAGES_PDF}
for ${DOC}.tex-pdf, and make a phony target for the  ${DOC}.html
so that we don't rebuild the html if all that's needed is that
the pngs be rebuilt.

Index: doc.docbook.mk
===================================================================
RCS file: /cvs/qcvs/doc/share/mk/doc.docbook.mk,v
retrieving revision 1.4
diff -u -r1.4 doc.docbook.mk
--- doc.docbook.mk	2001/11/29 01:40:26	1.4
+++ doc.docbook.mk	2001/12/05 00:53:38
@@ -262,7 +262,13 @@
 CLEANFILES+= PLIST.${_curformat}
 
 .else
+
+.if ${_cf} == "html"
+_docs+= ${DOC}.${_curformat}.phony
+.else
 _docs+= ${DOC}.${_curformat}
+.endif
+
 CLEANFILES+= ${DOC}.${_curformat}
 CLEANFILES+= PLIST.${_curformat}
 
@@ -357,8 +363,10 @@
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} $$(${XARGS} < HTML.manifest)
 .endif
+
+${DOC}.html.phony: ${DOC}.html ${IMAGES_PNG}
 
-${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
+${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} \
 	     ${INDEX_SGML} ${HTML_INDEX} ${LOCAL_CSS_SHEET}
 	${JADE} -V nochunks ${HTMLOPTS} -ioutput.html.images \
 		${JADEOPTS} -t sgml ${MASTERDOC} > ${.TARGET} || \
@@ -417,7 +425,7 @@
 ${DOC}.tex-ps: ${DOC}.tex
 	${LN} -f ${.ALLSRC} ${.TARGET}
 
-${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${INDEX_SGML} ${PRINT_INDEX}
+${DOC}.tex-pdf: ${SRCS} ${INDEX_SGML} ${PRINT_INDEX}
 	${CP} -p ${PDFTEX_DEF} ${.TARGET}
 	${JADE} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \
 		${JADEOPTS} -t tex -o /dev/stdout ${MASTERDOC} >> ${.TARGET}

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message