aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2016-05-26 23:20:40 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2016-05-26 23:20:40 +0000
commit38f6966b7008d72592630a1e2f9272945c9a7d0b (patch)
tree01245292a09a87694bf6c8897de022bc67519397
parenteb9b07bb777a881bebf027c3f77d8f2dd4026c29 (diff)
downloadsrc-38f6966b7008d72592630a1e2f9272945c9a7d0b.tar.gz
src-38f6966b7008d72592630a1e2f9272945c9a7d0b.zip
DIRDEPS_BUILD: Fix and hookup rescue/rescue to the build.
Sponsored by: EMC / Isilon Storage Division
Notes
Notes: svn path=/head/; revision=300807
-rw-r--r--rescue/rescue/Makefile.depend61
-rw-r--r--share/mk/bsd.crunchgen.mk9
-rw-r--r--targets/pseudo/userland/misc/Makefile.depend1
3 files changed, 68 insertions, 3 deletions
diff --git a/rescue/rescue/Makefile.depend b/rescue/rescue/Makefile.depend
new file mode 100644
index 000000000000..1710daf9a39c
--- /dev/null
+++ b/rescue/rescue/Makefile.depend
@@ -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
diff --git a/share/mk/bsd.crunchgen.mk b/share/mk/bsd.crunchgen.mk
index b8085b2f1605..435dfeb3f2f7 100644
--- a/share/mk/bsd.crunchgen.mk
+++ b/share/mk/bsd.crunchgen.mk
@@ -108,6 +108,7 @@ ${CONF}: Makefile
CRUNCHGEN?= crunchgen
CRUNCHENV+= MK_TESTS=no \
+ UPDATE_DEPENDFILE=no \
_RECURSING_CRUNCH=1
.ORDER: ${OUTPUTS} objs
${OUTPUTS:[1]}: .META
@@ -121,13 +122,13 @@ ${OUTPUTS}: ${CONF}
# 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
@@ -163,3 +164,5 @@ clean:
${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} \
-f ${OUTMK} clean; \
fi
+
+META_XTRAS+= ${find ${CRUNCHOBJS}${SRCTOP} -name '*.meta' 2>/dev/null || true:L:sh}
diff --git a/targets/pseudo/userland/misc/Makefile.depend b/targets/pseudo/userland/misc/Makefile.depend
index b0423a50b1e6..19ede3238843 100644
--- a/targets/pseudo/userland/misc/Makefile.depend
+++ b/targets/pseudo/userland/misc/Makefile.depend
@@ -19,6 +19,7 @@ DIRDEPS = \
etc/newsyslog.conf.d \
etc/sendmail \
rescue/librescue \
+ rescue/rescue \
.if ${MK_BOOT} != "no"
DIRDEPS+= sys/boot/common