diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2002-05-11 00:20:22 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2002-05-11 00:20:22 +0000 |
| commit | 8af263c86ca9069f7b81553ac8eeb857e092bf7b (patch) | |
| tree | 4c3c0abc671f01208e923407224282de7a99c7f9 /usr.bin/ssh | |
| parent | c5d734d9312af8955fd681c243c46501f2e88049 (diff) | |
Add missing libraries to bsd.prog.mk (mostly kerberosV)
Use them in DPADD throughout the tree.
Fix a few mispells (LIBMATH -> LIBM...)
Wipe obsolete lib (LIBRESOLV)
Sort added missing libraries, move obsolete stuff apart.
Synch documentation in bsd.README
ok deraadt@
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/ssh/Makefile | 8 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd/Makefile | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile index 0bdeaa7a9ed..95b092924b3 100644 --- a/usr.bin/ssh/ssh/Makefile +++ b/usr.bin/ssh/ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.38 2002/05/04 03:00:40 deraadt Exp $ +# $OpenBSD: Makefile,v 1.39 2002/05/11 00:20:20 espie Exp $ .PATH: ${.CURDIR}/.. @@ -20,7 +20,7 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \ .if (${KERBEROS5:L} == "yes") CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV LDADD+= -lkrb5 -lasn1 -lcom_err -DPADD+= ${LIBKRB5} ${LIBASN1} +DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} .endif # KERBEROS5 .if (${KERBEROS:L} == "yes") @@ -30,11 +30,11 @@ DPADD+= ${LIBKRB} .if (${AFS:L} == "yes") CFLAGS+= -DAFS LDADD+= -lkafs -DPADD+= ${LIBKRBAFS} +DPADD+= ${LIBKAFS} .endif # AFS .endif # KERBEROS .include <bsd.prog.mk> LDADD+= -lcrypto -lz -ldes -DPADD+= ${LIBCRYPTO} ${LIBZ} +DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBDES} diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile index 8e495457854..c51d4fbb62b 100644 --- a/usr.bin/ssh/sshd/Makefile +++ b/usr.bin/ssh/sshd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.47 2002/03/18 17:50:31 provos Exp $ +# $OpenBSD: Makefile,v 1.48 2002/05/11 00:20:18 espie Exp $ .PATH: ${.CURDIR}/.. @@ -21,14 +21,14 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV SRCS+= auth-krb5.c LDADD+= -lkrb5 -lkafs -lasn1 -lcom_err -DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} +DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} ${LIBCOM_ERR} .endif # KERBEROS5 .if (${KERBEROS:L} == "yes") .if (${AFS:L} == "yes") CFLAGS+= -DAFS LDADD+= -lkafs -DPADD+= ${LIBKRBAFS} +DPADD+= ${LIBKAFS} .endif # AFS CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV SRCS+= auth-krb4.c @@ -39,7 +39,7 @@ DPADD+= ${LIBKRB} .include <bsd.prog.mk> LDADD+= -lcrypto -lutil -lz -ldes -DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} +DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBDES} .if (${TCP_WRAPPERS:L} == "yes") CFLAGS+= -DLIBWRAP |