From 973f098aab96c9e24ed508fa75a64c503e2fd8d0 Mon Sep 17 00:00:00 2001 From: Garrett Wollman Date: Mon, 2 Oct 1995 20:02:05 +0000 Subject: [PATCH] Compress manual pages (if desired) in the obj directory rather than in the installation destination. Should make release-building substantially faster. The msun Makefile changes simple adapt to the new scheme. --- lib/msun/Makefile | 13 +++-- share/mk/bsd.kmod.mk | 5 +- share/mk/bsd.lib.mk | 5 +- share/mk/bsd.man.mk | 112 +++++++++++++++++++++---------------------- share/mk/bsd.prog.mk | 5 +- sys/conf/kmod.mk | 5 +- 6 files changed, 72 insertions(+), 73 deletions(-) diff --git a/lib/msun/Makefile b/lib/msun/Makefile index 642b002df6a9..ac9194bfb010 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $Id: Makefile,v 1.4 1995/03/08 01:41:40 bde Exp $ +# $Id: Makefile,v 1.5 1995/05/30 05:47:47 rgrimes Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -95,12 +95,11 @@ SRCS=${COMMON_SRCS} SRCS:=${SRCS:S/${i:S/.S/.c/}/$i/} .endfor -MANSRC= ${.CURDIR}/man - -MAN3+= acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 ceil.3 \ - cos.3 cosh.3 erf.3 exp.3 fabs.3 floor.3 fmod.3 hypot.3 ieee.3 \ - ieee_test.3 j0.3 lgamma.3 math.3 rint.3 sin.3 sinh.3 sqrt.3 \ - tan.3 tanh.3 +MAN3+= man/acos.3 man/acosh.3 man/asin.3 man/asinh.3 man/atan.3 man/atan2.3 \ + man/atanh.3 man/ceil.3 man/cos.3 man/cosh.3 man/erf.3 man/exp.3 \ + man/fabs.3 man/floor.3 man/fmod.3 man/hypot.3 man/ieee.3 \ + man/ieee_test.3 man/j0.3 man/lgamma.3 man/math.3 man/rint.3 man/sin.3 \ + man/sinh.3 man/sqrt.3 man/tan.3 man/tanh.3 MLINKS+=erf.3 erfc.3 MLINKS+=exp.3 expm1.3 exp.3 log.3 exp.3 log10.3 exp.3 log1p.3 exp.3 pow.3 diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk index d913b368a802..c108e4842e29 100644 --- a/share/mk/bsd.kmod.mk +++ b/share/mk/bsd.kmod.mk @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $Id: bsd.kmod.mk,v 1.10 1995/02/25 20:51:11 phk Exp $ +# $Id: bsd.kmod.mk,v 1.11 1995/03/20 19:18:51 wollman Exp $ .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" @@ -58,7 +58,7 @@ _PROGSUBDIR: .USE .endif .MAIN: all -all: ${PROG} _PROGSUBDIR +all: ${PROG} all-man _PROGSUBDIR .if !target(clean) clean: _PROGSUBDIR @@ -139,6 +139,7 @@ tags: ${SRCS} _PROGSUBDIR .include .elif !target(maninstall) maninstall: +all-man: .endif .if !target(load) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index bac67dd1229f..36aeb2c08277 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $Id: bsd.lib.mk,v 1.24 1995/03/28 17:54:11 nate Exp $ +# $Id: bsd.lib.mk,v 1.25 1995/08/02 22:31:52 davidg Exp $ # .if exists(${.CURDIR}/../Makefile.inc) @@ -165,7 +165,7 @@ _LIBSUBDIR: .USE done .endif -all: ${_LIBS} _LIBSUBDIR # llib-l${LIB}.ln +all: ${_LIBS} all-man _LIBSUBDIR # llib-l${LIB}.ln OBJS+= ${SRCS:N*.h:R:S/$/.o/g} @@ -312,6 +312,7 @@ tags: ${SRCS} .include .elif !target(maninstall) maninstall: +all-man: .endif .if !target(obj) diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 2dd9d99df1d6..269b75c3add0 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -1,9 +1,4 @@ -# from: @(#)bsd.man.mk 5.2 (Berkeley) 5/11/90 -# $Id: bsd.man.mk,v 1.3 1994/08/28 15:37:40 bde Exp $ - -.if exists(${.CURDIR}/../Makefile.inc) -.include "${.CURDIR}/../Makefile.inc" -.endif +# $Id: bsd.man.mk,v 1.4 1994/12/28 03:50:51 ache Exp $ MANGRP?= bin MANOWN?= bin @@ -14,7 +9,6 @@ MANSRC?= ${.CURDIR} MINSTALL= ${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} MCOMPRESS= gzip -f -BASENAME= basename ZEXTENSION= .gz .if !defined(NOMANCOMPRESS) ZEXT= ${ZEXTENSION} @@ -25,61 +19,63 @@ ZEXT= MANALL= ${MAN1} ${MAN2} ${MAN3} ${MAN3F} ${MAN4} ${MAN5} \ ${MAN6} ${MAN7} ${MAN8} -maninstall: ${MANDEPEND} -.if defined(MAN1) && !empty(MAN1) - (cd ${MANSRC}; ${MINSTALL} ${MAN1} ${DESTDIR}${MANDIR}1${MANSUBDIR}) -.endif -.if defined(MAN2) && !empty(MAN2) - (cd ${MANSRC}; ${MINSTALL} ${MAN2} ${DESTDIR}${MANDIR}2${MANSUBDIR}) -.endif -.if defined(MAN3) && !empty(MAN3) - (cd ${MANSRC}; ${MINSTALL} ${MAN3} ${DESTDIR}${MANDIR}3${MANSUBDIR}) -.endif -.if defined(MAN3F) && !empty(MAN3F) - (cd ${MANSRC}; ${MINSTALL} ${MAN3F} ${DESTDIR}${MANDIR}3f${MANSUBDIR}) -.endif -.if defined(MAN4) && !empty(MAN4) - (cd ${MANSRC}; ${MINSTALL} ${MAN4} ${DESTDIR}${MANDIR}4${MANSUBDIR}) -.endif -.if defined(MAN5) && !empty(MAN5) - (cd ${MANSRC}; ${MINSTALL} ${MAN5} ${DESTDIR}${MANDIR}5${MANSUBDIR}) -.endif -.if defined(MAN6) && !empty(MAN6) - (cd ${MANSRC}; ${MINSTALL} ${MAN6} ${DESTDIR}${MANDIR}6${MANSUBDIR}) -.endif -.if defined(MAN7) && !empty(MAN7) - (cd ${MANSRC}; ${MINSTALL} ${MAN7} ${DESTDIR}${MANDIR}7${MANSUBDIR}) -.endif -.if defined(MAN8) && !empty(MAN8) - (cd ${MANSRC}; ${MINSTALL} ${MAN8} ${DESTDIR}${MANDIR}8${MANSUBDIR}) -.endif +.if !defined(NOMANCOMPRESS) +.for page in ${MANALL} +${page:T}${ZEXTENSION}: ${MANDEPEND} ${page} + if [ -f ${page} ]; then \ + ${MCOMPRESS} < ${page} > ${.TARGET}; \ + else \ + ${MCOMPRESS} < ${.CURDIR}/${page} > ${.TARGET}; \ + fi -# by default all pages are compressed -# we don't handle .so's yet -.if !empty(MANALL:S/ //g) -.if !defined(NOMANCOMPRESS) - @set ${MANALL} ; \ - while test $$# -ge 1; do \ - name=`${BASENAME} $$1`; \ - sect=`expr $$name : '.*\.\([^.]*\)'`; \ - ${ECHO} "compressing in" \ - "${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}:" \ - "$$name -> $${name}${ZEXT}"; \ - ${MCOMPRESS} ${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name ; \ - shift ; \ - done ; true +CLEANFILES+= ${page:T}${ZEXTENSION} +.endfor + +.for page in ${MAN1} +COMP1+= ${page:T}${ZEXTENSION} +.endfor +.for page in ${MAN2} +COMP2+= ${page:T}${ZEXTENSION} +.endfor +.for page in ${MAN3} +COMP3+= ${page:T}${ZEXTENSION} +.endfor +.for page in ${MAN3F} +COMP3F+= ${page:T}${ZEXTENSION} +.endfor +.for page in ${MAN4} +COMP4+= ${page:T}${ZEXTENSION} +.endfor +.for page in ${MAN5} +COMP5+= ${page:T}${ZEXTENSION} +.endfor +.for page in ${MAN6} +COMP6+= ${page:T}${ZEXTENSION} +.endfor +.for page in ${MAN7} +COMP7+= ${page:T}${ZEXTENSION} +.endfor +.for page in ${MAN8} +COMP8+= ${page:T}${ZEXTENSION} +.endfor + +all-man: ${COMP1} ${COMP2} ${COMP3} ${COMP3F} ${COMP4} \ + ${COMP5} ${COMP6} ${COMP7} ${COMP8} .else -# we are installing uncompressed pages, so nuke any compressed pages - @set ${MANALL} ; \ - while test $$# -ge 1; do \ - name=`${BASENAME} $$1`; \ - sect=`expr $$name : '.*\.\([^.]*\)'`; \ - rm -f ${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name${ZEXTENSION};\ - shift ; \ - done ; true -.endif +all-man: ${MANDEPEND} .endif +maninstall: +.for sect in 1 2 3 3F 4 5 6 7 8 +.if defined(MAN${sect}) && !empty(MAN${sect}) +.if defined(NOMANCOMPRESS) + (cd ${MANSRC}; \ + ${MINSTALL} ${MAN${sect}} ${DESTDIR}${MANDIR}${sect:S/F/f/}${MANSUBDIR}) +.else + ${MINSTALL} ${COMP${sect}} ${DESTDIR}${MANDIR}${sect:S/F/f/}${MANSUBDIR} +.endif +.endif +.endfor .if defined(MLINKS) && !empty(MLINKS) @set ${MLINKS}; \ while test $$# -ge 2; do \ diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 74172c24f4a6..de6e0f7a7130 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $Id: bsd.prog.mk,v 1.25 1995/04/26 14:34:19 jkh Exp $ +# $Id: bsd.prog.mk,v 1.26 1995/05/07 06:39:30 bde Exp $ .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" @@ -134,7 +134,7 @@ _PROGSUBDIR: .USE # here (or does maninstall always work when nothing is made?), .MAIN: all -all: ${PROG} ${MANDEPEND} _PROGSUBDIR +all: ${PROG} all-man _PROGSUBDIR .if !target(clean) clean: _PROGSUBDIR @@ -228,6 +228,7 @@ tags: ${SRCS} _PROGSUBDIR .include .elif !target(maninstall) maninstall: +all-man: .endif _DEPSUBDIR= _PROGSUBDIR diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index d913b368a802..c108e4842e29 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $Id: bsd.kmod.mk,v 1.10 1995/02/25 20:51:11 phk Exp $ +# $Id: bsd.kmod.mk,v 1.11 1995/03/20 19:18:51 wollman Exp $ .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" @@ -58,7 +58,7 @@ _PROGSUBDIR: .USE .endif .MAIN: all -all: ${PROG} _PROGSUBDIR +all: ${PROG} all-man _PROGSUBDIR .if !target(clean) clean: _PROGSUBDIR @@ -139,6 +139,7 @@ tags: ${SRCS} _PROGSUBDIR .include .elif !target(maninstall) maninstall: +all-man: .endif .if !target(load)