Stuff in kerberosIV should _never_ link against kerberosV.

While I'm here, cleanup linking stuff so this gets through a static build
on i386. Other archs untested at this time.

6 files changed, 12 insertions, 12 deletions

diff --git a/kerberosIV/usr.sbin/ext_srvtab/Makefile b/kerberosIV/usr.sbin/ext_srvtab/Makefile
index a0bd97d43b7..bcf9b89a2e2 100644
--- a/kerberosIV/usr.sbin/ext_srvtab/Makefile
+++ b/kerberosIV/usr.sbin/ext_srvtab/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/07/01 21:47:14 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2001/07/09 09:44:30 hin Exp $
 
 PROG	= ext_srvtab
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/admin
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb
-LDADD	+= -lkafs -lkrb5 -lkrb -lkdb -ldes -lcrypto -lasn1 ${LIBROKEN}
+LDADD	+= ${LIBROKEN} -lkafs -lkdb -lkrb -lcrypto
 
 SRCS	= ext_srvtab.c
 
diff --git a/kerberosIV/usr.sbin/kdb_destroy/Makefile b/kerberosIV/usr.sbin/kdb_destroy/Makefile
index cb6a0d13e17..2d107f3ce5b 100644
--- a/kerberosIV/usr.sbin/kdb_destroy/Makefile
+++ b/kerberosIV/usr.sbin/kdb_destroy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2001/07/01 21:47:15 deraadt Exp $
+# $OpenBSD: Makefile,v 1.4 2001/07/09 09:44:30 hin Exp $
 
 PROG	= kdb_destroy
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/admin
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb
-LDADD	+= -lkafs -lkrb5 -lkrb -lkdb -ldes -lcrypto -lasn1 ${LIBROKEN}
+LDADD	+= ${LIBROKEN}
 
 SRCS	= kdb_destroy.c
 
diff --git a/kerberosIV/usr.sbin/kdb_init/Makefile b/kerberosIV/usr.sbin/kdb_init/Makefile
index e308709c0f4..bdd8d591602 100644
--- a/kerberosIV/usr.sbin/kdb_init/Makefile
+++ b/kerberosIV/usr.sbin/kdb_init/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/07/01 21:47:17 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2001/07/09 09:44:30 hin Exp $
 
 PROG	= kdb_init
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/admin
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb
-LDADD	+= -lkafs -lkrb5 -lkrb -lkdb -ldes -lcrypto -lasn1 ${LIBROKEN}
+LDADD	+= ${LIBROKEN} -lkafs -lkdb -lkrb -lcrypto
 
 SRCS	= kdb_init.c
 
diff --git a/kerberosIV/usr.sbin/kdb_util/Makefile b/kerberosIV/usr.sbin/kdb_util/Makefile
index 9b07f58d2f5..510950c7052 100644
--- a/kerberosIV/usr.sbin/kdb_util/Makefile
+++ b/kerberosIV/usr.sbin/kdb_util/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/07/01 21:47:18 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2001/07/09 09:44:30 hin Exp $
 
 PROG	= kdb_util
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/admin
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb
-LDADD	+= -lkafs -lkrb5 -lkrb -lkdb -ldes -lcrypto -lasn1 ${LIBROKEN}
+LDADD	+= ${LIBROKEN} -lkafs -lkdb -lkrb -ldes
 
 SRCS	= kdb_util.c
 
diff --git a/kerberosIV/usr.sbin/ksrvutil/Makefile b/kerberosIV/usr.sbin/ksrvutil/Makefile
index b27e739d72e..b298ac13ee8 100644
--- a/kerberosIV/usr.sbin/ksrvutil/Makefile
+++ b/kerberosIV/usr.sbin/ksrvutil/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/07/01 21:47:19 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2001/07/09 09:44:31 hin Exp $
 
 PROG	= ksrvutil
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/kadmin
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/krb
-LDADD	+= -lkafs -lkrb5 -lkrb -lkdb -lkadm -ldes -lcrypto -lasn1 -lcom_err ${LIBROKEN}
+LDADD	+= ${LIBROKEN} -lkadm -lkafs -lkrb -lkdb -ldes -lcom_err
 
 SRCS	= ksrvutil.c ksrvutil_get.c
 
diff --git a/kerberosIV/usr.sbin/kstash/Makefile b/kerberosIV/usr.sbin/kstash/Makefile
index f79499e2c3c..8df99f10a33 100644
--- a/kerberosIV/usr.sbin/kstash/Makefile
+++ b/kerberosIV/usr.sbin/kstash/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/07/01 21:47:19 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2001/07/09 09:44:31 hin Exp $
 
 PROG	= kstash
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/admin
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb
-LDADD	+= -lkafs -lkrb5 -lkrb -lkdb -ldes -lcrypto -lasn1 ${LIBROKEN}
+LDADD	+= ${LIBROKEN} -lkafs -lkdb -lkrb -ldes
 
 SRCS	= kstash.c