From owner-svn-src-all@FreeBSD.ORG  Tue Mar 26 18:46:40 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D2DA78F3;
 Tue, 26 Mar 2013 18:46:40 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C5BBA6CC;
 Tue, 26 Mar 2013 18:46:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2QIkevk067619;
 Tue, 26 Mar 2013 18:46:40 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2QIkegP067618;
 Tue, 26 Mar 2013 18:46:40 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201303261846.r2QIkegP067618@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 26 Mar 2013 18:46:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248742 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Mar 2013 18:46:40 -0000

Author: markj
Date: Tue Mar 26 18:46:40 2013
New Revision: 248742
URL: http://svnweb.freebsd.org/changeset/base/248742

Log:
  Make sure to set OBJS consistently in the cases where SRCS is and isn't
  already defined. Setting it with "+=" makes it possible for other make
  scripts (e.g. bsd.dtrace.mk) to include additional object files in the
  linker arguments.
  
  Approved by:	emaste (co-mentor)

Modified:
  head/share/mk/bsd.prog.mk

Modified: head/share/mk/bsd.prog.mk
==============================================================================
--- head/share/mk/bsd.prog.mk	Tue Mar 26 18:45:16 2013	(r248741)
+++ head/share/mk/bsd.prog.mk	Tue Mar 26 18:46:40 2013	(r248742)
@@ -73,7 +73,7 @@ SRCS=	${PROG}.c
 # - the name of the object gets put into the executable symbol table instead of
 #   the name of a variable temporary object.
 # - it's useful to keep objects around for crunching.
-OBJS=	${PROG}.o
+OBJS+=	${PROG}.o
 
 .if target(beforelinking)
 beforelinking: ${OBJS}