From e2bfbbc955202a3dc60073103c768c38b6a40a33 Mon Sep 17 00:00:00 2001
From: "Justin T. Gibbs" <gibbs@FreeBSD.org>
Date: Tue, 26 Sep 1995 02:36:08 +0000
Subject: [PATCH] Add -L paths for all locally built eBones libraries.  Many of
 the programs already did this, but this catches the straglers.

---
 eBones/usr.bin/kadmin/Makefile        | 4 ++--
 eBones/usr.bin/kdestroy/Makefile      | 4 ++--
 eBones/usr.bin/kinit/Makefile         | 4 ++--
 eBones/usr.bin/klist/Makefile         | 4 ++--
 eBones/usr.bin/ksrvtgt/Makefile       | 4 ++--
 eBones/usr.bin/register/Makefile      | 4 ++--
 eBones/usr.sbin/ext_srvtab/Makefile   | 4 ++--
 eBones/usr.sbin/kadmind/Makefile      | 5 +++--
 eBones/usr.sbin/kdb_edit/Makefile     | 4 ++--
 eBones/usr.sbin/kdb_init/Makefile     | 4 ++--
 eBones/usr.sbin/kdb_util/Makefile     | 4 ++--
 eBones/usr.sbin/kerberos/Makefile     | 4 ++--
 eBones/usr.sbin/kprop/Makefile        | 4 ++--
 eBones/usr.sbin/ksrvutil/Makefile     | 5 +++--
 eBones/usr.sbin/kstash/Makefile       | 4 ++--
 eBones/usr.sbin/make_keypair/Makefile | 2 +-
 16 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/eBones/usr.bin/kadmin/Makefile b/eBones/usr.bin/kadmin/Makefile
index 7660270bb3c..4c4434f63bc 100644
--- a/eBones/usr.bin/kadmin/Makefile
+++ b/eBones/usr.bin/kadmin/Makefile
@@ -1,11 +1,11 @@
-#	$Id: Makefile,v 1.6 1995/09/14 04:05:59 gibbs Exp $
+#	$Id: Makefile,v 1.7 1995/09/14 18:16:18 gibbs Exp $
 
 PROG=	kadmin
 SRCS=	${KRBOBJDIR}/krb_err.h kadmin.c kadmin_cmds.c
 CLEANFILES+=	kadmin_cmds.c krb_err.c
 CFLAGS+=	-DPOSIX -I${.CURDIR}/../../lib/libkadm
 DPADD= ${LIBKRB} ${LIBDES}
-LDADD+=	-lkadm -lkrb -ldes
+LDADD+=	-L${KADMOBJDIR} -lkadm -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 LDADD+=	-lss -lcom_err
 MAN8=	kadmin.8
 
diff --git a/eBones/usr.bin/kdestroy/Makefile b/eBones/usr.bin/kdestroy/Makefile
index 19a157a1fb3..d61e691c84f 100644
--- a/eBones/usr.bin/kdestroy/Makefile
+++ b/eBones/usr.bin/kdestroy/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/13 17:24:09 markm Exp $
+#	$Id: Makefile,v 1.5 1995/09/14 04:06:04 gibbs Exp $
 
 PROG=	kdestroy
 CFLAGS+=-DKERBEROS -DDEBUG -DBSD42
 DPADD=	${LIBKRB} ${LIBDES}
-LDADD=	-lkrb -ldes
+LDADD=	-L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 MAN1=	kdestroy.1
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.bin/kinit/Makefile b/eBones/usr.bin/kinit/Makefile
index f17237c8e39..94549dceb4e 100644
--- a/eBones/usr.bin/kinit/Makefile
+++ b/eBones/usr.bin/kinit/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/13 17:24:10 markm Exp $
+#	$Id: Makefile,v 1.5 1995/09/14 04:06:11 gibbs Exp $
 
 PROG=	kinit
 CFLAGS+=-DKERBEROS -DDEBUG -DBSD42
 DPADD=	${LIBKRB} ${LIBDES}
-LDADD=	-lkrb -ldes
+LDADD=	-L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 MAN1=	kinit.1
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.bin/klist/Makefile b/eBones/usr.bin/klist/Makefile
index f77bf20af81..ef144105a67 100644
--- a/eBones/usr.bin/klist/Makefile
+++ b/eBones/usr.bin/klist/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/13 17:24:11 markm Exp $
+#	$Id: Makefile,v 1.5 1995/09/14 04:06:15 gibbs Exp $
 
 PROG=	klist
 CFLAGS+=-DKERBEROS -DDEBUG
 DPADD=	${LIBKRB} ${LIBDES}
-LDADD=	-lkrb -ldes
+LDADD=	-L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 MAN1=	klist.1
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.bin/ksrvtgt/Makefile b/eBones/usr.bin/ksrvtgt/Makefile
index 0fc63fd71ba..a00940d1384 100644
--- a/eBones/usr.bin/ksrvtgt/Makefile
+++ b/eBones/usr.bin/ksrvtgt/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/13 17:24:12 markm Exp $
+#	$Id: Makefile,v 1.5 1995/09/14 04:06:18 gibbs Exp $
 
 PROG=	ksrvtgt
 CFLAGS+=-DKERBEROS -DDEBUG
 DPADD=	${LIBKRB} ${LIBDES}
-LDADD=	-lkrb -ldes
+LDADD=	-L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 MAN1=	ksrvtgt.1
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.bin/register/Makefile b/eBones/usr.bin/register/Makefile
index 82a411cfc31..9e4b170386f 100644
--- a/eBones/usr.bin/register/Makefile
+++ b/eBones/usr.bin/register/Makefile
@@ -1,10 +1,10 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/1/93
-#	$Id: Makefile,v 1.4 1995/09/13 17:24:14 markm Exp $
+#	$Id: Makefile,v 1.5 1995/09/14 04:08:57 gibbs Exp $
 
 PROG=	register
 CFLAGS+=-DCRYPT -DDEBUG -DKERBEROS
 DPADD=	${LIBKRB} ${LIBDES} ${LIBCRYPT}
-LDADD=	-lkrb -ldes -lcrypt
+LDADD=	-L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes -lcrypt
 BINOWN=	root
 BINMODE=4555
 
diff --git a/eBones/usr.sbin/ext_srvtab/Makefile b/eBones/usr.sbin/ext_srvtab/Makefile
index e1ee1d512eb..0808f85a73d 100644
--- a/eBones/usr.sbin/ext_srvtab/Makefile
+++ b/eBones/usr.sbin/ext_srvtab/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/13 17:24:16 markm Exp $
+#	$Id: Makefile,v 1.5 1995/09/14 04:09:34 gibbs Exp $
 
 PROG=	ext_srvtab
 CFLAGS+=-DKERBEROS
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
-LDADD+=	-lkdb -lkrb -ldes
+LDADD+=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 MAN8=	ext_srvtab.8
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kadmind/Makefile b/eBones/usr.sbin/kadmind/Makefile
index 37222ef0025..6245776982b 100644
--- a/eBones/usr.sbin/kadmind/Makefile
+++ b/eBones/usr.sbin/kadmind/Makefile
@@ -1,10 +1,11 @@
-#	$Id: Makefile,v 1.4 1995/09/13 17:24:18 markm Exp $
+#	$Id: Makefile,v 1.5 1995/09/14 04:09:38 gibbs Exp $
 
 PROG=	kadmind
 SRCS=	admin_server.c kadm_funcs.c kadm_ser_wrap.c kadm_server.c
 CFLAGS+=-DPOSIX -I${.CURDIR}/../../lib/libkadm
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
-LDADD+=	-lkadm -lkdb -lkrb -ldes -lacl -lcom_err
+LDADD+=	-L${KADMOBJDIR} -lkadm -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \
+	-L${DESOBJDIR} -ldes -L${ACLOBJDIR} -lacl -lcom_err
 MAN8=	kadmind.8
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kdb_edit/Makefile b/eBones/usr.sbin/kdb_edit/Makefile
index 7a05577c4a8..34dd94af8a0 100644
--- a/eBones/usr.sbin/kdb_edit/Makefile
+++ b/eBones/usr.sbin/kdb_edit/Makefile
@@ -1,11 +1,11 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 2/14/91
-#	$Id: Makefile,v 1.4 1995/09/13 17:24:24 markm Exp $
+#	$Id: Makefile,v 1.5 1995/09/14 04:09:47 gibbs Exp $
 
 PROG=	kdb_edit
 CFLAGS+=-DKERBEROS -DDEBUG -I.
 SRCS=	kdb_edit.c maketime.c
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
-LDADD=	-lkdb -lkrb -ldes
+LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 MAN8=	kdb_edit.8
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kdb_init/Makefile b/eBones/usr.sbin/kdb_init/Makefile
index cc1b778013f..71447cae208 100644
--- a/eBones/usr.sbin/kdb_init/Makefile
+++ b/eBones/usr.sbin/kdb_init/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/13 17:24:25 markm Exp $
+#	$Id: Makefile,v 1.5 1995/09/14 04:09:52 gibbs Exp $
 
 PROG=	kdb_init
 CFLAGS+=-DKERBEROS -DDEBUG
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
-LDADD=	-lkdb -lkrb -ldes
+LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 MAN8=	kdb_init.8
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kdb_util/Makefile b/eBones/usr.sbin/kdb_util/Makefile
index 1f211a13484..88368dfd338 100644
--- a/eBones/usr.sbin/kdb_util/Makefile
+++ b/eBones/usr.sbin/kdb_util/Makefile
@@ -1,12 +1,12 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 2/14/91
-#	$Id: Makefile,v 1.4 1995/09/13 17:24:27 markm Exp $
+#	$Id: Makefile,v 1.5 1995/09/14 04:09:56 gibbs Exp $
 
 PROG=	kdb_util
 CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../kdb_edit
 SRCS=	kdb_util.c maketime.c
 .PATH:	${.CURDIR}/../kdb_edit
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
-LDADD=	-lkdb -lkrb -ldes
+LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 MAN8=	kdb_util.8
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kerberos/Makefile b/eBones/usr.sbin/kerberos/Makefile
index 224b3350fdb..84a12fbd367 100644
--- a/eBones/usr.sbin/kerberos/Makefile
+++ b/eBones/usr.sbin/kerberos/Makefile
@@ -1,11 +1,11 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.5 1995/09/13 17:24:28 markm Exp $
+#	$Id: Makefile,v 1.6 1995/09/14 04:10:15 gibbs Exp $
 
 PROG=	kerberos
 SRCS=	kerberos.c cr_err_reply.c
 CFLAGS+=-DKERBEROS -DDEBUG
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
-LDADD=	-lkdb -lkrb -ldes
+LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 NOMAN=	noman
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kprop/Makefile b/eBones/usr.sbin/kprop/Makefile
index d6063a6b083..c036b169970 100644
--- a/eBones/usr.sbin/kprop/Makefile
+++ b/eBones/usr.sbin/kprop/Makefile
@@ -1,9 +1,9 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/13 17:24:29 markm Exp $
+#	$Id: Makefile,v 1.5 1995/09/14 04:11:01 gibbs Exp $
 
 PROG=	kprop
 DPADD=	${LIBKRB} ${LIBDES}
-LDADD=	-lkrb -ldes
+LDADD=	-L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 NOMAN=	noman
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/ksrvutil/Makefile b/eBones/usr.sbin/ksrvutil/Makefile
index 199cf48b02d..f421aa9d2ae 100644
--- a/eBones/usr.sbin/ksrvutil/Makefile
+++ b/eBones/usr.sbin/ksrvutil/Makefile
@@ -1,10 +1,11 @@
-#	$Id: Makefile,v 1.4 1995/09/13 17:24:34 markm Exp $
+#	$Id: Makefile,v 1.5 1995/09/14 04:11:06 gibbs Exp $
 
 PROG=	ksrvutil
 SRCS=	ksrvutil.c
 CFLAGS+=	-I${.CURDIR}/../../lib/libkadm
 DPADD=	${LIBKRB} ${LIBDES}
-LDADD+=	-lkadm -lkrb -ldes -lcom_err
+LDADD+=	-L${KADMOBJDIR} -lkadm -L${KRBOBJDIR} -lkrb \
+	-L${DESOBJDIR} -ldes -lcom_err
 MAN8=	ksrvutil.8
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kstash/Makefile b/eBones/usr.sbin/kstash/Makefile
index cf97f8cedab..5043cf3bdb8 100644
--- a/eBones/usr.sbin/kstash/Makefile
+++ b/eBones/usr.sbin/kstash/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 3/5/91
-#	$Id: Makefile,v 1.5 1995/09/13 17:24:35 markm Exp $
+#	$Id: Makefile,v 1.6 1995/09/14 04:11:14 gibbs Exp $
 
 PROG=	kstash
 CFLAGS+=-DKERBEROS -DDEBUG
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
-LDADD=	-lkdb -lkrb -ldes
+LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 MAN8=	kstash.8
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/make_keypair/Makefile b/eBones/usr.sbin/make_keypair/Makefile
index f100cdcb8dd..4edf76e649f 100644
--- a/eBones/usr.sbin/make_keypair/Makefile
+++ b/eBones/usr.sbin/make_keypair/Makefile
@@ -5,6 +5,6 @@ PROG=	make_keypair
 MAN8=	make_keypair.8
 CFLAGS+=-DKERBEROS -I${.CURDIR}/../../usr.bin/register
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
-LDADD=	-lkdb -lkrb -ldes
+LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 
 .include <bsd.prog.mk>