From 1a085bedc04ce216032d93ffecd05d19b8bd8809 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Tue, 23 Apr 2002 09:03:56 +0000
Subject: 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.)
---
 share/mk/bsd.dep.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'share/mk/bsd.dep.mk')

diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 62fd681..ace46b0 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -79,7 +79,7 @@ ${_YC}: ${_YSRC}
 
 .if !target(depend)
 .if defined(SRCS)
-depend: beforedepend ${DEPENDFILE} afterdepend _SUBDIR
+depend: beforedepend ${DEPENDFILE} afterdepend
 
 # Different types of sources are compiled with slightly different flags.
 # Split up the sources, and filter out headers and non-applicable flags.
@@ -115,7 +115,7 @@ ${DEPENDFILE}: _EXTRADEPEND
 
 .ORDER: ${DEPENDFILE} afterdepend
 .else
-depend: beforedepend afterdepend _SUBDIR
+depend: beforedepend afterdepend
 .endif
 .if !target(beforedepend)
 beforedepend:
@@ -133,7 +133,7 @@ tags:
 .endif
 
 .if !target(tags)
-tags: ${SRCS} _SUBDIR
+tags: ${SRCS}
 	@cd ${.CURDIR} && gtags ${GTAGSFLAGS} ${.OBJDIR}
 .if defined(HTML)
 	@cd ${.CURDIR} && htags ${HTAGSFLAGS} -d ${.OBJDIR} ${.OBJDIR}
@@ -141,7 +141,7 @@ tags: ${SRCS} _SUBDIR
 .endif
 
 .if !target(cleandepend)
-cleandepend: _SUBDIR
+cleandepend:
 .if defined(SRCS)
 	rm -f ${DEPENDFILE} ${.OBJDIR}/GPATH ${.OBJDIR}/GRTAGS \
 		${.OBJDIR}/GSYMS ${.OBJDIR}/GTAGS
-- 
cgit v1.1