svn commit: r273873 - head/share/mk

[Julio Merino]

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