From e91a21c27c8a284a360757394c6f9033f651f058 Mon Sep 17 00:00:00 2001
From: itojun <itojun@NetBSD.org>
Date: Wed, 23 Oct 2002 01:25:35 +0000
Subject: [PATCH] add DPADD.

---
 usr.bin/compile_et/Makefile |  7 +++----
 usr.bin/kdestroy/Makefile   | 16 +++++-----------
 usr.bin/kinit/Makefile      | 16 +++++-----------
 usr.bin/klist/Makefile      | 16 +++++-----------
 usr.bin/kpasswd/Makefile    | 13 +++++--------
 usr.bin/login/Makefile      |  5 ++++-
 usr.bin/mk_cmds/Makefile    |  7 +++----
 usr.bin/passwd/Makefile     |  3 ++-
 usr.bin/string2key/Makefile | 13 +++++--------
 usr.bin/su/Makefile         |  7 ++++++-
 10 files changed, 43 insertions(+), 60 deletions(-)

diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile
index 7e3a0ac2c2ae..ca972e39f448 100644
--- a/usr.bin/compile_et/Makefile
+++ b/usr.bin/compile_et/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/09/18 14:00:35 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/23 01:25:35 itojun Exp $
 
 NOLINT= # defined
 
@@ -24,9 +24,8 @@ CPPFLAGS+= -I.					\
 .ifndef HOSTPROG
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
-LDADD=	-L${VERS} -lvers \
-	-lroken \
-	-lcrypt
+LDADD+=	-L${VERS} -lvers -lroken -lcrypt
+DPADD+=	${VERS}/libvers.a ${LIBROKEN} ${LIBCRYPT}
 .endif
 
 MAN=	compile_et.1
diff --git a/usr.bin/kdestroy/Makefile b/usr.bin/kdestroy/Makefile
index d4c3607c8449..2c6317b1fa3a 100644
--- a/usr.bin/kdestroy/Makefile
+++ b/usr.bin/kdestroy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/09/18 14:00:37 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/23 01:25:36 itojun Exp $
 
 NOLINT= # defined
 
@@ -22,15 +22,9 @@ CPPFLAGS+= -I.					\
 
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
-LDADD=						\
-	-lkafs					\
-	-lkrb5					\
-	-lkrb					\
-	-lcrypto				\
-	-lasn1					\
-	-lcom_err				\
-	-L${VERS} -lvers			\
-	-lroken					\
-	-lcrypt
+LDADD+= -lkafs -lkrb5 -lkrb -lcrypto -lasn1 -lcom_err \
+	-L${VERS} -lvers -lroken -lcrypt
+DPADD+=	${LIBKAFS} ${LIBKRB5} ${LIBKRB} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} \
+	${VERS}/libvers.a ${LIBROKEN} ${LIBCRYPT}
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/kinit/Makefile b/usr.bin/kinit/Makefile
index 91a236b942be..fa1eb3a324b9 100644
--- a/usr.bin/kinit/Makefile
+++ b/usr.bin/kinit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/09/18 14:00:37 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/23 01:25:36 itojun Exp $
 
 NOLINT= # defined
 
@@ -22,15 +22,9 @@ CPPFLAGS+= -I.					\
 
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
-LDADD=						\
-	-lkafs					\
-	-lkrb5					\
-	-lkrb					\
-	-lcrypto				\
-	-lasn1					\
-	-lcom_err				\
-	-L${VERS} -lvers			\
-	-lroken					\
-	-lcrypt
+LDADD+=	-lkafs -lkrb5 -lkrb -lcrypto -lasn1 -lcom_err \
+	-L${VERS} -lvers -lroken -lcrypt
+DPADD+=	${LIBKAFS} ${LIBKRB5} ${LIBKRB} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} \
+	${VERS}/libvers.a ${LIBROKEN} ${LIBCRYPT}
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/klist/Makefile b/usr.bin/klist/Makefile
index a1fe2dda8d76..05b0b375d0f2 100644
--- a/usr.bin/klist/Makefile
+++ b/usr.bin/klist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/09/18 14:00:37 lukem Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/23 01:25:37 itojun Exp $
 
 NOLINT= # defined
 
@@ -22,15 +22,9 @@ CPPFLAGS+= -I.					\
 
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
-LDADD=						\
-	-lkafs					\
-	-lkrb5					\
-	-lkrb					\
-	-lcrypto				\
-	-lasn1					\
-	-lcom_err				\
-	-L${VERS} -lvers			\
-	-lroken					\
-	-lcrypt
+LDADD+=	-lkafs -lkrb5 -lkrb -lcrypto -lasn1 -lcom_err \
+	-L${VERS} -lvers -lroken -lcrypt
+DPADD+=	${LIBKAFS} ${LIBKRB5} ${LIBKRB} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} \
+	${VERS}/libvers.a ${LIBROKEN} ${LIBCRYPT}
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/kpasswd/Makefile b/usr.bin/kpasswd/Makefile
index fed755cd1950..eb4aa51ebc47 100644
--- a/usr.bin/kpasswd/Makefile
+++ b/usr.bin/kpasswd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/09/18 14:00:38 lukem Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/23 01:25:37 itojun Exp $
 
 NOLINT= # defined
 
@@ -21,12 +21,9 @@ CPPFLAGS+= -I.					\
 
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
-LDADD=	-lkrb5 \
-	-lcrypto \
-	-lasn1 \
-	-lcom_err \
-	-L${VERS} -lvers \
-	-lroken \
-	-lcrypt
+LDADD+=	-lkrb5 -lcrypto -lasn1 -lcom_err -L${VERS} -lvers \
+	-lroken -lcrypt
+DPADD+=	${LIBKRB5} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${VERS}/libvers.a \
+	${LIBROKEN} ${LIBCRYPT}
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 09d3ed279254..ef15a447b88c 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.37 2002/07/27 22:58:07 christos Exp $
+#	$NetBSD: Makefile,v 1.38 2002/10/23 01:25:37 itojun Exp $
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 
 .include <bsd.own.mk>
@@ -20,12 +20,15 @@ LDADD+=	-lskey
 .if (${USE_KERBEROS} != "no")
 SRCS+= k5login.c
 CPPFLAGS+=-DKERBEROS5 -I${DESTDIR}/usr/include/krb5
+DPADD+=	${LIBKRB5} ${LIBASN1}
 LDADD+= -lkrb5 -lasn1
 
 SRCS+= klogin.c
 CPPFLAGS+=-DKERBEROS -I${DESTDIR}/usr/include/kerberosIV
+DPADD+=	${LIBKRB}
 LDADD+= -lkrb
 
+DPADD+=	${LIBCRYPTO} ${LIBROKEN} ${LIBCOM_ERR}
 LDADD+=	-lcrypto -lroken -lcom_err
 .endif
 
diff --git a/usr.bin/mk_cmds/Makefile b/usr.bin/mk_cmds/Makefile
index 99fe3bc6c4b2..3975706c1883 100644
--- a/usr.bin/mk_cmds/Makefile
+++ b/usr.bin/mk_cmds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/09/18 14:00:39 lukem Exp $
+# $NetBSD: Makefile,v 1.11 2002/10/23 01:25:38 itojun Exp $
 
 NOMAN=	# defined
 NOLINT= # defined
@@ -24,9 +24,8 @@ CFLAGS+= -I.					\
 
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
-LDADD=	-L${VERS} -lvers \
-	-lroken \
-	-lcrypt
+LDADD+=	-L${VERS} -lvers -lroken -lcrypt
+DPADD+=	${VERS}/libvers.a ${LIBROKEN} ${LIBCRYPT}
 
 CLEANFILES+=lex.c parse.c parse.h
 
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 2ffd3ccb600e..583387b7b83f 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.31 2002/03/22 18:10:23 thorpej Exp $
+#	$NetBSD: Makefile,v 1.32 2002/10/23 01:25:38 itojun Exp $
 #	from: @(#)Makefile    8.3 (Berkeley) 4/2/94
 
 .include <bsd.own.mk>
@@ -27,6 +27,7 @@ BINMODE=4555
 CPPFLAGS+= -DKERBEROS5 -I${DESTDIR}/usr/include/krb5
 SRCS+=	krb5_passwd.c
 
+DPADD+=	${LIBKRB5} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBCRYPT}
 LDADD+=	-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lcrypt
 .endif
 
diff --git a/usr.bin/string2key/Makefile b/usr.bin/string2key/Makefile
index 3e70ab7f0bb6..91f84f8cfa38 100644
--- a/usr.bin/string2key/Makefile
+++ b/usr.bin/string2key/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/09/18 14:00:41 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/23 01:25:38 itojun Exp $
 
 NOLINT= # defined
 
@@ -25,12 +25,9 @@ CPPFLAGS+= -I.					\
 
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
-LDADD=	-lkrb5 \
-	-lcrypto \
-	-lasn1 \
-	-lcom_err \
-	-L${VERS} -lvers \
-	-lroken \
-	-lcrypt
+LDADD+=	-lkrb5 -lcrypto -lasn1 -lcom_err -L${VERS} -lvers \
+	-lroken -lcrypt
+DPADD+=	${LIBKRB5} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${VERS}/libvers.a \
+	${LIBROKEN} ${LIBCRYPT}
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index a6f89c3075db..90913bcb40f7 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2002/03/22 18:10:24 thorpej Exp $
+#	$NetBSD: Makefile,v 1.28 2002/10/23 01:25:39 itojun Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 7/19/93
 
 .include <bsd.own.mk>
@@ -26,11 +26,14 @@ LDADD+= -lkafs
 .endif
 
 CPPFLAGS+=-DKERBEROS5 -I${DESTDIR}/usr/include/krb5
+DPADD+=	${LIBKRB5} ${LIBASN1}
 LDADD+= -lkrb5 -lasn1
 
 CPPFLAGS+=-DKERBEROS -I${DESTDIR}/usr/include/kerberosIV
+DPADD+=	${LIBKRB}
 LDADD+= -lkrb
 
+DPADD+=	${LIBCRYPTO} ${LIBROKEN} ${LIBCOM_ERR}
 LDADD+=	-lcrypto -lroken -lcom_err
 .endif
 
@@ -45,3 +48,5 @@ LDADD+= -lskey
 .ifdef SUROOTAUTH
 CPPFLAGS+=-DROOTAUTH=\"${SUROOTAUTH}\"
 .endif
+
+LDSTATIC=-static