17 files changed, 44 insertions, 47 deletions

diff --git a/share/i18n/csmapper/APPLE/Makefile.depend b/share/i18n/csmapper/APPLE/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/APPLE/Makefile.depend
+++ b/share/i18n/csmapper/APPLE/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>
diff --git a/share/i18n/csmapper/AST/Makefile.depend b/share/i18n/csmapper/AST/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/AST/Makefile.depend
+++ b/share/i18n/csmapper/AST/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>
diff --git a/share/i18n/csmapper/BIG5/Makefile.depend b/share/i18n/csmapper/BIG5/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/BIG5/Makefile.depend
+++ b/share/i18n/csmapper/BIG5/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>
diff --git a/share/i18n/csmapper/CNS/Makefile.depend b/share/i18n/csmapper/CNS/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/CNS/Makefile.depend
+++ b/share/i18n/csmapper/CNS/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>
diff --git a/share/i18n/csmapper/CP/Makefile.depend b/share/i18n/csmapper/CP/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/CP/Makefile.depend
+++ b/share/i18n/csmapper/CP/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>
diff --git a/share/i18n/csmapper/EBCDIC/Makefile.depend b/share/i18n/csmapper/EBCDIC/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/EBCDIC/Makefile.depend
+++ b/share/i18n/csmapper/EBCDIC/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>
diff --git a/share/i18n/csmapper/GB/Makefile.depend b/share/i18n/csmapper/GB/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/GB/Makefile.depend
+++ b/share/i18n/csmapper/GB/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>
diff --git a/share/i18n/csmapper/GEORGIAN/Makefile.depend b/share/i18n/csmapper/GEORGIAN/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/GEORGIAN/Makefile.depend
+++ b/share/i18n/csmapper/GEORGIAN/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>
diff --git a/share/i18n/csmapper/ISO-8859/Makefile.depend b/share/i18n/csmapper/ISO-8859/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/ISO-8859/Makefile.depend
+++ b/share/i18n/csmapper/ISO-8859/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>
diff --git a/share/i18n/csmapper/ISO646/Makefile.depend b/share/i18n/csmapper/ISO646/Makefile.depend
index 29fda55c252f..57b7e10c3d71 100644
--- a/share/i18n/csmapper/ISO646/Makefile.depend
+++ b/share/i18n/csmapper/ISO646/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/share/i18n/csmapper/JIS/Makefile.depend b/share/i18n/csmapper/JIS/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/JIS/Makefile.depend
+++ b/share/i18n/csmapper/JIS/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>
diff --git a/share/i18n/csmapper/KAZAKH/Makefile.depend b/share/i18n/csmapper/KAZAKH/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/KAZAKH/Makefile.depend
+++ b/share/i18n/csmapper/KAZAKH/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>
diff --git a/share/i18n/csmapper/KOI/Makefile.depend b/share/i18n/csmapper/KOI/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/KOI/Makefile.depend
+++ b/share/i18n/csmapper/KOI/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>
diff --git a/share/i18n/csmapper/KS/Makefile.depend b/share/i18n/csmapper/KS/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/KS/Makefile.depend
+++ b/share/i18n/csmapper/KS/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>
diff --git a/share/i18n/csmapper/MISC/Makefile.depend b/share/i18n/csmapper/MISC/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/MISC/Makefile.depend
+++ b/share/i18n/csmapper/MISC/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>
diff --git a/share/i18n/csmapper/Makefile.depend b/share/i18n/csmapper/Makefile.depend
new file mode 100644
index 000000000000..4a9b02081784
--- /dev/null
+++ b/share/i18n/csmapper/Makefile.depend
@@ -0,0 +1,29 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DIRDEPS = \
+	share/i18n/csmapper/APPLE \
+	share/i18n/csmapper/AST \
+	share/i18n/csmapper/BIG5 \
+	share/i18n/csmapper/CNS \
+	share/i18n/csmapper/CP \
+	share/i18n/csmapper/EBCDIC \
+	share/i18n/csmapper/GB \
+	share/i18n/csmapper/GEORGIAN \
+	share/i18n/csmapper/ISO-8859 \
+	share/i18n/csmapper/ISO646 \
+	share/i18n/csmapper/JIS \
+	share/i18n/csmapper/KAZAKH \
+	share/i18n/csmapper/KOI \
+	share/i18n/csmapper/KS \
+	share/i18n/csmapper/MISC \
+	share/i18n/csmapper/TCVN \
+	usr.bin/mkcsmapper_static.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/share/i18n/csmapper/TCVN/Makefile.depend b/share/i18n/csmapper/TCVN/Makefile.depend
index 8b6d5ba3e6e9..e914153843a8 100644
--- a/share/i18n/csmapper/TCVN/Makefile.depend
+++ b/share/i18n/csmapper/TCVN/Makefile.depend
@@ -2,10 +2,8 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	usr.bin/mkcsmapper_static \
+	usr.bin/mkcsmapper_static.host \
 
 
 .include <dirdeps.mk>