From 8eb37231d4405088a481324c2ec41ac851e8d8f7 Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Mon, 24 Jun 1996 04:26:21 +0000
Subject: Bring in my changes for removing the pestilent obj links (unless you
 really want them) from /usr/src.  This is the final version of the patches,
 incorporating the feedback I've received from -current.

---
 share/mk/bsd.dep.mk | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

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

diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 5bf3c3b..4330e2d 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.dep.mk,v 1.3 1996/04/01 18:58:28 wosch Exp $
+#	$Id: bsd.dep.mk,v 1.4 1996/05/25 23:09:46 wosch Exp $
 #
 # The include file <bsd.dep.mk> handles Makefile dependencies.
 #
@@ -33,7 +33,7 @@ DEPENDFILE?=	.depend
 
 # some of the rules involve .h sources, so remove them from mkdep line
 .if !target(depend)
-depend: beforedepend ${DEPENDFILE} afterdepend ${_DEPSUBDIR}
+depend: beforedepend ${DEPENDFILE} afterdepend _SUBDIR
 .if defined(SRCS)
 
 # .if defined ${SRCS:M*.[sS]} does not work
@@ -58,7 +58,7 @@ ${DEPENDFILE}: ${SRCS}
 .endif
 
 .else
-${DEPENDFILE}: ${_DEPSUBDIR}
+${DEPENDFILE}: _SUBDIR
 .endif
 .if !target(beforedepend)
 beforedepend:
@@ -70,17 +70,33 @@ afterdepend:
 
 .if !target(tags)
 .if defined(SRCS)
-tags: ${SRCS}
+tags: ${SRCS} _SUBDIR
 	-cd ${.CURDIR}; ctags -f /dev/stdout ${.ALLSRC:N*.h} | \
 	    sed "s;\${.CURDIR}/;;" > tags
 .else
-tags:
+tags: _SUBDIR
 .endif
 .endif
 
 .if defined(SRCS)
-clean:
-cleandir: cleandepend
-cleandepend:
-	rm -f ${DEPENDFILE} ${.CURDIR}/tags
+.if !target(clean)
+clean: _SUBDIR
+.endif
+.if !target(cleandepend)
+cleandepend: _SUBDIR
+	rm -f ${DEPENDFILE} tags
+.endif
+.endif
+
+_SUBDIR: .USE
+.if defined(SUBDIR) && !empty(SUBDIR)
+	@for entry in ${SUBDIR}; do \
+		(${ECHODIR} "===> ${DIRPRFX}$$entry"; \
+		if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \
+			cd ${.CURDIR}/$${entry}.${MACHINE}; \
+		else \
+			cd ${.CURDIR}/$${entry}; \
+		fi; \
+		${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/} DIRPRFX=${DIRPRFX}$$entry/); \
+	done
 .endif
-- 
cgit v1.1