Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin add DPADD.



details:   https://anonhg.NetBSD.org/src/rev/c9e683b51083
branches:  trunk
changeset: 538594:c9e683b51083
user:      itojun <itojun%NetBSD.org@localhost>
date:      Wed Oct 23 01:25:35 2002 +0000

description:
add DPADD.

diffstat:

 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(-)

diffs (253 lines):

diff -r 4be4b21a9e9c -r c9e683b51083 usr.bin/compile_et/Makefile
--- a/usr.bin/compile_et/Makefile       Wed Oct 23 01:11:09 2002 +0000
+++ b/usr.bin/compile_et/Makefile       Wed Oct 23 01:25:35 2002 +0000
@@ -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 @@
 .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 -r 4be4b21a9e9c -r c9e683b51083 usr.bin/kdestroy/Makefile
--- a/usr.bin/kdestroy/Makefile Wed Oct 23 01:11:09 2002 +0000
+++ b/usr.bin/kdestroy/Makefile Wed Oct 23 01:25:35 2002 +0000
@@ -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 @@
 
 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 -r 4be4b21a9e9c -r c9e683b51083 usr.bin/kinit/Makefile
--- a/usr.bin/kinit/Makefile    Wed Oct 23 01:11:09 2002 +0000
+++ b/usr.bin/kinit/Makefile    Wed Oct 23 01:25:35 2002 +0000
@@ -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 @@
 
 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 -r 4be4b21a9e9c -r c9e683b51083 usr.bin/klist/Makefile
--- a/usr.bin/klist/Makefile    Wed Oct 23 01:11:09 2002 +0000
+++ b/usr.bin/klist/Makefile    Wed Oct 23 01:25:35 2002 +0000
@@ -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 @@
 
 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 -r 4be4b21a9e9c -r c9e683b51083 usr.bin/kpasswd/Makefile
--- a/usr.bin/kpasswd/Makefile  Wed Oct 23 01:11:09 2002 +0000
+++ b/usr.bin/kpasswd/Makefile  Wed Oct 23 01:25:35 2002 +0000
@@ -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 @@
 
 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 -r 4be4b21a9e9c -r c9e683b51083 usr.bin/login/Makefile
--- a/usr.bin/login/Makefile    Wed Oct 23 01:11:09 2002 +0000
+++ b/usr.bin/login/Makefile    Wed Oct 23 01:25:35 2002 +0000
@@ -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 @@
 .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 -r 4be4b21a9e9c -r c9e683b51083 usr.bin/mk_cmds/Makefile
--- a/usr.bin/mk_cmds/Makefile  Wed Oct 23 01:11:09 2002 +0000
+++ b/usr.bin/mk_cmds/Makefile  Wed Oct 23 01:25:35 2002 +0000
@@ -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 @@
 
 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 -r 4be4b21a9e9c -r c9e683b51083 usr.bin/passwd/Makefile
--- a/usr.bin/passwd/Makefile   Wed Oct 23 01:11:09 2002 +0000
+++ b/usr.bin/passwd/Makefile   Wed Oct 23 01:25:35 2002 +0000
@@ -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 @@
 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 -r 4be4b21a9e9c -r c9e683b51083 usr.bin/string2key/Makefile
--- a/usr.bin/string2key/Makefile       Wed Oct 23 01:11:09 2002 +0000
+++ b/usr.bin/string2key/Makefile       Wed Oct 23 01:25:35 2002 +0000
@@ -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 @@
 
 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 -r 4be4b21a9e9c -r c9e683b51083 usr.bin/su/Makefile
--- a/usr.bin/su/Makefile       Wed Oct 23 01:11:09 2002 +0000
+++ b/usr.bin/su/Makefile       Wed Oct 23 01:25:35 2002 +0000
@@ -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 @@
 .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 @@
 .ifdef SUROOTAUTH
 CPPFLAGS+=-DROOTAUTH=\"${SUROOTAUTH}\"
 .endif
+
+LDSTATIC=-static



Home | Main Index | Thread Index | Old Index