d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move STAGING related setup to bsd.sys.mk

Browse Source
This commit is contained in:
Simon J. Gerraty 2013-03-04 21:36:34 +00:00
parent c2ec0b5183
commit 57bf5f75ba
3 changed files with 78 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
share/mk/bsd.lib.mk
View File

@ -112,8 +112,8 @@ PO_FLAG=-pg
${CTFCONVERT_CMD}
.if !defined(_SKIP_BUILD)
all: prebuild .WAIT
prebuild: objwarn
all: beforebuild .WAIT
beforebuild: objwarn
.if !defined(.PARSEDIR)
# this is a no-op
.WAIT:
@ -429,22 +429,3 @@ clean:
.include <bsd.obj.mk>
.include <bsd.sys.mk>
.if ${MK_STAGING} != "no"
.if defined(_SKIP_BUILD)
stage_libs stage_files stage_as:
.else
.if !empty(_LIBS) && !defined(INTERNALLIB)
stage_libs: ${_LIBS}
.for t in stage_libs stage_files stage_as
.if target($t)
all: $t
.endif
.endfor
.endif
.if !empty(INCS) || !empty(INCSGROUPS)
prebuild: buildincludes
.endif
.include <meta.stage.mk>
.endif
.endif

46
share/mk/bsd.prog.mk
View File

@ -238,49 +238,3 @@ ${OBJS}: ${SRCS:M*.h}
.if defined(PORTNAME)
.include <bsd.pkg.mk>
.endif
.if ${MK_STAGING} != "no"
.if defined(_SKIP_BUILD)
stage_files stage_as:
.else
# normally only libs and includes are staged
.if ${MK_STAGING_PROG:Uno} != "no"
STAGE_DIR.prog= ${STAGE_OBJTOP}${BINDIR}
.if !empty(PROG)
.if defined(PROGNAME)
STAGE_AS_SETS+= prog
STAGE_AS_${PROG}= ${PROGNAME}
stage_as.prog: ${PROG}
.else
STAGE_SETS+= prog
stage_files.prog: ${PROG}
all: stage_files
.endif
.endif
.if !empty(STAGE_AS_SETS)
all: stage_as
.endif
.if !empty(LINKS)
all: stage_links
.ORDER: stage_files stage_links
.if !empty(STAGE_AS_SETS)
.ORDER: stage_as stage_links
.endif
STAGE_SETS+= prog
STAGE_LINKS.prog= ${LINKS}
.endif
.if !empty(SYMLINKS)
all: stage_symlinks
.if !empty(STAGE_AS_SETS)
.ORDER: stage_as stage_symlinks
.endif
STAGE_SETS+= prog
STAGE_SYMLINKS.prog= ${SYMLINKS}
.endif
.endif
.include <meta.stage.mk>
.endif
.endif

76
share/mk/bsd.sys.mk
View File

@ -141,3 +141,79 @@ PHONY_NOTMAIN = afterdepend afterinstall all beforedepend beforeinstall \
.PHONY: ${PHONY_NOTMAIN}
.NOTMAIN: ${PHONY_NOTMAIN}
.if ${MK_STAGING} != "no"
.if defined(_SKIP_BUILD) || !make(all)
stage_libs stage_files stage_as stage_links stage_symlinks:
.else
# allow targets like beforeinstall to be leveraged
DESTDIR= ${STAGE_OBJTOP}
.if target(beforeinstall)
.if !empty(_LIBS) || ${MK_STAGING_PROG} != "no"
stage_files: beforeinstall
.endif
.endif
# normally only libs and includes are staged
.if ${MK_STAGING_PROG} != "no"
STAGE_DIR.prog= ${STAGE_OBJTOP}${BINDIR}
.if !empty(PROG)
.if defined(PROGNAME)
STAGE_AS_SETS+= prog
STAGE_AS_${PROG}= ${PROGNAME}
stage_as.prog: ${PROG}
.else
STAGE_SETS+= prog
stage_files.prog: ${PROG}
all: stage_files
.endif
.endif
.endif
.if !empty(_LIBS) && !defined(INTERNALLIB)
stage_libs: ${_LIBS}
.endif
.if !empty(INCS) || !empty(INCSGROUPS) && target(buildincludes)
beforebuild: buildincludes
.endif
.if !empty(STAGE_AS_SETS)
all: stage_as
.endif
.if !empty(_LIBS) || ${MK_STAGING_PROG} != "no"
.if !empty(LINKS)
all: stage_links
.ORDER: stage_files stage_links
.if !empty(STAGE_AS_SETS)
.ORDER: stage_as stage_links
.endif
STAGE_SETS+= links
STAGE_LINKS.links= ${LINKS}
.endif
.if !empty(SYMLINKS)
all: stage_symlinks
.if !empty(STAGE_AS_SETS)
.ORDER: stage_as stage_symlinks
.endif
STAGE_SETS+= links
STAGE_SYMLINKS.links= ${SYMLINKS}
.endif
.endif
.for t in stage_libs stage_files stage_as
.if target($t)
all: $t
.endif
.endfor
.include <meta.stage.mk>
.endif
.endif