Remove largescale evidence of crack-smoking.

Where a k4 applet has a k5 namesake, rename the k5 version
from k<app> to k5<app>. (Repo copy done).

Do some repairs to dependancies to support make world properly.

5 files changed, 17 insertions, 5 deletions

diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index 5a2a5a1..a8a196e 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -27,11 +27,15 @@ GEN=	asn1_APOptions.x asn1_AP_REP.x asn1_AP_REQ.x asn1_AS_REP.x \
 	asn1_TGS_REQ.x asn1_Ticket.x asn1_TicketFlags.x \
 	asn1_TransitedEncoding.x
 
+INCLUDES=asn1.h asn1_err.h 
+
 .include <bsd.lib.mk>
 
 .PATH:		${KRB5DIR}/lib/asn1
 .PATH:		${KRB5DIR}/lib/roken
 
+build-tools:	make-print-version asn1_compile
+
 beforedepend all: roken.h
 
 .for I in ${GEN}
@@ -68,7 +72,7 @@ print_version.h: make-print-version
 	./make-print-version print_version.h
 
 make-print-version: make-print-version.c
-	${CC} ${CFLAGS} -o ${.TARGET} ${.OODATE}
+	${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}
 
 CLEANFILES+=	${GEN} asn1_compile lex.o parse.o parse.c parse.h \
 		hdb_asn1.h make-print-version print_version.h print_version.o
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index a826231..354239e 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -19,6 +19,8 @@ GEN=	asn1_Key.x asn1_Event.x asn1_HDBFlags.x asn1_hdb_entry.x asn1_Salt.x
 .PATH:	${KRB5DIR}/lib/asn1
 .PATH:	${KRB5DIR}/lib/roken
 
+build-tools:	make-print-version asn1_compile
+
 .for I in ${GEN}
 ${I:S/.x/.c/}:  ${I}
 	cmp -s ${.OODATE} ${.TARGET} 2> /dev/null || cp ${.OODATE} ${.TARGET}
@@ -51,7 +53,7 @@ print_version.h: make-print-version
 	./make-print-version print_version.h
 
 make-print-version: make-print-version.c
-	${CC} ${CFLAGS} -o ${.TARGET} ${.OODATE}
+	${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}
 
 CLEANFILES+=	${GEN} asn1_compile lex.o parse.o parse.c parse.h \
 		hdb_asn1.h make-print-version print_version.h print_version.o
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index a12819c..59469d8 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -30,7 +30,9 @@ SRCS=	add_et_list.c addr_families.c address.c aname_to_localname.c \
 	verify_init.c verify_user.c version.c warn.c write_message.c \
 	krb5_err.c krb5_err.h heim_err.c heim_err.h \
 	rc4_enc.c rc4_skey.c
-INCLUDES=krb5.h
+
+INCLUDES=${KRB5DIR}/lib/krb5/krb5.h ${.CURDIR}/../../include/krb5-types.h \
+	${KRB5DIR}/lib/krb5/krb5-protos.h heim_err.h krb5_err.h 
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index 8430907..849d701 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -25,12 +25,12 @@ beforedepend all:	print_version.h
 
 .PATH:		${KRB5DIR}/lib/roken
 
-build-tools:	make-print-version
+build-tools:	make-print-version make-roken
 
 print_version.h: make-print-version
 	./make-print-version print_version.h
 
 make-print-version: make-print-version.c
-	${CC} ${CFLAGS} -o ${.TARGET} ${.OODATE}
+	${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}
 
 CLEANFILES+=	make-print-version print_version.h
diff --git a/kerberos5/lib/libsl/Makefile b/kerberos5/lib/libsl/Makefile
index 0bcd739..f976548 100644
--- a/kerberos5/lib/libsl/Makefile
+++ b/kerberos5/lib/libsl/Makefile
@@ -11,6 +11,10 @@ NOPIC=	yes
 
 install:
 
+beforeinstall:
+
 .include <bsd.lib.mk>
 
 .PATH:	${KRB5DIR}/lib/sl
+
+build-tools:	make-roken