Add -lcrypt where -lcrypto is specified.

This commit is contained in:
christos 2005-03-09 03:11:21 +00:00
parent 1c7109cbce
commit ceb0805a9b
18 changed files with 53 additions and 52 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2004/02/08 13:16:25 jsm Exp $
# $NetBSD: Makefile,v 1.12 2005/03/09 03:11:21 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# For MKCRYPTO
@ -12,8 +12,8 @@ CPPFLAGS+=-I${PRIMES}
.if (${MKCRYPTO} != "no")
CPPFLAGS+=-DHAVE_OPENSSL
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto -lcrypt
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
.endif
MAN= factor.6

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.14 2004/05/20 15:08:30 christos Exp $
# $NetBSD: Makefile,v 1.15 2005/03/09 03:11:21 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
@ -29,8 +29,8 @@ LDADD+= -lkrb -ldes
.endif
CPPFLAGS+= -DHAVE_GSSAPI -I${DESTDIR}/usr/include/krb5
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
LDADD+= -lgssapi -lkrb5 -lasn1 -lcrypto
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lgssapi -lkrb5 -lasn1 -lcrypto -lcrypt
CPPFLAGS+= -DENCRYPTION
DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBCRYPT}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.9 2005/01/10 02:58:58 lukem Exp $
# $NetBSD: Makefile.inc,v 1.10 2005/03/09 03:11:21 christos Exp $
WARNS?= 0
@ -19,8 +19,8 @@ CPPFLAGS+= -DNIS
.if ${MKCRYPTO} != "no"
CPPFLAGS+= -DSTARTTLS
LDADD+= -lssl -lcrypto
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto -lcrypt
DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBCRYPT}
.endif
.if exists(${.CURDIR}/../../Makefile.inc)

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2005/02/13 22:42:24 christos Exp $
# $NetBSD: Makefile,v 1.4 2005/03/09 03:11:21 christos Exp $
.include <bsd.own.mk>
@ -23,6 +23,7 @@ CPPFLAGS+= -I${SSHDIST}
LIBDPLIBS= crypto ${.CURDIR}/../libcrypto \
crypt ${.CURDIR}/../libcrypt \
z ${.CURDIR}/../libz
.include <bsd.lib.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.54 2005/03/04 20:41:09 he Exp $
# $NetBSD: Makefile,v 1.55 2005/03/09 03:11:21 christos Exp $
# @(#)Makefile 8.2 (Berkeley) 4/4/94
.include <bsd.own.mk>
@ -49,8 +49,8 @@ ftpd.o ftpcmd.o: version.h
#DPADD+= ${LIBKRB}
#LDADD+= -lkrb
#
#DPADD+= ${LIBCRYPTO} ${LIBROKEN} ${LIBCOM_ERR}
#LDADD+= -lcrypto -lroken -lcom_err
#DPADD+= ${LIBCRYPTO} ${{LIBCRYPT} ${LIBROKEN} ${LIBCOM_ERR}
#LDADD+= -lcrypto -lcrypt -lroken -lcom_err
#
#.endif

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.5 2003/07/24 14:22:51 itojun Exp $
# $NetBSD: Makefile,v 1.6 2005/03/09 03:11:21 christos Exp $
NOMAN= # defined
PROG= bftest
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
regress: ${PROG}
@echo "==> running ${PROG}"

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.6 2003/07/24 16:28:59 tron Exp $
# $NetBSD: Makefile.inc,v 1.7 2005/03/09 03:11:21 christos Exp $
.include <bsd.own.mk>
CRYPTODIST=${NETBSDSRCDIR}/crypto/dist
@ -7,8 +7,8 @@ CRYPTODIST=${NETBSDSRCDIR}/crypto/dist
.PATH: ${OPENSSLSRC}/crypto/bn
CPPFLAGS+= -I${OPENSSLSRC}
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
# do not install regression test programs
proginstall::

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.4 2002/09/18 05:41:42 lukem Exp $
# $NetBSD: Makefile,v 1.5 2005/03/09 03:11:21 christos Exp $
NOMAN= # defined
PROG= bntest
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
regress: ${PROG}
@echo "==> running ${PROG}"

View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.4 2002/09/18 05:41:43 lukem Exp $
# $NetBSD: Makefile,v 1.5 2005/03/09 03:11:21 christos Exp $
NOMAN= # defined
PROG= divtest
CFLAGS+= -g
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
regress: ${PROG}
@echo "==> running ${PROG}"

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.4 2002/09/18 05:41:43 lukem Exp $
# $NetBSD: Makefile,v 1.5 2005/03/09 03:11:21 christos Exp $
NOMAN= # defined
PROG= exptest
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
regress: ${PROG}
@echo "==> running ${PROG}"

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.5 2003/07/24 14:22:52 itojun Exp $
# $NetBSD: Makefile,v 1.6 2005/03/09 03:11:21 christos Exp $
NOMAN= # defined
PROG= casttest
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
regress: ${PROG}
@echo "==> running ${PROG}"

View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.5 2003/07/24 14:22:52 itojun Exp $
# $NetBSD: Makefile,v 1.6 2005/03/09 03:11:21 christos Exp $
NOMAN= # defined
PROG= conftest
SRCS= test.c
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
regress: ${PROG}
@echo "==> running ${PROG}"

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.5 2003/07/24 14:22:52 itojun Exp $
# $NetBSD: Makefile,v 1.6 2005/03/09 03:11:21 christos Exp $
NOMAN= # defined
PROG= destest
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
regress: ${PROG}
@echo "==> running ${PROG}"

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.5 2003/07/24 14:22:53 itojun Exp $
# $NetBSD: Makefile,v 1.6 2005/03/09 03:11:21 christos Exp $
NOMAN= # defined
PROG= dhtest
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
regress: ${PROG}
@echo "==> running ${PROG}"

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.5 2003/07/24 14:22:53 itojun Exp $
# $NetBSD: Makefile,v 1.6 2005/03/09 03:11:21 christos Exp $
NOMAN= # defined
PROG= dsatest
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
regress: ${PROG}
@echo "==> running ${PROG}"

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.1 2003/07/24 14:22:53 itojun Exp $
# $NetBSD: Makefile,v 1.2 2005/03/09 03:11:21 christos Exp $
NOMAN= # defined
PROG= ectest
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
regress: ${PROG}
@echo "==> running ${PROG}"

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.1 2003/07/24 14:22:54 itojun Exp $
# $NetBSD: Makefile,v 1.2 2005/03/09 03:11:21 christos Exp $
NOMAN= # defined
PROG= enginetest
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
regress: ${PROG}
@echo "==> running ${PROG}"

View File

@ -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:21 christos Exp $
NOMAN= # defined
PROG= hmactest
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
regress: ${PROG}
@echo "==> running ${PROG}"