diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk
index a7f90ebee11c..d00b9e5b3a7d 100644
--- a/share/mk/bsd.init.mk
+++ b/share/mk/bsd.init.mk
@@ -15,6 +15,10 @@ __<bsd.init.mk>__:
 .endif
 .include <bsd.own.mk>
 .MAIN: all
+beforebuild: .PHONY .NOTMAIN
+.if !defined(_SKIP_BUILD)
+all: beforebuild .WAIT
+.endif
 
 .if ${.MAKE.LEVEL:U1} == 0 && ${BUILD_AT_LEVEL0:Uyes:tl} == "no" && !make(clean*)
 # this tells lib.mk and prog.mk to not actually build anything
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index ad5b5b6a7514..dc81c1c4828c 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -128,11 +128,6 @@ PO_FLAG=-pg
 	    -c ${.IMPSRC} -o ${.TARGET}
 	${CTFCONVERT_CMD}
 
-.if !defined(_SKIP_BUILD)
-all: beforebuild .WAIT
-beforebuild: objwarn
-.endif
-
 _LIBDIR:=${LIBDIR}
 _SHLIBDIR:=${SHLIBDIR}
 
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index 4333a828c167..1ed815c8f2d1 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -89,6 +89,7 @@ objwarn:
 		canonical ${CANONICALOBJDIR}"
 .endif
 .endif
+beforebuild: objwarn
 
 .if !defined(NO_OBJ)
 .if !target(obj)
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index c4c783fb0084..612eb8effcd4 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -148,8 +148,7 @@ MAN1=	${MAN}
 .if defined(_SKIP_BUILD)
 all:
 .else
-all: beforebuild .WAIT ${PROG} ${SCRIPTS}
-beforebuild: objwarn
+all: ${PROG} ${SCRIPTS}
 .if ${MK_MAN} != "no"
 all: _manpages
 .endif
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 61e4ec56d187..2dead64d0721 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -249,8 +249,7 @@ _ILINKS+=x86
 .endif
 CLEANFILES+=${_ILINKS}
 
-all: beforebuild .WAIT ${PROG}
-beforebuild: objwarn
+all: ${PROG}
 
 beforedepend: ${_ILINKS}
 beforebuild: ${_ILINKS}