svn commit: r296121 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Fri Feb 26 22:13:48 2016
New Revision: 296121
URL: https://svnweb.freebsd.org/changeset/base/296121

Log:
  DIRDEPS_BUILD: Fix some things building in MAKELEVEL0.
  
  For PROGS this was recursing twice since MAKELEVEL0 is for 'dirdeps'
  which then really builds in a sub-make.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.confs.mk
  head/share/mk/bsd.crunchgen.mk
  head/share/mk/bsd.doc.mk
  head/share/mk/bsd.files.mk
  head/share/mk/bsd.incs.mk
  head/share/mk/bsd.info.mk
  head/share/mk/bsd.progs.mk

Modified: head/share/mk/bsd.confs.mk
==============================================================================
--- head/share/mk/bsd.confs.mk	Fri Feb 26 22:13:45 2016	(r296120)
+++ head/share/mk/bsd.confs.mk	Fri Feb 26 22:13:48 2016	(r296121)
@@ -12,7 +12,9 @@ buildconfig: ${${group}}
 .endfor
 .endif
 
+.if !defined(_SKIP_BUILD)
 all: buildconfig
+.endif
 
 .if !target(installconfig)
 .for group in ${CONFGROUPS}

Modified: head/share/mk/bsd.crunchgen.mk
==============================================================================
--- head/share/mk/bsd.crunchgen.mk	Fri Feb 26 22:13:45 2016	(r296120)
+++ head/share/mk/bsd.crunchgen.mk	Fri Feb 26 22:13:48 2016	(r296121)
@@ -70,7 +70,9 @@ LINKS+= ${BINDIR}/${PROG} ${BINDIR}/${A}
 .endfor
 .endfor
 
+.if !defined(_SKIP_BUILD)
 all: ${PROG}
+.endif
 exe: ${PROG}
 
 ${CONF}: Makefile

Modified: head/share/mk/bsd.doc.mk
==============================================================================
--- head/share/mk/bsd.doc.mk	Fri Feb 26 22:13:45 2016	(r296120)
+++ head/share/mk/bsd.doc.mk	Fri Feb 26 22:13:48 2016	(r296121)
@@ -107,9 +107,11 @@ COMPAT?=	-C
 
 .PATH: ${.CURDIR} ${SRCDIR}
 
+.if !defined(_SKIP_BUILD)
 .for _dev in ${PRINTERDEVICE}
 all: ${DFILE.${_dev}}
 .endfor
+.endif
 
 .if !target(print)
 .for _dev in ${PRINTERDEVICE}

Modified: head/share/mk/bsd.files.mk
==============================================================================
--- head/share/mk/bsd.files.mk	Fri Feb 26 22:13:45 2016	(r296120)
+++ head/share/mk/bsd.files.mk	Fri Feb 26 22:13:48 2016	(r296121)
@@ -16,7 +16,9 @@ ${${group}}:= ${${group}:O:u}
 buildfiles: ${${group}}
 .endfor
 
+.if !defined(_SKIP_BUILD)
 all: buildfiles
+.endif
 
 .for group in ${FILESGROUPS}
 .if defined(${group}) && !empty(${group})

Modified: head/share/mk/bsd.incs.mk
==============================================================================
--- head/share/mk/bsd.incs.mk	Fri Feb 26 22:13:45 2016	(r296120)
+++ head/share/mk/bsd.incs.mk	Fri Feb 26 22:13:48 2016	(r296121)
@@ -14,7 +14,9 @@ buildincludes: ${${group}}
 .endfor
 .endif
 
+.if !defined(_SKIP_BUILD)
 all: buildincludes
+.endif
 
 .if !target(installincludes)
 .for group in ${INCSGROUPS}

Modified: head/share/mk/bsd.info.mk
==============================================================================
--- head/share/mk/bsd.info.mk	Fri Feb 26 22:13:45 2016	(r296120)
+++ head/share/mk/bsd.info.mk	Fri Feb 26 22:13:48 2016	(r296121)
@@ -125,9 +125,10 @@ CLEANFILES+=	${IFILENS}
 .if !defined(NO_INFOCOMPRESS)
 CLEANFILES+=	${IFILENS:S/$/${ICOMPRESS_EXT}/}
 IFILES=	${IFILENS:S/$/${ICOMPRESS_EXT}/:S/.html${ICOMPRESS_EXT}/.html/}
-all: ${IFILES}
 .else
 IFILES=	${IFILENS}
+.endif
+.if !defined(_SKIP_BUILD)
 all: ${IFILES}
 .endif
 

Modified: head/share/mk/bsd.progs.mk
==============================================================================
--- head/share/mk/bsd.progs.mk	Fri Feb 26 22:13:45 2016	(r296120)
+++ head/share/mk/bsd.progs.mk	Fri Feb 26 22:13:48 2016	(r296121)
@@ -53,7 +53,9 @@ UPDATE_DEPENDFILE ?= NO
 
 # prog.mk will do the rest
 .else # !defined(PROG)
+.if !defined(_SKIP_BUILD)
 all: ${PROGS}
+.endif
 
 # We cannot capture dependencies for meta mode here
 UPDATE_DEPENDFILE = NO