More complete implementation of SUBDIR for programs, libraries and kmods.

`depend' wasn't supported.  This seems to have only broken `make depend'
in gnu/usr.bin/ld.

bsd.prog.mk:
Build the man pages in ${MANDEPEND} at build time.

4 files changed, 14 insertions, 7 deletions

diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index b75b946..9c7afab 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -1,8 +1,8 @@
-#	$Id: bsd.dep.mk,v 1.4 1994/02/27 19:28:44 nate Exp $
+#	$Id: bsd.dep.mk,v 1.1 1994/08/04 21:10:07 wollman Exp $
 
 # some of the rules involve .h sources, so remove them from mkdep line
 .if !target(depend)
-depend: beforedepend .depend afterdepend
+depend: beforedepend .depend afterdepend ${_DEPSUBDIR}
 .if defined(SRCS)
 .depend: ${SRCS}
 	rm -f .depend
@@ -19,7 +19,7 @@ depend: beforedepend .depend afterdepend
 	  mkdep -a ${MKDEP} ${CXXFLAGS:M-nostd*} ${CXXFLAGS:M-[ID]*} $$files; \
 	fi
 .else
-.depend:
+.depend: ${_DEPSUBDIR}
 .endif
 .if !target(beforedepend)
 beforedepend:
diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk
index 37def2e..f572cc5 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.7 1995/01/14 07:51:06 jkh Exp $
+#	$Id: bsd.kmod.mk,v 1.8 1995/01/30 07:22:00 jkh Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -154,4 +154,5 @@ vnode_if.h:	${KERN}/vnode_if.sh ${KERN}/vnode_if.src
 
 ./vnode_if.h:	vnode_if.h
 
+_DEPSUBDIR=	_PROGSUBDIR
 .include <bsd.dep.mk>
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 15ef4c0..a837624 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.20 1995/01/14 22:18:15 wollman Exp $
+#	$Id: bsd.lib.mk,v 1.21 1995/01/30 07:22:02 jkh Exp $
 #
 
 .if exists(${.CURDIR}/../Makefile.inc)
@@ -330,4 +330,5 @@ obj:	_LIBSUBDIR
 .endif
 .endif
 
+_DEPSUBDIR=	_LIBSUBDIR
 .include <bsd.dep.mk>
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 964eb6b..4ed0f25 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.20 1995/01/25 20:24:01 ache Exp $
+#	$Id: bsd.prog.mk,v 1.21 1995/01/30 07:20:01 jkh Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -127,8 +127,12 @@ _PROGSUBDIR: .USE
 	done
 .endif
 
+# XXX I think MANDEPEND is only used for groff.  It should be named more
+# generally and perhaps not be in the maninstall dependencies now it is
+# here (or does maninstall always work when nothing is made?),
+
 .MAIN: all
-all: ${PROG} _PROGSUBDIR
+all: ${PROG} ${MANDEPEND} _PROGSUBDIR
 
 .if !target(clean)
 clean: _PROGSUBDIR
@@ -224,4 +228,5 @@ tags: ${SRCS} _PROGSUBDIR
 maninstall:
 .endif
 
+_DEPSUBDIR=	_PROGSUBDIR
 .include <bsd.dep.mk>