1 files changed, 13 insertions, 9 deletions

diff --git a/targets/Makefile.xtras b/targets/Makefile.xtras
index a216f626d6f3..4372f5ac246a 100644
--- a/targets/Makefile.xtras
+++ b/targets/Makefile.xtras
@@ -33,23 +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
 
-BUILD_TARGETS_HOST != cd ${_here} && \
-	find . \( -name Makefile.depend.host -o -name ${.MAKE.DEPENDFILE:T}.host \) | \
+.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:
-.if !empty(BUILD_TARGETS_HOST)
-	@echo "Build targets for host (leave out the ${target_dirs:S,${_here:T},,:S,^/,,:S,$,/,}):"
-	@echo "${BUILD_TARGETS_HOST:O: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 "${BUILD_TARGETS_${_machine:tu}:O:ts\n}"
 	@echo
 .endif
-	@echo "Build targets for ${MACHINE} (leave out the ${target_dirs:S,${_here:T},,:S,^/,,:S,$,/,}):"
-	@echo "${BUILD_TARGETS:O:ts\n}"
-	@echo; echo "Other targets:"; echo "${OTHER_TARGETS:O:ts\n}"
+.endfor
+	@echo "Other targets:"; echo "${OTHER_TARGETS:O:ts\n}"
 .endif
 
 help: show-help