Mon Jan 30 02:38:51 2017 UTC ()
Fix host tools build for asn1_compile, compile_et, and slc.


(jakllsch)
diff -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile
diff -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile
diff -r1.7 -r1.8 src/tools/asn1_compile/Makefile
diff -r1.9 -r1.10 src/tools/compile_et/Makefile
cvs diff -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile (expand / switch to context diff)
--- src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile 2011/08/28 10:28:35 1.3
+++ src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile 2017/01/30 02:38:50 1.4
@@ -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}
cvs diff -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile (expand / switch to context diff)
--- src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile 2011/04/15 21:02:47 1.3
+++ src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile 2017/01/30 02:38:50 1.4
@@ -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.
cvs diff -r1.7 -r1.8 src/tools/asn1_compile/Makefile (expand / switch to context diff)
--- src/tools/asn1_compile/Makefile 2017/01/29 22:16:51 1.7
+++ src/tools/asn1_compile/Makefile 2017/01/30 02:38:50 1.8
@@ -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"
cvs diff -r1.9 -r1.10 src/tools/compile_et/Makefile (expand / switch to context diff)
--- src/tools/compile_et/Makefile 2017/01/29 22:16:51 1.9
+++ src/tools/compile_et/Makefile 2017/01/30 02:38:50 1.10
@@ -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"