Author: bdrewery
Date: Tue Feb 16 02:09:48 2016
New Revision: 295641
URL: https://svnweb.freebsd.org/changeset/base/295641
Log:
Consolidate common beforebuild logic.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/bsd.init.mk
head/share/mk/bsd.lib.mk
head/share/mk/bsd.obj.mk
head/share/mk/bsd.prog.mk
head/sys/conf/kmod.mk
Modified: head/share/mk/bsd.init.mk
==============================================================================
--- head/share/mk/bsd.init.mk Tue Feb 16 01:18:49 2016 (r295640)
+++ head/share/mk/bsd.init.mk Tue Feb 16 02:09:48 2016 (r295641)
@@ -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
Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk Tue Feb 16 01:18:49 2016 (r295640)
+++ head/share/mk/bsd.lib.mk Tue Feb 16 02:09:48 2016 (r295641)
@@ -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}
Modified: head/share/mk/bsd.obj.mk
==============================================================================
--- head/share/mk/bsd.obj.mk Tue Feb 16 01:18:49 2016 (r295640)
+++ head/share/mk/bsd.obj.mk Tue Feb 16 02:09:48 2016 (r295641)
@@ -89,6 +89,7 @@ objwarn:
canonical ${CANONICALOBJDIR}"
.endif
.endif
+beforebuild: objwarn
.if !defined(NO_OBJ)
.if !target(obj)
Modified: head/share/mk/bsd.prog.mk
==============================================================================
--- head/share/mk/bsd.prog.mk Tue Feb 16 01:18:49 2016 (r295640)
+++ head/share/mk/bsd.prog.mk Tue Feb 16 02:09:48 2016 (r295641)
@@ -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
Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk Tue Feb 16 01:18:49 2016 (r295640)
+++ head/sys/conf/kmod.mk Tue Feb 16 02:09:48 2016 (r295641)
@@ -249,8 +249,7 @@ _ILINKS+=x86
.endif
CLEANFILES+=${_ILINKS}
-all: beforebuild .WAIT ${PROG}
-beforebuild: objwarn
+all: ${PROG}
beforedepend: ${_ILINKS}
beforebuild: ${_ILINKS}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
