From owner-svn-src-projects@FreeBSD.ORG  Sat Oct 12 23:51:00 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id A61CA889;
 Sat, 12 Oct 2013 23:51:00 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 943ED2714;
 Sat, 12 Oct 2013 23:51:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNp0b2048168;
 Sat, 12 Oct 2013 23:51:00 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNp0C9048165;
 Sat, 12 Oct 2013 23:51:00 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201310122351.r9CNp0C9048165@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sat, 12 Oct 2013 23:51:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r256411 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Oct 2013 23:51:00 -0000

Author: sjg
Date: Sat Oct 12 23:51:00 2013
New Revision: 256411
URL: http://svnweb.freebsd.org/changeset/base/256411

Log:
  Ensure that $PROG isn't make .PHONY
  Also add some additional control over staging (for use by bsd.test.mk)

Modified:
  projects/bmake/share/mk/bsd.sys.mk

Modified: projects/bmake/share/mk/bsd.sys.mk
==============================================================================
--- projects/bmake/share/mk/bsd.sys.mk	Sat Oct 12 23:49:26 2013	(r256410)
+++ projects/bmake/share/mk/bsd.sys.mk	Sat Oct 12 23:51:00 2013	(r256411)
@@ -143,7 +143,12 @@ PHONY_NOTMAIN = afterdepend afterinstall
 		realinstall regress subdir-all subdir-depend subdir-install \
 		tags whereobj
 
+.if defined(.PARSEDIR)
+# we don't want ${PROG} to be PHONY
+.PHONY: ${PHONY_NOTMAIN:N${PROG:U}}
+.else
 .PHONY: ${PHONY_NOTMAIN}
+.endif
 .NOTMAIN: ${PHONY_NOTMAIN}
 
 .if !defined(.PARSEDIR)
@@ -153,6 +158,9 @@ PHONY_NOTMAIN = afterdepend afterinstall
 
 .if ${MK_STAGING} != "no"
 .if defined(_SKIP_BUILD) || (!make(all) && !make(clean*))
+_SKIP_STAGING?= yes
+.endif
+.if ${_SKIP_STAGING:Uno} == "yes"
 staging stage_libs stage_files stage_as stage_links stage_symlinks:
 .else
 # allow targets like beforeinstall to be leveraged
@@ -168,7 +176,7 @@ staging: beforeinstall
 .if ${MK_STAGING_PROG} != "no"
 STAGE_DIR.prog= ${STAGE_OBJTOP}${BINDIR}
 
-.if !empty(PROG)
+.if !empty(PROG) || !empty(PROGS)
 .if defined(PROGNAME)
 STAGE_AS_SETS+= prog
 STAGE_AS_${PROG}= ${PROGNAME}
@@ -183,6 +191,9 @@ staging: stage_files
 
 .if !empty(_LIBS) && !defined(INTERNALLIB)
 stage_libs: ${_LIBS}
+.if defined(SHLIB_NAME) && defined(DEBUG_FLAGS) && target(${SHLIB_NAME}.symbols)
+stage_libs: ${SHLIB_NAME}.symbols
+.endif
 .endif
 
 .if !empty(INCS) || !empty(INCSGROUPS) && target(buildincludes)
@@ -203,6 +214,9 @@ staging: stage_as
 
 .if !empty(LINKS)
 staging: stage_links
+.if ${MAKE_VERSION} < 20131001
+stage_links.links: ${_LIBS} ${PROG}
+.endif
 STAGE_SETS+= links
 STAGE_LINKS.links= ${LINKS}
 .endif