diff options
author | bde <bde@FreeBSD.org> | 2001-07-30 14:36:19 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 2001-07-30 14:36:19 +0000 |
commit | 150ca138e2208cb3ea06db5cd419a69dc925bd8e (patch) | |
tree | 958355a255318a7245f33d4d490b59723513f0c5 | |
parent | e74fb4323e170360154ed5e36057a0712ed38312 (diff) | |
download | FreeBSD-src-150ca138e2208cb3ea06db5cd419a69dc925bd8e.zip FreeBSD-src-150ca138e2208cb3ea06db5cd419a69dc925bd8e.tar.gz |
Fixed world breakage when NOSHARED=yes. libmp now depends on libcrypto,
so it must be linked before libcrypto to work right.
-rw-r--r-- | secure/libexec/telnetd/Makefile | 8 | ||||
-rw-r--r-- | secure/usr.bin/telnet/Makefile | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile index 498c13f..24e3731 100644 --- a/secure/libexec/telnetd/Makefile +++ b/secure/libexec/telnetd/Makefile @@ -13,10 +13,10 @@ CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ SRCS= global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c authenc.c -DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBMP} ${LIBPAM} -LDADD= -lutil -ltermcap ${LIBTELNET} -lcrypto \ - -lcrypt -lmp ${MINUSLPAM} +DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \ + ${LIBCRYPT} ${LIBPAM} +LDADD= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \ + -lcrypt ${MINUSLPAM} .include <bsd.prog.mk> diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile index 14e4e79..56f7a7e 100644 --- a/secure/usr.bin/telnet/Makefile +++ b/secure/usr.bin/telnet/Makefile @@ -9,9 +9,9 @@ CFLAGS+= -DIPSEC -DINET6 SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ telnet.c terminal.c tn3270.c utilities.c -DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMP} \ +DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBIPSEC} ${LIBPAM} -LDADD= -ltermcap ${LIBTELNET} -lcrypto -lcrypt -lmp \ +LDADD= -ltermcap ${LIBTELNET} -lmp -lcrypto -lcrypt \ -lipsec ${MINUSLPAM} .include <bsd.prog.mk> |