Index: head/rescue/rescue/Makefile.depend
===================================================================
--- head/rescue/rescue/Makefile.depend	(nonexistent)
+++ head/rescue/rescue/Makefile.depend	(revision 300807)
@@ -0,0 +1,61 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	cddl/lib/libavl \
+	cddl/lib/libnvpair \
+	cddl/lib/libumem \
+	cddl/lib/libuutil \
+	cddl/lib/libzfs \
+	cddl/lib/libzfs_core \
+	cddl/lib/libzpool \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/arpa \
+	include/protocols \
+	include/rpc \
+	include/rpcsvc \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/lib80211 \
+	lib/libalias/libalias \
+	lib/libarchive \
+	lib/libbz2 \
+	lib/libc \
+	lib/libcam \
+	lib/libcompiler_rt \
+	lib/libcrypt \
+	lib/libdevstat \
+	lib/libedit \
+	lib/libelf \
+	lib/libexpat \
+	lib/libgeom \
+	lib/libipsec \
+	lib/libjail \
+	lib/libkiconv \
+	lib/libkvm \
+	lib/liblzma \
+	lib/libmd \
+	lib/libmt \
+	lib/libnetgraph \
+	lib/libsbuf \
+	lib/libthr \
+	lib/libufs \
+	lib/libutil \
+	lib/libxo \
+	lib/libz \
+	lib/msun \
+	lib/ncurses/ncursesw \
+	rescue/librescue \
+	secure/lib/libcrypto \
+	usr.bin/lex/lib \
+	usr.bin/yacc.host \
+	usr.sbin/crunch/crunchgen.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Property changes on: head/rescue/rescue/Makefile.depend
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/share/mk/bsd.crunchgen.mk
===================================================================
--- head/share/mk/bsd.crunchgen.mk	(revision 300806)
+++ head/share/mk/bsd.crunchgen.mk	(revision 300807)
@@ -1,165 +1,168 @@
 #################################################################
 #
 # Generate crunched binaries using crunchgen(1).
 #
 # General notes:
 #
 # A number of Make variables are used to generate the crunchgen config file.
 #
 #  CRUNCH_SRCDIRS: lists directories to search for included programs
 #  CRUNCH_PROGS:  lists programs to be included
 #  CRUNCH_LIBS:  libraries to statically link with
 #  CRUNCH_SHLIBS:  libraries to dynamically link with
 #  CRUNCH_BUILDOPTS: generic build options to be added to every program
 #  CRUNCH_BUILDTOOLS: lists programs that need build tools built in the
 #       local architecture.
 #
 # Special options can be specified for individual programs
 #  CRUNCH_SRCDIR_${P}: base source directory for program ${P}
 #  CRUNCH_BUILDOPTS_${P}: additional build options for ${P}
 #  CRUNCH_ALIAS_${P}: additional names to be used for ${P}
 #
 # By default, any name appearing in CRUNCH_PROGS or CRUNCH_ALIAS_${P}
 # will be used to generate a hard link to the resulting binary.
 # Specific links can be suppressed by setting
 # CRUNCH_SUPPRESS_LINK_${NAME} to 1.
 #
 # If CRUNCH_GENERATE_LINKS is set to no, no links will be generated.
 #
 
 # $FreeBSD$
 
 ##################################################################
 #  The following is pretty nearly a generic crunchgen-handling makefile
 #
 
 CONF=	${PROG}.conf
 OUTMK=	${PROG}.mk
 OUTC=	${PROG}.c
 OUTPUTS=${OUTMK} ${OUTC} ${PROG}.cache
 CRUNCHOBJS= ${.OBJDIR}
 CRUNCH_GENERATE_LINKS?= yes
 # Don't let the prog.mk use MK_AUTO_OBJ, but do let the component builds use
 # it.
 CRUNCHENV+= MK_AUTO_OBJ=no
 CRUNCH_BUILDOPTS+= MK_AUTO_OBJ=${MK_AUTO_OBJ}
 
 CLEANFILES+= ${CONF} *.o *.lo *.c *.mk *.cache *.a *.h
 
 # Don't try to extract debug info from ${PROG}.
 MK_DEBUG_FILES= no
 
 # Set a default SRCDIR for each for simpler handling below.
 .for D in ${CRUNCH_SRCDIRS}
 .for P in ${CRUNCH_PROGS_${D}}
 CRUNCH_SRCDIR_${P}?=	${.CURDIR}/../../${D}/${P}
 .endfor
 .endfor
 
 # Program names and their aliases contribute hardlinks to 'rescue' executable,
 # except for those that get suppressed.
 .for D in ${CRUNCH_SRCDIRS}
 .for P in ${CRUNCH_PROGS_${D}}
 ${OUTPUTS}: ${CRUNCH_SRCDIR_${P}}/Makefile
 .if ${CRUNCH_GENERATE_LINKS} == "yes"
 .ifndef CRUNCH_SUPPRESS_LINK_${P}
 LINKS+= ${BINDIR}/${PROG} ${BINDIR}/${P}
 .endif
 .for A in ${CRUNCH_ALIAS_${P}}
 .ifndef CRUNCH_SUPPRESS_LINK_${A}
 LINKS+= ${BINDIR}/${PROG} ${BINDIR}/${A}
 .endif
 .endfor
 .endif
 .endfor
 .endfor
 
 .if !defined(_SKIP_BUILD)
 all: ${PROG}
 .endif
 exe: ${PROG}
 
 ${CONF}: Makefile
 	echo \# Auto-generated, do not edit >${.TARGET}
 .ifdef CRUNCH_BUILDOPTS
 	echo buildopts ${CRUNCH_BUILDOPTS} >>${.TARGET}
 .endif
 .ifdef CRUNCH_LIBS
 	echo libs ${CRUNCH_LIBS} >>${.TARGET}
 .endif
 .ifdef CRUNCH_SHLIBS
 	echo libs_so ${CRUNCH_SHLIBS} >>${.TARGET}
 .endif
 .for D in ${CRUNCH_SRCDIRS}
 .for P in ${CRUNCH_PROGS_${D}}
 	echo progs ${P} >>${.TARGET}
 	echo special ${P} srcdir ${CRUNCH_SRCDIR_${P}} >>${.TARGET}
 .ifdef CRUNCH_BUILDOPTS_${P}
 	echo special ${P} buildopts DIRPRFX=${DIRPRFX}${P}/ \
 	    ${CRUNCH_BUILDOPTS_${P}} >>${.TARGET}
 .else
 	echo special ${P} buildopts DIRPRFX=${DIRPRFX}${P}/ >>${.TARGET}
 .endif
 .for A in ${CRUNCH_ALIAS_${P}}
 	echo ln ${P} ${A} >>${.TARGET}
 .endfor
 .endfor
 .endfor
 
 CRUNCHGEN?= crunchgen
 CRUNCHENV+= MK_TESTS=no \
+	    UPDATE_DEPENDFILE=no \
 	    _RECURSING_CRUNCH=1
 .ORDER: ${OUTPUTS} objs
 ${OUTPUTS:[1]}: .META
 ${OUTPUTS}: ${CONF}
 	MAKE=${MAKE} ${CRUNCHENV:NMK_AUTO_OBJ=*} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \
 	    MK_AUTO_OBJ=${MK_AUTO_OBJ} \
 	    ${CRUNCHGEN} -fq -m ${OUTMK} -c ${OUTC} ${CONF}
 	# Avoid redundantly calling 'make objs' which we've done by our
 	# own dependencies.
 	sed -i '' -e "s/^\(${PROG}:.*\) \$$(SUBMAKE_TARGETS)/\1/" ${OUTMK}
 
 # These 2 targets cannot use .MAKE since they depend on the generated
 # ${OUTMK} above.
-${PROG}: ${OUTPUTS} objs
+${PROG}: ${OUTPUTS} objs .META
 	${CRUNCHENV} \
 	    CC="${CC} ${CFLAGS} ${LDFLAGS}" \
 	    CXX="${CXX} ${CXXFLAGS} ${LDFLAGS}" \
-	    ${MAKE} -f ${OUTMK} exe
+	    ${MAKE} .MAKE.MODE=normal -f ${OUTMK} exe
 
-objs: ${OUTMK}
+objs: ${OUTMK} .META
 	${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \
 	    ${MAKE} -f ${OUTMK} objs
 
 # <sigh> Someone should replace the bin/csh and bin/sh build-tools with
 # shell scripts so we can remove this nonsense.
 .for _tool in ${CRUNCH_BUILDTOOLS}
 build-tools-${_tool}:
 	${_+_}cd ${.CURDIR}/../../${_tool}; \
 	    ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} obj; \
 	    ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} build-tools
 build-tools: build-tools-${_tool}
 .endfor
 
 # Use a separate build tree to hold files compiled for this crunchgen binary
 # Yes, this does seem to partly duplicate bsd.subdir.mk, but I can't
 # get that to cooperate with bsd.prog.mk.  Besides, many of the standard
 # targets should NOT be propagated into the components.
 .for __target in clean cleandepend cleandir obj objlink
 .for D in ${CRUNCH_SRCDIRS}
 .for P in ${CRUNCH_PROGS_${D}}
 ${__target}_crunchdir_${P}: .PHONY .MAKE
 	${_+_}cd ${CRUNCH_SRCDIR_${P}} && \
 	    ${CRUNCHENV} MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} \
 	    DIRPRFX=${DIRPRFX}${P}/ ${CRUNCH_BUILDOPTS} ${__target}
 ${__target}: ${__target}_crunchdir_${P}
 .endfor
 .endfor
 .endfor
 
 clean:
 	rm -f ${CLEANFILES}
 	${_+_}if [ -e ${.OBJDIR}/${OUTMK} ]; then			\
 		${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} 	\
 		-f ${OUTMK} clean;					\
 	fi
+
+META_XTRAS+=	${find ${CRUNCHOBJS}${SRCTOP} -name '*.meta' 2>/dev/null || true:L:sh}
Index: head/targets/pseudo/userland/misc/Makefile.depend
===================================================================
--- head/targets/pseudo/userland/misc/Makefile.depend	(revision 300806)
+++ head/targets/pseudo/userland/misc/Makefile.depend	(revision 300807)
@@ -1,87 +1,88 @@
 # $FreeBSD$
 
 # This file is not autogenerated - take care!
 
 .if !defined(MK_FORTH)
 .include <src.opts.mk>
 .endif
 
 _sys_boot_efi= sys/boot/efi/loader sys/boot/efi/boot1
 .if ${MK_FDT} != "no"
 _sys_boot_fdt= sys/boot/fdt sys/boot/efi/fdt
 .endif
 .if ${MK_ZFS} != "no"
 _sys_boot_zfs= sys/boot/zfs
 .endif
 
 DIRDEPS = \
 	etc \
 	etc/newsyslog.conf.d \
 	etc/sendmail \
 	rescue/librescue \
+	rescue/rescue \
 
 .if ${MK_BOOT} != "no"
 DIRDEPS+= sys/boot/common
 
 .if ${MK_FORTH} != "no"
 DIRDEPS+= \
 	sys/boot/ficl \
 	sys/boot/forth \
 
 .endif
 
 DIRDEPS.x86sys= \
 	sys/boot/efi/libefi \
 	sys/boot/geli \
 	sys/boot/i386/boot0 \
 	sys/boot/i386/boot0sio \
 	sys/boot/i386/boot2 \
 	sys/boot/i386/btx/btx \
 	sys/boot/i386/btx/btxldr \
 	sys/boot/i386/btx/lib \
 	sys/boot/i386/cdboot \
 	sys/boot/i386/gptboot \
 	sys/boot/i386/kgzldr \
 	sys/boot/i386/libfirewire \
 	sys/boot/i386/libi386 \
 	sys/boot/i386/loader \
 	sys/boot/i386/mbr \
 	sys/boot/i386/pmbr \
 	sys/boot/i386/pxeldr \
 	sys/boot/libstand32 \
 	${_sys_boot_zfs} \
 
 .if ${MK_ZFS} != "no"
 DIRDEPS.x86sys+= \
 	sys/boot/i386/gptzfsboot \
 	sys/boot/i386/zfsboot \
 	sys/boot/i386/zfsloader \
 
 .endif
 
 DIRDEPS.amd64= \
 	${DIRDEPS.x86sys} \
 	${_sys_boot_efi} \
 	sys/boot/ficl32 \
 	sys/boot/userboot/ficl \
 	sys/boot/userboot/libstand \
 	sys/boot/userboot/test \
 	sys/boot/userboot/userboot \
 
 .if ${MK_ZFS} != "no"
 DIRDEPS.amd64+= \
 	sys/boot/userboot/zfs \
 
 .endif
 
 DIRDEPS.arm= ${_sys_boot_fdt} ${_sys_boot_efi}
 DIRDEPS.arm64= ${_sys_boot_fdt} ${_sys_boot_efi}
 DIRDEPS.i386= ${DIRDEPS.x86sys} sys/boot/efi/libefi
 DIRDEPS.powerpc= ${_sys_boot_fdt} sys/boot/libstand32 sys/boot/ofw sys/boot/uboot
 DIRDEPS.pc98= sys/boot/libstand32
 DIRDEPS.sparc64= sys/boot/ofw ${_sys_boot_zfs}
 .endif
 
 DIRDEPS+= ${DIRDEPS.${MACHINE}:U}
 
 .include <dirdeps.mk>