MFH

Sponsored by:	The FreeBSD Foundation

4 files changed, 49 insertions, 40 deletions

diff --git a/targets/Makefile.xtras b/targets/Makefile.xtras
index 807cb9a..124bddc 100644
--- a/targets/Makefile.xtras
+++ b/targets/Makefile.xtras
@@ -33,14 +33,27 @@ OTHER_TARGETS = \
 	destroy-host \
 	destroy-stage \
 
-BUILD_TARGETS != cd ${_here} && \
+BUILD_TARGETS_${MACHINE:tu} != cd ${_here} && \
 	find . \( -name Makefile.depend -o -name ${.MAKE.DEPENDFILE:T} \) | \
 	sed 's,/Makefile.*,,;s,^./,,' | sort -u
 
+.for _machine in ${all_machine_list}
+_targets_${_machine} != cd ${_here} && \
+	find . \( -name Makefile.depend.${_machine} -o \
+	    -name ${.MAKE.DEPENDFILE:T}.${_machine} \) | \
+	sed 's,/Makefile.*,,;s,^./,,' | sort -u
+BUILD_TARGETS_${_machine:tu} += ${_targets_${_machine}}
+.endfor
+
 show-valid-targets:
-	@echo "Build targets for ${MACHINE} (leave out the ${target_dirs:S,${_here:T},,:S,^/,,:S,$,/,}):"
-	@echo "${BUILD_TARGETS:ts\n}"
-	@echo; echo "Other targets:"; echo "${OTHER_TARGETS:ts\n}"
+.for _machine in ${all_machine_list:O}
+.if !empty(BUILD_TARGETS_${_machine:tu})
+	@echo "Build targets for ${_machine} (leave out the ${target_dirs:S,${_here:T},,:S,^/,,:S,$,/,}):"
+	@echo -e "${BUILD_TARGETS_${_machine:tu}:O:ts\n}" | sed -e 's,^,  ,'
+	@echo
+.endif
+.endfor
+	@echo "Other targets:"; echo "${OTHER_TARGETS:O:ts\n}" | sed -e 's,^,  ,'
 .endif
 
 help: show-help
diff --git a/targets/pseudo/hosttools/Makefile.depend b/targets/pseudo/hosttools/Makefile.depend
deleted file mode 100644
index d39e91e..0000000
--- a/targets/pseudo/hosttools/Makefile.depend
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-
-# This file is not autogenerated - take care!
-
-.if !defined(MK_KERBEROS)
-.include <src.opts.mk>
-.endif
-
-DIRDEPS = \
-	lib/clang/include.host \
-	lib/libc++.host \
-	lib/libcxxrt.host \
-	share/doc/llvm/clang.host \
-	usr.bin/clang/clang-tblgen.host \
-	usr.bin/clang/clang.host \
-	usr.bin/clang/llvm-tblgen.host \
-	usr.bin/lex/lib.host \
-	usr.bin/localedef.host \
-	usr.bin/mkcsmapper_static.host \
-	usr.bin/mkesdb_static.host \
-	usr.bin/mkuzip.host \
-	usr.bin/yacc.host \
-	usr.bin/xinstall.host \
-	usr.bin/xlint/xlint.host \
-	usr.sbin/config.host \
-
-.if ${MK_KERBEROS} != "no"
-DIRDEPS+= \
-	kerberos5/tools/asn1_compile.host \
-	kerberos5/tools/make-roken.host \
-	usr.bin/compile_et.host \
-
-.endif
-
-
-.include <dirdeps.mk>
diff --git a/targets/pseudo/hosttools/Makefile.depend.host b/targets/pseudo/hosttools/Makefile.depend.host
new file mode 100644
index 0000000..89d87f4
--- /dev/null
+++ b/targets/pseudo/hosttools/Makefile.depend.host
@@ -0,0 +1,31 @@
+# $FreeBSD$
+
+# This file is not autogenerated - take care!
+
+.if !defined(MK_KERBEROS)
+.include <src.opts.mk>
+.endif
+
+# These are all .host dependencies
+
+DIRDEPS = \
+	usr.bin/clang/clang-tblgen \
+	usr.bin/clang/llvm-tblgen \
+	usr.bin/localedef \
+	usr.bin/mkcsmapper_static \
+	usr.bin/mkesdb_static \
+	usr.bin/xinstall \
+	usr.bin/xlint/xlint \
+	usr.bin/yacc \
+	usr.sbin/config \
+
+.if ${MK_KERBEROS} != "no"
+DIRDEPS+= \
+	kerberos5/tools/asn1_compile \
+	kerberos5/tools/make-roken \
+	usr.bin/compile_et \
+
+.endif
+
+
+.include <dirdeps.mk>
diff --git a/targets/pseudo/userland/misc/Makefile.depend b/targets/pseudo/userland/misc/Makefile.depend
index c186f6d..b0423a5 100644
--- a/targets/pseudo/userland/misc/Makefile.depend
+++ b/targets/pseudo/userland/misc/Makefile.depend
@@ -32,6 +32,7 @@ DIRDEPS+= \
 
 DIRDEPS.x86sys= \
 	sys/boot/efi/libefi \
+	sys/boot/geli \
 	sys/boot/i386/boot0 \
 	sys/boot/i386/boot0sio \
 	sys/boot/i386/boot2 \