update build infrastructure for heimdal 0.3e

9 files changed, 54 insertions, 19 deletions

diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index 3764002..12f5958 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		hprop
-SRCS=		hprop.c hprop-common.c hdb_err.h
+SRCS=		hprop.c mit_dump.c v4_dump.c hprop.h kadb.h hdb_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/krb5 \
@@ -18,7 +18,9 @@ _krb4libs=	-lkrb -lkafs -lkdb
 _krb4deps=	${LIBKRB} ${LIBKAFS} ${LIBKDB}
 .endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-		-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \
+		-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
+		-L${VERSOBJDIR} -lvers \
+		${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
 DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
 		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index 987ff09..7035805 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		hpropd
-SRCS=		hpropd.c hprop-common.c hdb_err.h
+SRCS=		hpropd.c hprop.h hdb_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/krb5 \
@@ -18,7 +18,9 @@ _krb4libs=	-lkrb -lkafs -lkdb
 _krb4deps=	${LIBKRB} ${LIBKAFS} ${LIBKDB}
 .endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
-		-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \
+		-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
+		-L${VERSOBJDIR} -lvers \
+		${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
 DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
 		${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile
index c5ea728..c692972 100644
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		ipropd-master
-SRCS=		ipropd_master.c kadm5_err.h
+SRCS=		ipropd_master.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/kadm5 \
 		-I${KRB5DIR}/lib/krb5 \
@@ -18,7 +18,9 @@ _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
-		-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \
+		-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
+		-L${VERSOBJDIR} -lvers \
+		${_krb4libs} \
 		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
 DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index 8b52ece..b7220ae 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		ipropd-slave
-SRCS=		ipropd_slave.c kadm5_err.h
+SRCS=		ipropd_slave.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/kadm5 \
 		-I${KRB5DIR}/lib/krb5 \
@@ -18,7 +18,9 @@ _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
-		-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \
+		-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
+		-L${VERSOBJDIR} -lvers \
+		${_krb4libs} \
 		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
 DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
diff --git a/kerberos5/libexec/k5admind/Makefile b/kerberos5/libexec/k5admind/Makefile
index 42c716e..fe56f8d 100644
--- a/kerberos5/libexec/k5admind/Makefile
+++ b/kerberos5/libexec/k5admind/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		k5admind
-SRCS=		kadmind.c server.c \
+SRCS=		kadmind.c server.c kadm_conn.c \
 		kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
@@ -9,6 +9,7 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/hdb \
 		-I${KRB5DIR}/lib/sl \
+		-I${KRB5DIR}/lib/kadm5 \
 		-I${KRB5DIR}/kadmin \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
@@ -20,7 +21,9 @@ _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
-		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
+		-L${ROKENOBJDIR} -lroken \
+		-L${VERSOBJDIR} -lvers \
+		${_krb4libs} \
 		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
 		-L${HDBOBJDIR} -lhdb \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
diff --git a/kerberos5/libexec/k5passwdd/Makefile b/kerberos5/libexec/k5passwdd/Makefile
index 8c0cba5..e47296f 100644
--- a/kerberos5/libexec/k5passwdd/Makefile
+++ b/kerberos5/libexec/k5passwdd/Makefile
@@ -1,12 +1,14 @@
 # $FreeBSD$
 
 PROG=		k5passwdd
-SRCS=		kpasswdd.c krb5_err.h heim_err.h hdb_err.h kadm5/admin.h 
+SRCS=		kpasswdd.c krb5_err.h heim_err.h hdb_err.h \
+		kadm5/admin.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/hdb \
 		-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/roken \
+		-I${KRB5DIR}/lib/kadm5 \
 		-I${KRB5DIR}/kpasswd \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
@@ -16,7 +18,9 @@ CFLAGS+=	-I${KRB5DIR}/include \
 _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
+LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \
+		-L${VERSOBJDIR} -lvers \
+		${_krb4libs} \
 		-L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
 DPADD=		${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index 42c716e..fe56f8d 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		k5admind
-SRCS=		kadmind.c server.c \
+SRCS=		kadmind.c server.c kadm_conn.c \
 		kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
@@ -9,6 +9,7 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/hdb \
 		-I${KRB5DIR}/lib/sl \
+		-I${KRB5DIR}/lib/kadm5 \
 		-I${KRB5DIR}/kadmin \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
@@ -20,7 +21,9 @@ _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
-		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
+		-L${ROKENOBJDIR} -lroken \
+		-L${VERSOBJDIR} -lvers \
+		${_krb4libs} \
 		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
 		-L${HDBOBJDIR} -lhdb \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index 6b28dbe..eb13324 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -1,8 +1,19 @@
 # $FreeBSD$
 
 PROG=		kdc
-SRCS=		524.c config.c connect.c kaserver.c kerberos4.c kerberos5.c \
-		log.c main.c misc.c
+SRCS=		\
+	524.c		\
+	config.c	\
+	connect.c	\
+	kaserver.c	\
+	kdc_locl.h	\
+	kerberos4.c	\
+	kerberos5.c	\
+	log.c		\
+	main.c		\
+	misc.c		\
+	rx.h
+
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/krb5 \
@@ -19,7 +30,9 @@ _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
-		-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \
+		-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
+		-L${VERSOBJDIR} -lvers \
+		${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
 DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
 		${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index 8c0cba5..e47296f 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -1,12 +1,14 @@
 # $FreeBSD$
 
 PROG=		k5passwdd
-SRCS=		kpasswdd.c krb5_err.h heim_err.h hdb_err.h kadm5/admin.h 
+SRCS=		kpasswdd.c krb5_err.h heim_err.h hdb_err.h \
+		kadm5/admin.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/hdb \
 		-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/roken \
+		-I${KRB5DIR}/lib/kadm5 \
 		-I${KRB5DIR}/kpasswd \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
@@ -16,7 +18,9 @@ CFLAGS+=	-I${KRB5DIR}/include \
 _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
+LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \
+		-L${VERSOBJDIR} -lvers \
+		${_krb4libs} \
 		-L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
 DPADD=		${LIBKRB5} ${LIBROKEN} ${_krb4deps} \