diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-07-03 22:13:26 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-07-03 22:13:26 +0000 |
| commit | d0e0f2a2849603f3fbde4356e0b47fcb79ccdc72 (patch) | |
| tree | e2c5447aa9c580acccf62579f8e0b536805c6258 /secure/lib | |
| parent | f17ea500f8dcca4aed16b4287b03ea69d7d14447 (diff) | |
Notes
Diffstat (limited to 'secure/lib')
| -rw-r--r-- | secure/lib/Makefile | 4 | ||||
| -rw-r--r-- | secure/lib/libssh/Makefile | 33 |
2 files changed, 15 insertions, 22 deletions
diff --git a/secure/lib/Makefile b/secure/lib/Makefile index a3aa74cf17dd..40731dd3f3ff 100644 --- a/secure/lib/Makefile +++ b/secure/lib/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ SUBDIR= libcipher -.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) +.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5) SUBDIR+=libtelnet .endif .if !defined(NO_OPENSSL) SUBDIR+=libcrypto libssl -.endif .if !defined(NO_OPENSSH) SUBDIR+=libssh .endif +.endif .include <bsd.subdir.mk> diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 27954cb02a0c..a2d3f87220c5 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -2,33 +2,26 @@ # LIB= ssh -SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \ - cipher.c compat.c compress.c crc32.c deattack.c \ +SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \ + cipher.c compat.c compress.c crc32.c deattack.c fatal.c \ hostfile.c log.c match.c mpaux.c nchan.c packet.c readpass.c \ - rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c \ + rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \ key.c dispatch.c kex.c mac.c uuencode.c misc.c \ - cli.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \ - version.c - - -NOPIC= yes -INTERNALLIB= yes -INTERNALSTATICLIB= yes + rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \ + scard.c monitor_wrap.c monitor_fdpass.c msg.c +# Portability layer +SRCS+= bsd-misc.c entropy.c +# FreeBSD additions +SRCS+= version.c +CFLAGS+=-I${SSHDIR} .if defined(COMPAT_GETADDRINFO) SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c .endif -.if defined(MAKE_KERBEROS4) && \ - ((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES")) -CFLAGS+= -DKRB4 -.endif # MAKE_KERBEROS4 - -.if defined(MAKE_KERBEROS5) && \ - ((${MAKE_KERBEROS5} == "yes") || (${MAKE_KERBEROS5} == "YES")) -CFLAGS+= -DKRB5 -.endif # MAKE_KERBEROS5 +DPADD= ${LIBCRYPTO} ${LIBZ} +LDADD+= -lcrypto -lz .include <bsd.lib.mk> -.PATH: ${SSHDIR} ${SSHDIR}/lib +.PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat |