summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Insulander <hin@cvs.openbsd.org>2001-06-22 16:12:20 +0000
committerHans Insulander <hin@cvs.openbsd.org>2001-06-22 16:12:20 +0000
commit2d14c1d3feeb5354b07eb111fa31908c9bbf3591 (patch)
tree59f67e151c42d5022808143fa7c1ef8c73d06840
parent130c7728d25bfdcb949f255c03d133c7a2413f96 (diff)
Fix linking now that libkrb5 doesn't link against other libraries.
-rw-r--r--kerberosV/libexec/kdc/Makefile4
-rw-r--r--kerberosV/usr.bin/kauth/Makefile4
-rw-r--r--kerberosV/usr.bin/kdestroy/Makefile4
-rw-r--r--kerberosV/usr.bin/kinit/Makefile4
-rw-r--r--kerberosV/usr.bin/klist/Makefile4
-rw-r--r--kerberosV/usr.sbin/kadmin/Makefile4
-rw-r--r--kerberosV/usr.sbin/ktutil/Makefile4
7 files changed, 14 insertions, 14 deletions
diff --git a/kerberosV/libexec/kdc/Makefile b/kerberosV/libexec/kdc/Makefile
index 5acb8ab9b8e..31babb70704 100644
--- a/kerberosV/libexec/kdc/Makefile
+++ b/kerberosV/libexec/kdc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2001/05/25 08:53:40 hin Exp $
+# $OpenBSD: Makefile,v 1.3 2001/06/22 16:12:17 hin Exp $
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
@@ -19,6 +19,6 @@ SRCS= 524.c \
.PATH: ${KRB5SRC}/kdc
CFLAGS+=-I${KRB5SRC}/lib/krb5
-LDADD+= ${LIBROKEN} -lhdb -lkrb5 -lkrb -ldes
+LDADD+= -lhdb -lkrb5 -lkrb -ldes ${LIBROKEN} -lasn1 -lcrypto
.include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kauth/Makefile b/kerberosV/usr.bin/kauth/Makefile
index 56b51c4ebdd..e57f064bbd0 100644
--- a/kerberosV/usr.bin/kauth/Makefile
+++ b/kerberosV/usr.bin/kauth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2001/05/25 08:20:33 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2001/06/22 16:12:17 hin Exp $
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
@@ -10,6 +10,6 @@ SRCS= kinit.c kauth_options.c
.PATH: ${KRB5SRC}/kuser
-LDADD+= ${LIBROKEN} -lkrb5 -ldes -lkafs -l45 -lkrb -lkafs5
+LDADD+= -lkrb5 -ldes -lkafs -l45 -lkrb ${LIBROKEN} -lasn1 -lcrypto
.include <bsd.prog.mk> \ No newline at end of file
diff --git a/kerberosV/usr.bin/kdestroy/Makefile b/kerberosV/usr.bin/kdestroy/Makefile
index 66d41e54638..89ce4a2845e 100644
--- a/kerberosV/usr.bin/kdestroy/Makefile
+++ b/kerberosV/usr.bin/kdestroy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2001/05/25 08:20:33 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2001/06/22 16:12:18 hin Exp $
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
@@ -9,6 +9,6 @@ SRCS= kdestroy.c
.PATH: ${KRB5SRC}/kuser
-LDADD+= ${LIBROKEN} -lkrb5 -ldes -lkafs -lkrb
+LDADD+= -lkrb5 -ldes -lkafs -lkrb -lasn1 -lcrypto ${LIBROKEN}
.include <bsd.prog.mk> \ No newline at end of file
diff --git a/kerberosV/usr.bin/kinit/Makefile b/kerberosV/usr.bin/kinit/Makefile
index 4bbdf799bb0..17c525d7842 100644
--- a/kerberosV/usr.bin/kinit/Makefile
+++ b/kerberosV/usr.bin/kinit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2001/05/25 08:20:34 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2001/06/22 16:12:18 hin Exp $
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
@@ -9,6 +9,6 @@ SRCS= kinit.c kinit_options.c
.PATH: ${KRB5SRC}/kuser
-LDADD+= ${LIBROKEN} -lkrb5 -ldes -lkafs -l45 -lkrb -lkafs5
+LDADD+= -lkrb5 -ldes -lkafs -l45 -lkrb -lkafs ${LIBROKEN} -lasn1 -lcrypto
.include <bsd.prog.mk> \ No newline at end of file
diff --git a/kerberosV/usr.bin/klist/Makefile b/kerberosV/usr.bin/klist/Makefile
index 37dcbf20dbd..7f252bc81b5 100644
--- a/kerberosV/usr.bin/klist/Makefile
+++ b/kerberosV/usr.bin/klist/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2001/05/25 08:20:34 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2001/06/22 16:12:19 hin Exp $
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
@@ -10,6 +10,6 @@ SRCS= klist.c
.PATH: ${KRB5SRC}/kuser
CFLAGS+=-I${KRB5SRC}/lib/roken
-LDADD+= -lkrb5 -ldes -lkafs -lkrb ${LIBROKEN}
+LDADD+= -lkrb5 -ldes -lkafs -lkrb ${LIBROKEN} -lasn1 -lcrypto
.include <bsd.prog.mk> \ No newline at end of file
diff --git a/kerberosV/usr.sbin/kadmin/Makefile b/kerberosV/usr.sbin/kadmin/Makefile
index ddecf3066dd..e86d2fc493e 100644
--- a/kerberosV/usr.sbin/kadmin/Makefile
+++ b/kerberosV/usr.sbin/kadmin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2001/05/25 08:21:12 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2001/06/22 16:12:19 hin Exp $
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
@@ -26,6 +26,6 @@ SRCS= ank.c \
.PATH: ${KRB5SRC}/kadmin
CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
LDADD+= ${LIBSL} -lreadline -lcurses -lkrb -ldes -lhdb \
- -lkrb5 -lkadm5srv -lkadm5clnt ${LIBROKEN}
+ -lkadm5srv -lkadm5clnt -lkrb5 ${LIBROKEN} -lasn1 -lcrypto
.include <bsd.prog.mk>
diff --git a/kerberosV/usr.sbin/ktutil/Makefile b/kerberosV/usr.sbin/ktutil/Makefile
index 1a2ef0a1889..57a26be1b2c 100644
--- a/kerberosV/usr.sbin/ktutil/Makefile
+++ b/kerberosV/usr.sbin/ktutil/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2001/05/25 08:21:13 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2001/06/22 16:12:19 hin Exp $
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
@@ -11,6 +11,6 @@ SRCS= add.c change.c copy.c get.c ktutil.c list.c purge.c remove.c
.PATH: ${KRB5SRC}/admin
CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
LDADD+= ${LIBSL} -lreadline -lcurses -lkrb -ldes -lhdb \
- -lkrb5 -lkadm5srv -lkadm5clnt ${LIBROKEN} -lasn1 -lhdb
+ -lkadm5srv -lkadm5clnt -lhdb -lkrb5 ${LIBROKEN} -lasn1 -lcrypto
.include <bsd.prog.mk>