diff options
| author | ru <ru@FreeBSD.org> | 2002-04-23 09:03:56 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-04-23 09:03:56 +0000 |
| commit | 1a085bedc04ce216032d93ffecd05d19b8bd8809 (patch) | |
| tree | fa2a90269f4179b941a6484b35b48413f6a30c7f /sys/conf | |
| parent | e42e586ab2472f8243ec162166258ea136f30ce7 (diff) | |
| download | FreeBSD-src-1a085bedc04ce216032d93ffecd05d19b8bd8809.zip FreeBSD-src-1a085bedc04ce216032d93ffecd05d19b8bd8809.tar.gz | |
Merge bsd.obj.mk's version of the _SUBDIR target with bsd.subdir.mk.
Ensure all standard targets honor SUBDIR. Now `make obj' descends into
SUBDIRs even if NOOBJ is set (some descendants may still need an object
directory, but we do not have such precedents). Now `make install' in
non-bsd.subdir.mk makefiles runs `afterinstall' target _after_ `install'
in SUBDIRs, like we do in bsd.subdir.mk. Nothing depended on the wrong
order anyway.
Fixed `distribute' targets (except for the bsd.subdir.mk version) so that
they do not depend on _SUBDIR; `distribute' calls `install' which already
depends on _SUBDIR.
De-standardize `maninstall', otherwise manpages would be installed twice.
(To be revised later.)
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/kmod.mk | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index b8ac275..4a97f96 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -167,16 +167,9 @@ ${KMOD}.kld: ${OBJS} .endif -.if !target(all-man) -all-man: _SUBDIR -.endif -.if !target(maninstall) -maninstall: _SUBDIR -.endif - _ILINKS=@ machine -all: objwarn ${PROG} _SUBDIR +all: objwarn ${PROG} beforedepend: ${_ILINKS} @rm -f .depend @@ -225,11 +218,11 @@ _INSTALLFLAGS:= ${INSTALLFLAGS} _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} .endfor -install.debug: _SUBDIR +install.debug: ${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR}/ -realinstall: _SUBDIR +realinstall: ${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}/ .if defined(LINKS) && !empty(LINKS) @@ -258,14 +251,14 @@ realinstall: _SUBDIR -kldxref ${DESTDIR}${KMODDIR} .endif -install: afterinstall _SUBDIR +install: afterinstall afterinstall: realinstall realinstall: beforeinstall .endif DISTRIBUTION?= bin .if !target(distribute) -distribute: _SUBDIR +distribute: .for dist in ${DISTRIBUTION} cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${dist} SHARED=copies .endfor |
