Source-Changes-HG archive

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

[src/trunk]: src Add -lcrypt where -lcrypto is specified.



details:   https://anonhg.NetBSD.org/src/rev/25302a6dfe0b
branches:  trunk
changeset: 574661:25302a6dfe0b
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Mar 09 03:11:22 2005 +0000

description:
Add -lcrypt where -lcrypto is specified.

diffstat:

 regress/lib/libcrypto/idea/Makefile    |  6 +++---
 regress/lib/libcrypto/lhash/Makefile   |  6 +++---
 regress/lib/libcrypto/md2/Makefile     |  6 +++---
 regress/lib/libcrypto/md4/Makefile     |  6 +++---
 regress/lib/libcrypto/md5/Makefile     |  6 +++---
 regress/lib/libcrypto/mdc2/Makefile    |  6 +++---
 regress/lib/libcrypto/rand/Makefile    |  6 +++---
 regress/lib/libcrypto/rc2/Makefile     |  6 +++---
 regress/lib/libcrypto/rc4/Makefile     |  6 +++---
 regress/lib/libcrypto/rc5/Makefile     |  6 +++---
 regress/lib/libcrypto/ripemd/Makefile  |  6 +++---
 regress/lib/libcrypto/rsa/Makefile     |  6 +++---
 regress/lib/libcrypto/sha/Makefile     |  6 +++---
 regress/lib/libcrypto/sha1/Makefile    |  6 +++---
 regress/lib/libcrypto/threads/Makefile |  6 +++---
 regress/lib/libcrypto/x509v3/Makefile  |  6 +++---
 sbin/cgdconfig/Makefile                |  6 +++---
 usr.bin/openssl/Makefile               |  8 ++++----
 usr.bin/ssh/Makefile.inc               |  6 +++---
 usr.sbin/ntp/Makefile.inc              |  6 +++---
 usr.sbin/racoon/Makefile               |  6 +++---
 usr.sbin/tcpdump/Makefile              |  6 +++---
 22 files changed, 67 insertions(+), 67 deletions(-)

diffs (truncated from 405 to 300 lines):

diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/idea/Makefile
--- a/regress/lib/libcrypto/idea/Makefile       Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/idea/Makefile       Wed Mar 09 03:11:22 2005 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/24 14:22:54 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          ideatest
-DPADD+=                ${LIBCRYPTO}
-LDADD+=                -lcrypto_idea -lcrypto
+DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto_idea -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/lhash/Makefile
--- a/regress/lib/libcrypto/lhash/Makefile      Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/lhash/Makefile      Wed Mar 09 03:11:22 2005 +0000
@@ -1,12 +1,12 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/24 14:22:55 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          lhashtest
 SRCS=          lh_test.c
 CPPFLAGS+=     -DMalloc=malloc
-DPADD+=                ${LIBCRYPTO}
-LDADD+=                -lcrypto
+DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/md2/Makefile
--- a/regress/lib/libcrypto/md2/Makefile        Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/md2/Makefile        Wed Mar 09 03:11:22 2005 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/24 14:22:55 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          md2test
-DPADD+=                ${LIBCRYPTO}
-LDADD+=                -lcrypto
+DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/md4/Makefile
--- a/regress/lib/libcrypto/md4/Makefile        Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/md4/Makefile        Wed Mar 09 03:11:22 2005 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/24 14:22:55 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          md4test
-DPADD+=                ${LIBCRYPTO}
-LDADD+=                -lcrypto
+DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/md5/Makefile
--- a/regress/lib/libcrypto/md5/Makefile        Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/md5/Makefile        Wed Mar 09 03:11:22 2005 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/24 14:22:55 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          md5test
-DPADD+=                ${LIBCRYPTO}
-LDADD+=                -lcrypto
+DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/mdc2/Makefile
--- a/regress/lib/libcrypto/mdc2/Makefile       Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/mdc2/Makefile       Wed Mar 09 03:11:22 2005 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.6 2003/07/24 14:22:56 itojun Exp $
+#      $NetBSD: Makefile,v 1.7 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          mdc2test
-DPADD+=                ${LIBCRYPTO_MDC2} ${LIBCRYPTO}
-LDADD+=                -lcrypto_mdc2 -lcrypto
+DPADD+=                ${LIBCRYPTO_MDC2} ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto_mdc2 -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/rand/Makefile
--- a/regress/lib/libcrypto/rand/Makefile       Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/rand/Makefile       Wed Mar 09 03:11:22 2005 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/24 14:22:56 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          randtest
-DPADD+=                ${LIBCRYPTO}
-LDADD+=                -lcrypto
+DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/rc2/Makefile
--- a/regress/lib/libcrypto/rc2/Makefile        Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/rc2/Makefile        Wed Mar 09 03:11:22 2005 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/24 14:22:56 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          rc2test
-DPADD+=                ${LIBCRYPTO}
-LDADD+=                -lcrypto
+DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/rc4/Makefile
--- a/regress/lib/libcrypto/rc4/Makefile        Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/rc4/Makefile        Wed Mar 09 03:11:22 2005 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/24 14:22:56 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          rc4test
-DPADD+=                ${LIBCRYPTO}
-LDADD+=                -lcrypto
+DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/rc5/Makefile
--- a/regress/lib/libcrypto/rc5/Makefile        Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/rc5/Makefile        Wed Mar 09 03:11:22 2005 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/24 14:22:57 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          rc5test
-DPADD+=                ${LIBCRYPTO}
-LDADD+=                -lcrypto_rc5 -lcrypto
+DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto_rc5 -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/ripemd/Makefile
--- a/regress/lib/libcrypto/ripemd/Makefile     Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/ripemd/Makefile     Wed Mar 09 03:11:22 2005 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/24 14:22:57 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          ripemdtest
 SRCS=          rmdtest.c
-DPADD+=                ${LIBCRYPTO}
-LDADD+=                -lcrypto
+DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/rsa/Makefile
--- a/regress/lib/libcrypto/rsa/Makefile        Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/rsa/Makefile        Wed Mar 09 03:11:22 2005 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.6 2003/07/24 14:22:57 itojun Exp $
+#      $NetBSD: Makefile,v 1.7 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          rsatest
 SRCS=          rsa_test.c
-DPADD+=                ${LIBCRYPTO}
-LDADD+=                -lcrypto
+DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto -lcrypt
 
 CPPFLAGS+=     -I${OPENSSLSRC}
 
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/sha/Makefile
--- a/regress/lib/libcrypto/sha/Makefile        Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/sha/Makefile        Wed Mar 09 03:11:22 2005 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/24 14:22:58 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          shatest
-DPADD+=                ${LIBCRYPTO}
-LDADD+=                -lcrypto
+DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/sha1/Makefile
--- a/regress/lib/libcrypto/sha1/Makefile       Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/sha1/Makefile       Wed Mar 09 03:11:22 2005 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/24 14:22:58 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          sha1test
-DPADD+=                ${LIBCRYPTO}
-LDADD+=                -lcrypto
+DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/threads/Makefile
--- a/regress/lib/libcrypto/threads/Makefile    Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/threads/Makefile    Wed Mar 09 03:11:22 2005 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/24 14:22:58 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          threadstest
 SRCS=          mttest.c
-DPADD+=                ${LIBSSL} ${LIBCRYPTO}
-LDADD+=                -lssl -lcrypto
+DPADD+=                ${LIBSSL} ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lssl -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b regress/lib/libcrypto/x509v3/Makefile
--- a/regress/lib/libcrypto/x509v3/Makefile     Wed Mar 09 03:11:21 2005 +0000
+++ b/regress/lib/libcrypto/x509v3/Makefile     Wed Mar 09 03:11:22 2005 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/24 14:22:58 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2005/03/09 03:11:22 christos Exp $
 
 NOMAN=         # defined
 
 PROG=          x509v3test
 SRCS=          tabtest.c
-DPADD+=                ${LIBCRYPTO}
-LDADD+=                -lcrypto
+DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=                -lcrypto -lcrypt
 
 regress:       ${PROG}
        @echo "==> running ${PROG}"
diff -r c15ed86b1414 -r 25302a6dfe0b sbin/cgdconfig/Makefile
--- a/sbin/cgdconfig/Makefile   Wed Mar 09 03:11:21 2005 +0000
+++ b/sbin/cgdconfig/Makefile   Wed Mar 09 03:11:22 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/04/17 22:12:50 thorpej Exp $
+# $NetBSD: Makefile,v 1.5 2005/03/09 03:11:22 christos Exp $
 
 PROG=  cgdconfig
 MAN=   cgdconfig.8
@@ -14,7 +14,7 @@
 
 YHEADER=1
 
-DPADD=  ${LIBUTIL} ${LIBCRYPTO}
-LDADD=  -lutil -lcrypto -ly -ll
+DPADD=  ${LIBUTIL} ${LIBCRYPTO} ${LIBCRYPT}
+LDADD=  -lutil -lcrypto -lcrypt -ly -ll
 
 .include <bsd.prog.mk>
diff -r c15ed86b1414 -r 25302a6dfe0b usr.bin/openssl/Makefile
--- a/usr.bin/openssl/Makefile  Wed Mar 09 03:11:21 2005 +0000
+++ b/usr.bin/openssl/Makefile  Wed Mar 09 03:11:22 2005 +0000



Home | Main Index | Thread Index | Old Index