svn commit: r276048 - stable/10/share/mk

[Garrett Cooper]

Author: ngie
Date: Mon Dec 22 00:21:24 2014
New Revision: 276048
URL: https://svnweb.freebsd.org/changeset/base/276048

Log:
  MFC r273186,r273873:
  
  r273186:
  
    Don't define rules based on PROGS if PROGS is empty.
  
    Reviewed by:	sjg, ngie
    Sponsored by:	EMC / Isilon Storage Division
  
  r273873:
  
    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:
  stable/10/share/mk/bsd.progs.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/mk/bsd.progs.mk
==============================================================================
--- stable/10/share/mk/bsd.progs.mk	Sun Dec 21 23:48:32 2014	(r276047)
+++ stable/10/share/mk/bsd.progs.mk	Mon Dec 22 00:21:24 2014	(r276048)
@@ -90,18 +90,24 @@ 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
 
+.if !empty(PROGS)
 .for t in ${PROGS_TARGETS:O:u}
 $t: ${PROGS:%=%.$t}
 .endfor
+.endif
 
 .if empty(PROGS) && !empty(SCRIPTS)