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
This commit is contained in:
parent
5d5a53b49f
commit
db74470bff
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=296121
@ -12,7 +12,9 @@ buildconfig: ${${group}}
|
||||
.endfor
|
||||
.endif
|
||||
|
||||
.if !defined(_SKIP_BUILD)
|
||||
all: buildconfig
|
||||
.endif
|
||||
|
||||
.if !target(installconfig)
|
||||
.for group in ${CONFGROUPS}
|
||||
|
@ -70,7 +70,9 @@ LINKS+= ${BINDIR}/${PROG} ${BINDIR}/${A}
|
||||
.endfor
|
||||
.endfor
|
||||
|
||||
.if !defined(_SKIP_BUILD)
|
||||
all: ${PROG}
|
||||
.endif
|
||||
exe: ${PROG}
|
||||
|
||||
${CONF}: Makefile
|
||||
|
@ -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}
|
||||
|
@ -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})
|
||||
|
@ -14,7 +14,9 @@ buildincludes: ${${group}}
|
||||
.endfor
|
||||
.endif
|
||||
|
||||
.if !defined(_SKIP_BUILD)
|
||||
all: buildincludes
|
||||
.endif
|
||||
|
||||
.if !target(installincludes)
|
||||
.for group in ${INCSGROUPS}
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user