No need to refer to LIBHX509 nor LIBHEIMNTLM since both are disabled.

ok robert@

6 files changed, 12 insertions, 12 deletions

diff --git a/kerberosV/libexec/hprop/Makefile b/kerberosV/libexec/hprop/Makefile
index d6519c44509..e310b9974d5 100644
--- a/kerberosV/libexec/hprop/Makefile
+++ b/kerberosV/libexec/hprop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2013/07/10 11:14:39 ajacoutot Exp $
 
 PROG=	hprop
 MPAGES=	hprop.8
@@ -10,7 +10,7 @@ CPPFLAGS=	-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/ntlm \
 		-I${KRB5DIR}/kdc \
 		-I${.OBJDIR}/../../lib/libkrb5
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
 LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcom_err -lheimbase -lwind
diff --git a/kerberosV/libexec/hpropd/Makefile b/kerberosV/libexec/hpropd/Makefile
index dfbb9c3775e..2a90e30e34d 100644
--- a/kerberosV/libexec/hpropd/Makefile
+++ b/kerberosV/libexec/hpropd/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2013/07/10 11:14:39 ajacoutot Exp $
 
 PROG=	hpropd
 MPAGES=	hpropd.8
 MSRC=	${KRB5DIR}/kdc
 CPPFLAGS=	-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/kdc
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
 LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcom_err -lheimbase -lwind
diff --git a/kerberosV/libexec/ipropd-master/Makefile b/kerberosV/libexec/ipropd-master/Makefile
index 919dffe31d5..975606a22c4 100644
--- a/kerberosV/libexec/ipropd-master/Makefile
+++ b/kerberosV/libexec/ipropd-master/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2013/07/10 11:14:39 ajacoutot Exp $
 
 PROG=	ipropd-master
 MPAGES=	iprop.8
@@ -6,7 +6,7 @@ MSRC=	${KRB5DIR}/lib/kadm5
 SRCS=	ipropd_common.c ipropd_master.c kadm5_err.h
 CPPFLAGS=	-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 		-I.
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
 LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcom_err -lwind -lheimbase \
diff --git a/kerberosV/libexec/ipropd-slave/Makefile b/kerberosV/libexec/ipropd-slave/Makefile
index ac58145fe36..93c165bee4d 100644
--- a/kerberosV/libexec/ipropd-slave/Makefile
+++ b/kerberosV/libexec/ipropd-slave/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2013/07/10 11:14:40 ajacoutot Exp $
 
 PROG=	ipropd-slave
 NOMAN=
 SRCS=	ipropd_common.c ipropd_slave.c kadm5_err.h
 CPPFLAGS=	-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 		-I.
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
 LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcom_err -lheimbase -lwind -lutil
diff --git a/kerberosV/libexec/kcm/Makefile b/kerberosV/libexec/kcm/Makefile
index 24752a064da..f169bc6083a 100644
--- a/kerberosV/libexec/kcm/Makefile
+++ b/kerberosV/libexec/kcm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2013/07/10 11:14:40 ajacoutot Exp $
 
 PROG=	kcm
 MPAGES=	kcm.8
@@ -20,7 +20,7 @@ SRCS=	acl.c \
 
 CPPFLAGS=	-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBHEIMNTLM} \
+DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
 	${LIBHEIMIPCS} ${LIBCRYPTO} ${LIBVERS}
 LDADD=	-lhdb -lkrb5 -lroken -lasn1 ${LIBHEIMIPCS} \
 	-lcrypto ${LIBVERS} -lwind -lcom_err -lwind \
diff --git a/kerberosV/libexec/kpasswdd/Makefile b/kerberosV/libexec/kpasswdd/Makefile
index f04a6496e1b..fa746848b5c 100644
--- a/kerberosV/libexec/kpasswdd/Makefile
+++ b/kerberosV/libexec/kpasswdd/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2013/07/10 11:14:40 ajacoutot Exp $
 
 PROG=	kpasswdd
 MPAGES=	kpasswdd.8
 MSRC=	${KRB5DIR}/kpasswd
 
 CPPFLAGS=	-I${KRB5DIR}/lib/roken -I../../lib/libhdb
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
 LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcom_err -lheimbase -lwind -lutil