Date: Mon, 4 Mar 2013 21:36:34 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r247817 - projects/bmake/share/mk Message-ID: <201303042136.r24LaYbk014730@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Mon Mar 4 21:36:34 2013 New Revision: 247817 URL: http://svnweb.freebsd.org/changeset/base/247817 Log: Move STAGING related setup to bsd.sys.mk Modified: projects/bmake/share/mk/bsd.lib.mk projects/bmake/share/mk/bsd.prog.mk projects/bmake/share/mk/bsd.sys.mk Modified: projects/bmake/share/mk/bsd.lib.mk ============================================================================== --- projects/bmake/share/mk/bsd.lib.mk Mon Mar 4 21:35:49 2013 (r247816) +++ projects/bmake/share/mk/bsd.lib.mk Mon Mar 4 21:36:34 2013 (r247817) @@ -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 Modified: projects/bmake/share/mk/bsd.prog.mk ============================================================================== --- projects/bmake/share/mk/bsd.prog.mk Mon Mar 4 21:35:49 2013 (r247816) +++ projects/bmake/share/mk/bsd.prog.mk Mon Mar 4 21:36:34 2013 (r247817) @@ -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 Modified: projects/bmake/share/mk/bsd.sys.mk ============================================================================== --- projects/bmake/share/mk/bsd.sys.mk Mon Mar 4 21:35:49 2013 (r247816) +++ projects/bmake/share/mk/bsd.sys.mk Mon Mar 4 21:36:34 2013 (r247817) @@ -141,3 +141,79 @@ PHONY_NOTMAIN = afterdepend afterinstall .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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303042136.r24LaYbk014730>