order libraries sensibly for static architectures

13 files changed, 26 insertions, 26 deletions

diff --git a/kerberosIV/libexec/kadmind/Makefile b/kerberosIV/libexec/kadmind/Makefile
index 31cb93a08ae..a3449543cf0 100644
--- a/kerberosIV/libexec/kadmind/Makefile
+++ b/kerberosIV/libexec/kadmind/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:27 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2000/03/01 08:54:59 deraadt Exp $
 
 PROG	= kadmind
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/kadmin
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/acl
-LDADD	+= ${LIBROKEN} -lkrb -lkdb -lkadm -ldes -lacl -lcom_err
+LDADD	+= ${LIBROKEN} -lacl -lkdb -lkadm -lkrb -ldes -lcom_err
 
 SRCS	= kadm_server.c kadm_funcs.c admin_server.c kadm_ser_wrap.c pw_check.c
 
diff --git a/kerberosIV/libexec/kauthd/Makefile b/kerberosIV/libexec/kauthd/Makefile
index 413d7c4777a..7acb8b496d1 100644
--- a/kerberosIV/libexec/kauthd/Makefile
+++ b/kerberosIV/libexec/kauthd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:27 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2000/03/01 08:55:00 deraadt Exp $
 
 PROG	= kauthd
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/appl/kauth
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/acl
-LDADD	+= ${LIBROKEN} -lkrb -lkafs -ldes
+LDADD	+= ${LIBROKEN} -lkafs -lkrb -ldes
 
 SRCS	= kauthd.c marshall.c encdata.c
 
diff --git a/kerberosIV/libexec/kerberos/Makefile b/kerberosIV/libexec/kerberos/Makefile
index 80a2e195c6c..165233dc9e9 100644
--- a/kerberosIV/libexec/kerberos/Makefile
+++ b/kerberosIV/libexec/kerberos/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:28 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2000/03/01 08:55:01 deraadt Exp $
 
 PROG	= kerberos
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/server
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/acl -I${KRBSRC}/lib/kdb
-LDADD	+= ${LIBROKEN} -lkrb -lkafs -ldes -lkdb
+LDADD	+= ${LIBROKEN} -lkafs -lkdb -lkrb -ldes
 
 SRCS	= kerberos.c
 
diff --git a/kerberosIV/libexec/kpropd/Makefile b/kerberosIV/libexec/kpropd/Makefile
index 14533a2fd6f..8b714cc74de 100644
--- a/kerberosIV/libexec/kpropd/Makefile
+++ b/kerberosIV/libexec/kpropd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:28 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2000/03/01 08:55:01 deraadt Exp $
 
 PROG	= kpropd
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/slave
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/acl -I${KRBSRC}/lib/kdb
-LDADD	+= ${LIBROKEN} -lkrb -lkadm -lkdb -ldes
+LDADD	+= ${LIBROKEN} -lkadm -lkdb -lkrb -ldes
 
 SRCS	= kpropd.c
 
diff --git a/kerberosIV/usr.bin/afslog/Makefile b/kerberosIV/usr.bin/afslog/Makefile
index 700327c50c3..a56940c1fe3 100644
--- a/kerberosIV/usr.bin/afslog/Makefile
+++ b/kerberosIV/usr.bin/afslog/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:29 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2000/03/01 08:55:06 deraadt Exp $
 
 PROG	= afslog
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/appl/afsutil
 
 CFLAGS	+= -I.
-LDADD	+= ${LIBROKEN} -lkrb -lkafs -ldes
+LDADD	+= ${LIBROKEN} -lkafs -lkrb -ldes
 
 SRCS	= aklog.c
 
diff --git a/kerberosIV/usr.sbin/ext_srvtab/Makefile b/kerberosIV/usr.sbin/ext_srvtab/Makefile
index 5a5361dad7f..1968596afe2 100644
--- a/kerberosIV/usr.sbin/ext_srvtab/Makefile
+++ b/kerberosIV/usr.sbin/ext_srvtab/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:32 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2000/03/01 08:55:07 deraadt Exp $
 
 PROG	= ext_srvtab
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/admin
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb
-LDADD	+= ${LIBROKEN} -lkrb -lkafs -ldes -lkdb
+LDADD	+= ${LIBROKEN} -lkafs -lkdb -lkrb -ldes
 
 SRCS	= ext_srvtab.c
 
diff --git a/kerberosIV/usr.sbin/kadmin/Makefile b/kerberosIV/usr.sbin/kadmin/Makefile
index 8a9bbd0e7e8..0ef58f5d962 100644
--- a/kerberosIV/usr.sbin/kadmin/Makefile
+++ b/kerberosIV/usr.sbin/kadmin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:32 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2000/03/01 08:55:07 deraadt Exp $
 
 PROG	= kadmin
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/kadmin ${KRBSRC}/lib/sl
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/acl -I${KRBSRC}/lib/krb
-LDADD	+= ${LIBROKEN} -lkrb -lkafs -ldes -lkadm -lcom_err -lreadline -lcurses
+LDADD	+= ${LIBROKEN} -lkafs -lkadm -lkrb -ldes -lcom_err -lreadline -lcurses
 
 SRCS	= kadmin.c random_password.c new_pwd.c sl.c
 
diff --git a/kerberosIV/usr.sbin/kdb_edit/Makefile b/kerberosIV/usr.sbin/kdb_edit/Makefile
index 609c7c3239b..63b58e1d70f 100644
--- a/kerberosIV/usr.sbin/kdb_edit/Makefile
+++ b/kerberosIV/usr.sbin/kdb_edit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:33 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2000/03/01 08:55:08 deraadt Exp $
 
 PROG	= kdb_edit
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/admin
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb
-LDADD	+= ${LIBROKEN} -lkrb -lkafs -ldes -lkdb
+LDADD	+= ${LIBROKEN} -lkafs -lkdb -lkrb -ldes
 
 SRCS	= kdb_edit.c
 
diff --git a/kerberosIV/usr.sbin/kdb_init/Makefile b/kerberosIV/usr.sbin/kdb_init/Makefile
index 69a03452356..928eb847432 100644
--- a/kerberosIV/usr.sbin/kdb_init/Makefile
+++ b/kerberosIV/usr.sbin/kdb_init/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:34 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2000/03/01 08:55:08 deraadt Exp $
 
 PROG	= kdb_init
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/admin
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb
-LDADD	+= ${LIBROKEN} -lkrb -lkafs -ldes -lkdb
+LDADD	+= ${LIBROKEN} -lkafs -lkdb -ldes -lkrb
 
 SRCS	= kdb_init.c
 
diff --git a/kerberosIV/usr.sbin/kdb_util/Makefile b/kerberosIV/usr.sbin/kdb_util/Makefile
index 0d67995594b..737d3f9a2a2 100644
--- a/kerberosIV/usr.sbin/kdb_util/Makefile
+++ b/kerberosIV/usr.sbin/kdb_util/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:34 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2000/03/01 08:55:09 deraadt Exp $
 
 PROG	= kdb_util
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/admin
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb
-LDADD	+= ${LIBROKEN} -lkrb -lkafs -ldes -lkdb
+LDADD	+= ${LIBROKEN} -lkafs -lkdb -lkrb -ldes
 
 SRCS	= kdb_util.c
 
diff --git a/kerberosIV/usr.sbin/kprop/Makefile b/kerberosIV/usr.sbin/kprop/Makefile
index 4a5133d7019..b5465919231 100644
--- a/kerberosIV/usr.sbin/kprop/Makefile
+++ b/kerberosIV/usr.sbin/kprop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:34 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2000/03/01 08:55:09 deraadt Exp $
 
 PROG	= kprop
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/slave ${KRBSRC}/lib/sl
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/krb -I${KRBSRC}/lib/kdb
-LDADD	+= ${LIBROKEN} -lkrb -lkafs -ldes -lkadm -lcom_err -lkdb -lacl
+LDADD	+= ${LIBROKEN} -lkafs -lkdb -lkadm -lkrb -ldes -lcom_err -lacl
 
 SRCS	= kprop.c
 
diff --git a/kerberosIV/usr.sbin/ksrvutil/Makefile b/kerberosIV/usr.sbin/ksrvutil/Makefile
index 859aed1d63b..443fd79a470 100644
--- a/kerberosIV/usr.sbin/ksrvutil/Makefile
+++ b/kerberosIV/usr.sbin/ksrvutil/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:35 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2000/03/01 08:55:10 deraadt Exp $
 
 PROG	= ksrvutil
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/kadmin
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/krb
-LDADD	+= ${LIBROKEN} -lkrb -lkafs -ldes -lkdb -lkadm -lcom_err
+LDADD	+= ${LIBROKEN} -lkafs -lkdb -lkadm -lkrb -ldes -lcom_err
 
 SRCS	= ksrvutil.c ksrvutil_get.c
 
diff --git a/kerberosIV/usr.sbin/kstash/Makefile b/kerberosIV/usr.sbin/kstash/Makefile
index ccc341a4b8e..815e1e8f3bc 100644
--- a/kerberosIV/usr.sbin/kstash/Makefile
+++ b/kerberosIV/usr.sbin/kstash/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:35 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2000/03/01 08:55:10 deraadt Exp $
 
 PROG	= kstash
 
@@ -8,7 +8,7 @@ KRBDEPTH=../..
 .PATH:	${KRBSRC}/admin
 
 CFLAGS	+= -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb
-LDADD	+= ${LIBROKEN} -lkrb -lkafs -ldes -lkdb
+LDADD	+= ${LIBROKEN} -lkafs -lkdb -lkrb -ldes
 
 SRCS	= kstash.c