Module Name: src
Committed By: jakllsch
Date: Mon Jan 30 02:38:51 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et: Makefile
src/crypto/external/bsd/heimdal/lib/libsl/slc: Makefile
src/tools/asn1_compile: Makefile
src/tools/compile_et: Makefile
Log Message:
Fix host tools build for asn1_compile, compile_et, and slc.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile
cvs rdiff -u -r1.7 -r1.8 src/tools/asn1_compile/Makefile
cvs rdiff -u -r1.9 -r1.10 src/tools/compile_et/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile:1.3 Sun Aug 28 10:28:35 2011
+++ src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile Mon Jan 30 02:38:50 2017
@@ -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 @@ CLEANFILES+= print_version.h make-print-
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}
Index: src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile:1.3 Fri Apr 15 21:02:47 2011
+++ src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile Mon Jan 30 02:38:50 2017
@@ -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 @@ print_version.h: make-print-version
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.
Index: src/tools/asn1_compile/Makefile
diff -u src/tools/asn1_compile/Makefile:1.7 src/tools/asn1_compile/Makefile:1.8
--- src/tools/asn1_compile/Makefile:1.7 Sun Jan 29 22:16:51 2017
+++ src/tools/asn1_compile/Makefile Mon Jan 30 02:38:50 2017
@@ -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"
Index: src/tools/compile_et/Makefile
diff -u src/tools/compile_et/Makefile:1.9 src/tools/compile_et/Makefile:1.10
--- src/tools/compile_et/Makefile:1.9 Sun Jan 29 22:16:51 2017
+++ src/tools/compile_et/Makefile Mon Jan 30 02:38:50 2017
@@ -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"
