From f61dcf52818d775e37af5f2056d1999279a99e6a Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Wed, 9 May 2001 14:23:54 +0000 Subject: [PATCH] Fixed world breakage in previous commit. -lpam must never be used directly (except in the definition of MINUSLPAM in bsd.libnames.mk) since it doesn't give all the lbraries necessary for static linkage. Fixed new and old bugs in DPADD. ${LIBPAM} was missing, and the library order was different from that in LDADD so `make checkdpadd' reported a non-bug. --- secure/libexec/telnetd/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile index 47b18415fa21..498c13f12f95 100644 --- a/secure/libexec/telnetd/Makefile +++ b/secure/libexec/telnetd/Makefile @@ -13,9 +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} ${LIBMP} \ - ${LIBCRYPT} -LDADD= -lutil -ltermcap ${LIBTELNET} -lcrypto -lcrypt -lmp -lpam +DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} \ + ${LIBCRYPT} ${LIBMP} ${LIBPAM} +LDADD= -lutil -ltermcap ${LIBTELNET} -lcrypto \ + -lcrypt -lmp ${MINUSLPAM} .include