Don't link with unneeded kerberos libraries

12 files changed, 29 insertions, 29 deletions

diff --git a/kerberosV/libexec/hprop/Makefile b/kerberosV/libexec/hprop/Makefile
index 9f353be5e0b..c401f6f3597 100644
--- a/kerberosV/libexec/hprop/Makefile
+++ b/kerberosV/libexec/hprop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2003/05/17 01:31:21 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -12,7 +12,7 @@ SRCS=	hprop.c mit_dump.c v4_dump.c hprop.h kadb.h
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
 DPADD+= ${LIBHDB} ${LIBKADM5SRV} ${LIBKDB} ${LIBKRB} ${LIBKDB} ${LIBASN1} \
 	${LIBCOM_ERR} ${LIBKAFS} ${LIBDES} ${LIBCRYPTO}
-LDADD+=	-lhdb -lkadm5srv -lkrb5 -lkdb -lkrb -lkdb ${LIBROKEN} -lasn1 \
-	-lcom_err -lkafs -ldes -lcrypto
+LDADD+=	-lhdb -lkadm5srv -lkrb5 ${LIBROKEN} -lasn1 \
+	-lcom_err -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/libexec/hpropd/Makefile b/kerberosV/libexec/hpropd/Makefile
index 44b215a1098..19903fc96c2 100644
--- a/kerberosV/libexec/hpropd/Makefile
+++ b/kerberosV/libexec/hpropd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2003/05/17 01:31:21 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -12,7 +12,7 @@ SRCS=	hpropd.c
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
 DPADD+= ${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBKDB} ${LIBKRB} ${LIBASN1} \
 	${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBDES}
-LDADD+=	-lhdb -lkadm5srv -lkrb5 -lkdb -lkrb -lkdb ${LIBROKEN} -lasn1 -lcrypto \
-	-lcom_err -lkafs -ldes
+LDADD+=	-lhdb -lkadm5srv -lkrb5 ${LIBROKEN} -lasn1 -lcrypto \
+	-lcom_err -ldes
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/libexec/ipropd-master/Makefile b/kerberosV/libexec/ipropd-master/Makefile
index 042ad6c349d..771db7aec2a 100644
--- a/kerberosV/libexec/ipropd-master/Makefile
+++ b/kerberosV/libexec/ipropd-master/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2003/05/17 01:31:21 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -13,7 +13,7 @@ NOMAN=
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
 DPADD+= ${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBKRB} ${LIBKDB} ${LIBASN1} \
 	${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBUTIL} ${LIBDES}
-LDADD+=	-lhdb -lkadm5srv -lkrb5 -lkrb -lkdb ${LIBROKEN} -lasn1 -lcrypto \
-	-lcom_err -lhdb -lkafs -lutil -ldes
+LDADD+=	-lhdb -lkadm5srv -lkrb5 ${LIBROKEN} -lasn1 -lcrypto \
+	-lcom_err -lhdb -lutil -ldes
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/libexec/ipropd-slave/Makefile b/kerberosV/libexec/ipropd-slave/Makefile
index 438a3ea00a8..e26753c4e7f 100644
--- a/kerberosV/libexec/ipropd-slave/Makefile
+++ b/kerberosV/libexec/ipropd-slave/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2003/05/17 01:31:21 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -13,7 +13,7 @@ NOMAN=
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
 DPADD+= ${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBKRB} ${LIBKDB} ${LIBASN1} \
 	${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBUTIL} ${LIBDES}
-LDADD+=	-lhdb -lkadm5srv -lkrb5 -lkrb -lkdb ${LIBROKEN} -lasn1 -lcrypto \
-	-lcom_err -lhdb -lkafs -lutil -ldes
+LDADD+=	-lhdb -lkadm5srv -lkrb5 ${LIBROKEN} -lasn1 -lcrypto \
+	-lcom_err -lhdb -lutil -ldes
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/libexec/kfd/Makefile b/kerberosV/libexec/kfd/Makefile
index 6157c977732..0ff020f88b0 100644
--- a/kerberosV/libexec/kfd/Makefile
+++ b/kerberosV/libexec/kfd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2003/05/17 01:31:21 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -12,6 +12,6 @@ SRCS=	kfd.c
 CFLAGS+=-I${KRB5SRC}/lib/krb5
 DPADD+=	${LIBHDB} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBASN1} ${LIBCRYPTO} \
 	${LIBCOM_ERR} ${LIBKAFS}
-LDADD+=	-lhdb -lkrb5 -lkrb -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err -lkafs
+LDADD+=	-lhdb -lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/libexec/kpasswdd/Makefile b/kerberosV/libexec/kpasswdd/Makefile
index c1ca4ce5e6d..dd4c66d3c59 100644
--- a/kerberosV/libexec/kpasswdd/Makefile
+++ b/kerberosV/libexec/kpasswdd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2003/05/17 01:31:21 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -10,7 +10,7 @@ MAN=	${PROG}.8
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
 DPADD+=	${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBASN1} \
 	${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBUTIL}
-LDADD+=	-lhdb -lkadm5srv -lkrb5 -lkrb -ldes ${LIBROKEN} -lasn1 -lcrypto \
-	-lcom_err -lkafs -lutil
+LDADD+=	-lhdb -lkadm5srv -lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto \
+	-lcom_err -lutil
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/afslog/Makefile b/kerberosV/usr.bin/afslog/Makefile
index 11e56a9a8c2..b12fd2abe37 100644
--- a/kerberosV/usr.bin/afslog/Makefile
+++ b/kerberosV/usr.bin/afslog/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2002/06/11 15:26:49 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2003/05/17 01:31:21 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -9,6 +9,6 @@ PROG	= afslog
 
 CFLAGS	+= -I.
 DPADD	+= ${LIBKAFS} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBCRYPTO} ${LIBASN1}
-LDADD	+= -lkafs -lkrb5 -lkrb -ldes -lcrypto -lasn1 ${LIBROKEN} -lcom_err
+LDADD	+= -lkrb5 -ldes -lcrypto -lasn1 ${LIBROKEN} -lcom_err
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kdestroy/Makefile b/kerberosV/usr.bin/kdestroy/Makefile
index 1fe3dd50d89..baf4c241e3e 100644
--- a/kerberosV/usr.bin/kdestroy/Makefile
+++ b/kerberosV/usr.bin/kdestroy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2003/05/17 01:31:21 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -11,6 +11,6 @@ SRCS=	kdestroy.c
 
 DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
 	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes -lkafs -lkrb -lasn1 -lcrypto ${LIBROKEN} -lcom_err
+LDADD+=	-lkrb5 -ldes -lasn1 -lcrypto ${LIBROKEN} -lcom_err
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/klist/Makefile b/kerberosV/usr.bin/klist/Makefile
index 47683a6721c..50a0260088c 100644
--- a/kerberosV/usr.bin/klist/Makefile
+++ b/kerberosV/usr.bin/klist/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2003/05/17 01:31:21 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -12,6 +12,6 @@ SRCS=	klist.c
 CFLAGS+=-I${KRB5SRC}/lib/roken
 DPADD+=	${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
 	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes -lkafs -lkrb ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/pagsh/Makefile b/kerberosV/usr.bin/pagsh/Makefile
index ffee049df29..50cbdcd8c1b 100644
--- a/kerberosV/usr.bin/pagsh/Makefile
+++ b/kerberosV/usr.bin/pagsh/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2002/06/11 15:30:16 hin Exp $
+# $OpenBSD: Makefile,v 1.5 2003/05/17 01:31:21 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -10,6 +10,6 @@ PROG=	pagsh
 CFLAGS+=-I${KRB5SRC}/lib/roken
 DPADD+=	${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
 	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes -lkafs -lkrb ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/string2key/Makefile b/kerberosV/usr.bin/string2key/Makefile
index 60db0a82632..22cf14cea96 100644
--- a/kerberosV/usr.bin/string2key/Makefile
+++ b/kerberosV/usr.bin/string2key/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2003/05/17 01:31:21 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -11,6 +11,6 @@ MAN=	${PROG}.8
 CFLAGS+=-I${KRB5SRC}/kdc -I${KRB5SRC}/lib/krb5
 DPADD+=	${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
 	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes -lkafs -lkrb ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/verify_krb5_conf/Makefile b/kerberosV/usr.bin/verify_krb5_conf/Makefile
index d8ec5c22e2e..9e14af9ee22 100644
--- a/kerberosV/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberosV/usr.bin/verify_krb5_conf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2003/05/17 01:31:21 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -11,6 +11,6 @@ MAN=	${PROG}.8
 CFLAGS+=-I${KRB5SRC}/lib/roken
 DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
 	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes -lkafs -lkrb ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
 
 .include <bsd.prog.mk>