[src/trunk]: src Fix host tools build for asn1_compile, compile_et, and slc.

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f37dab1ec73f
branches:  trunk
changeset: 821247:f37dab1ec73f
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Mon Jan 30 02:38:50 2017 +0000

description:
Fix host tools build for asn1_compile, compile_et, and slc.

diffstat:

 crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile |  5 +++--
 crypto/external/bsd/heimdal/lib/libsl/slc/Makefile             |  7 ++++---
 tools/asn1_compile/Makefile                                    |  8 +-------
 tools/compile_et/Makefile                                      |  8 +-------
 4 files changed, 9 insertions(+), 19 deletions(-)

diffs (80 lines):

diff -r f2410f5f6b04 -r f37dab1ec73f crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile
--- a/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile    Mon Jan 30 00:25:15 2017 +0000
+++ b/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile    Mon Jan 30 02:38:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/08/28 10:28:35 elric Exp $
+# $NetBSD: Makefile,v 1.4 2017/01/30 02:38:50 jakllsch Exp $
 
 NOMAN=         # defined
 
@@ -50,10 +50,11 @@
 beforedepend:
        [ -h krb5 ] || ln -sf . krb5
        ln -sf ${HEIMBASE}/include/roken.h
+       ln -sf ${HEIMBASE}/include/krb5-types.h
        ln -sf ${HEIMBASE}/dist/lib/roken/roken-common.h
        ln -sf ${HEIMBASE}/dist/lib/roken/getarg.h
 
-CLEANFILES+=   krb5 roken.h roken-common.h getarg.h
+CLEANFILES+=   krb5 roken.h krb5-types.h roken-common.h getarg.h
 
 .ifndef HOSTPROG
 HOSTPROG=      ${PROG}
diff -r f2410f5f6b04 -r f37dab1ec73f crypto/external/bsd/heimdal/lib/libsl/slc/Makefile
--- a/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile        Mon Jan 30 00:25:15 2017 +0000
+++ b/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile        Mon Jan 30 02:38:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/04/15 21:02:47 elric Exp $
+# $NetBSD: Makefile,v 1.4 2017/01/30 02:38:50 jakllsch Exp $
 
 NOMAN=         # defined
 
@@ -37,11 +37,12 @@
 beforedepend:
        [ -h krb5 ] || ln -sf . krb5
        ln -sf ${HEIMBASE}/include/roken.h
+       ln -sf ${HEIMBASE}/include/krb5-types.h
        ln -sf ${HEIMBASE}/dist/lib/roken/roken-common.h
        ln -sf ${HEIMBASE}/dist/lib/roken/getarg.h
 
-CLEANFILES+=   krb5 roken.h roken-common.h getarg.h    \
-               print_version.h make-print-version      \
+CLEANFILES+=   krb5 roken.h krb5-types.h roken-common.h        \
+               getarg.h print_version.h make-print-version     \
                make-print-version.lo
 
 # HOSTPROG will be set already if this is a src/tools build.
diff -r f2410f5f6b04 -r f37dab1ec73f tools/asn1_compile/Makefile
--- a/tools/asn1_compile/Makefile       Mon Jan 30 00:25:15 2017 +0000
+++ b/tools/asn1_compile/Makefile       Mon Jan 30 02:38:50 2017 +0000
@@ -1,12 +1,6 @@
-#      $NetBSD: Makefile,v 1.7 2017/01/29 22:16:51 christos Exp $
+#      $NetBSD: Makefile,v 1.8 2017/01/30 02:38:50 jakllsch Exp $
 
 HOSTPROGNAME=  ${_TOOL_PREFIX}asn1_compile
 HOST_SRCDIR=   crypto/external/bsd/heimdal/lib/libasn1/asn1_compile
-CPPFLAGS+=     -I.
-
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
-       ln -sf ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/include krb5
-.endif
 
 .include "${.CURDIR}/../Makefile.host"
diff -r f2410f5f6b04 -r f37dab1ec73f tools/compile_et/Makefile
--- a/tools/compile_et/Makefile Mon Jan 30 00:25:15 2017 +0000
+++ b/tools/compile_et/Makefile Mon Jan 30 02:38:50 2017 +0000
@@ -1,12 +1,6 @@
-#      $NetBSD: Makefile,v 1.9 2017/01/29 22:16:51 christos Exp $
+#      $NetBSD: Makefile,v 1.10 2017/01/30 02:38:50 jakllsch Exp $
 
 HOSTPROGNAME=  ${_TOOL_PREFIX}compile_et
 HOST_SRCDIR=   crypto/external/bsd/heimdal/lib/libcom_err/compile_et
-CPPFLAGS+=     -I.
-
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
-       ln -sf ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/include krb5
-.endif
 
 .include "${.CURDIR}/../Makefile.host"