From owner-svn-src-all@FreeBSD.ORG  Thu Oct 30 22:07:30 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 88873F33;
 Thu, 30 Oct 2014 22:07:30 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 748919F4;
 Thu, 30 Oct 2014 22:07:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9UM7Uw8075120;
 Thu, 30 Oct 2014 22:07:30 GMT (envelope-from jmmv@FreeBSD.org)
Received: (from jmmv@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9UM7UUD075119;
 Thu, 30 Oct 2014 22:07:30 GMT (envelope-from jmmv@FreeBSD.org)
Message-Id: <201410302207.s9UM7UUD075119@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jmmv set sender to jmmv@FreeBSD.org
 using -f
From: Julio Merino <jmmv@FreeBSD.org>
Date: Thu, 30 Oct 2014 22:07:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273873 - 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.18-1
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: Thu, 30 Oct 2014 22:07:30 -0000

Author: jmmv
Date: Thu Oct 30 22:07:29 2014
New Revision: 273873
URL: https://svnweb.freebsd.org/changeset/base/273873

Log:
  Use the right depend file for each program.
  
  bsd.progs.mk generates a separate depend file for every program being
  built, but then it does not properly tell each submake to use those
  individual files.  Properly propagate the depend file to use.
  
  Discovered while preparing the update of atf to 0.21 and noticing that
  the test programs were not being relinked to the new library.
  
  This change is "make tinderbox" clean.

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

Modified: head/share/mk/bsd.progs.mk
==============================================================================
--- head/share/mk/bsd.progs.mk	Thu Oct 30 21:21:53 2014	(r273872)
+++ head/share/mk/bsd.progs.mk	Thu Oct 30 22:07:29 2014	(r273873)
@@ -90,12 +90,16 @@ x.$p= PROG_CXX=$p
 
 $p ${p}_p: .PHONY .MAKE
 	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
-	    SUBDIR= PROG=$p ${x.$p})
+	    SUBDIR= PROG=$p \
+	    DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \
+	    ${x.$p})
 
 .for t in ${PROGS_TARGETS:O:u}
 $p.$t: .PHONY .MAKE
 	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
-	    SUBDIR= PROG=$p ${x.$p} ${@:E})
+	    SUBDIR= PROG=$p \
+	    DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \
+	    ${x.$p} ${@:E})
 .endfor
 .endfor