diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 2409ee9f7a8a..d5dcdc013036 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -1,9 +1,16 @@
-#	$NetBSD: bsd.doc.mk,v 1.33 1997/06/28 01:22:59 christos Exp $
+#	$NetBSD: bsd.doc.mk,v 1.34 1997/10/11 08:16:24 mycroft Exp $
 #	@(#)bsd.doc.mk	8.1 (Berkeley) 8/14/93
 
+.if !target(__initialized__)
+__initialized__:
+.if exists(${.CURDIR}/../Makefile.inc)
+.include "${.CURDIR}/../Makefile.inc"
+.endif
 .include <bsd.own.mk>
-
+.include <bsd.obj.mk>
 .MAIN:		all
+.endif
+
 .PHONY:		cleandoc docinstall print spell
 realinstall:	docinstall
 clean cleandir:	cleandoc
diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk
index ffcab8a507c6..f20a5495b5b9 100644
--- a/share/mk/bsd.kmod.mk
+++ b/share/mk/bsd.kmod.mk
@@ -1,12 +1,15 @@
-#	$NetBSD: bsd.kmod.mk,v 1.21 1997/05/17 02:01:07 mycroft Exp $
+#	$NetBSD: bsd.kmod.mk,v 1.22 1997/10/11 08:16:25 mycroft Exp $
 
+.if !target(__initialized__)
+__initialized__:
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
-
 .include <bsd.own.mk>
-
+.include <bsd.obj.mk>
 .MAIN:		all
+.endif
+
 .PHONY:		cleankmod kmodinstall load unload
 realinstall:	kmodinstall
 clean cleandir:	cleankmod
@@ -81,12 +84,7 @@ unload: ${PROG}
 	/sbin/modunload -n ${KMOD}
 .endif
 
-.if !defined(NOMAN)
 .include <bsd.man.mk>
-.endif
-
-.include <bsd.obj.mk>
 .include <bsd.links.mk>
 .include <bsd.dep.mk>
-.include <bsd.subdir.mk>
 .include <bsd.sys.mk>
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 4f7911d2488b..99f44282b621 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,13 +1,16 @@
-#	$NetBSD: bsd.lib.mk,v 1.116 1997/06/04 08:38:45 pk Exp $
+#	$NetBSD: bsd.lib.mk,v 1.117 1997/10/11 08:16:26 mycroft Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
+.if !target(__initialized__)
+__initialized__:
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
-
 .include <bsd.own.mk>
-
+.include <bsd.obj.mk>
 .MAIN:		all
+.endif
+
 .PHONY:		cleanlib libinstall
 realinstall:	libinstall
 clean cleandir:	cleanlib
@@ -303,18 +306,13 @@ ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: llib-l${LIB}.ln
 .endif
 .endif
 
-.if !defined(NOMAN)
 .include <bsd.man.mk>
-.endif
-
-.if !defined(NONLS)
 .include <bsd.nls.mk>
-.endif
-
-.include <bsd.obj.mk>
 .include <bsd.files.mk>
 .include <bsd.inc.mk>
 .include <bsd.links.mk>
 .include <bsd.dep.mk>
-.include <bsd.subdir.mk>
 .include <bsd.sys.mk>
+
+# Make sure all of the standard targets are defined, even if they do nothing.
+lint regress:
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 9f556ea735d7..cf4de3fd23be 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,15 +1,20 @@
-#	$NetBSD: bsd.man.mk,v 1.33 1997/06/30 19:26:21 phil Exp $
+#	$NetBSD: bsd.man.mk,v 1.34 1997/10/11 08:16:27 mycroft Exp $
 #	@(#)bsd.man.mk	8.1 (Berkeley) 6/8/93
 
-.if !target(.MAIN)
+.if !target(__initialized__)
+__initialized__:
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
-
+.include <bsd.own.mk>
+.include <bsd.obj.mk>
 .MAIN:		all
 .endif
+
 .PHONY:		catinstall maninstall catpages manpages catlinks manlinks cleanman
+.if !defined(NOMAN)
 realinstall:	${MANINSTALL}
+.endif
 cleandir:	cleanman
 
 MANTARGET?=	cat
@@ -132,10 +137,15 @@ manlinks: manpages
 .endif
 
 .if defined(CATPAGES)
+.if !defined(NOMAN)
 all: ${CATPAGES}
+.endif
 
 cleanman:
 	rm -f ${CATPAGES}
 .else
 cleanman:
 .endif
+
+# Make sure all of the standard targets are defined, even if they do nothing.
+clean depend includes lint regress tags:
diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
index a3bb8f474827..d0618c500505 100644
--- a/share/mk/bsd.nls.mk
+++ b/share/mk/bsd.nls.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.nls.mk,v 1.9 1997/05/09 13:25:58 mycroft Exp $
+#	$NetBSD: bsd.nls.mk,v 1.10 1997/10/11 08:16:28 mycroft Exp $
 
 .if !target(.MAIN)
 .if exists(${.CURDIR}/../Makefile.inc)
@@ -8,7 +8,9 @@
 .MAIN:		all
 .endif
 .PHONY:		cleannls nlsinstall
+.if !defined(NONLS)
 realinstall:	nlsinstall
+.endif
 cleandir:	cleannls
 
 .SUFFIXES: .cat .msg
@@ -30,7 +32,9 @@ NLSNAME=lib${LIB}
 .endif
 
 .if defined(NLSALL)
+.if !defined(NONLS)
 all: ${NLSALL}
+.endif
 
 cleannls:
 	rm -f ${NLSALL}
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 2c8a62be7c69..401ee8abe7fe 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,13 +1,16 @@
-#	$NetBSD: bsd.prog.mk,v 1.87 1997/09/29 15:02:49 gwr Exp $
+#	$NetBSD: bsd.prog.mk,v 1.88 1997/10/11 08:16:28 mycroft Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
+.if !target(__initialized__)
+__initialized__:
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
-
 .include <bsd.own.mk>
-
+.include <bsd.obj.mk>
 .MAIN:		all
+.endif
+
 .PHONY:		cleanprog proginstall scriptsinstall
 realinstall:	proginstall scriptsinstall
 clean cleandir:	cleanprog
@@ -183,18 +186,13 @@ lint: ${LOBJS}
 	@${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD}
 .endif
 
-.if !defined(NOMAN)
 .include <bsd.man.mk>
-.endif
-
-.if !defined(NONLS)
 .include <bsd.nls.mk>
-.endif
-
-.include <bsd.obj.mk>
 .include <bsd.files.mk>
 .include <bsd.inc.mk>
 .include <bsd.links.mk>
 .include <bsd.dep.mk>
-.include <bsd.subdir.mk>
 .include <bsd.sys.mk>
+
+# Make sure all of the standard targets are defined, even if they do nothing.
+regress:
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 84da4aa543fe..5c75e075ca7e 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -1,10 +1,14 @@
-#	$NetBSD: bsd.subdir.mk,v 1.26 1997/10/11 07:26:54 mycroft Exp $
+#	$NetBSD: bsd.subdir.mk,v 1.27 1997/10/11 08:16:29 mycroft Exp $
 #	@(#)bsd.subdir.mk	8.1 (Berkeley) 6/8/93
 
+.if !target(__initialized__)
+__initialized__:
+.if exists(${.CURDIR}/../Makefile.inc)
+.include "${.CURDIR}/../Makefile.inc"
+.endif
 .include <bsd.own.mk>
-
-.if !target(.MAIN)
-.MAIN: all
+.include <bsd.obj.mk>
+.MAIN:		all
 .endif
 
 .for dir in ${SUBDIR}