From c7d9dcd34092a8379987fd79545d077060698407 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Sat, 28 Apr 2001 15:18:10 +0000
Subject: Cleaner method of making PAMable apps static (in the optional case of
 wanting static apps).

---
 libexec/ftpd/Makefile    | 5 -----
 libexec/rshd/Makefile    | 5 -----
 share/mk/bsd.libnames.mk | 5 +++--
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index 39eaecea9e18..6d81aee9c914 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -25,8 +25,3 @@ LDADD+= ${MINUSLPAM}
 .endif
 
 .include <bsd.prog.mk>
-
-.if defined(NOSHARED) && !defined(NOPAM)
-DPADD+= ${LIBCRYPTO}
-LDADD+= -L${.OBJDIR}/../../secure/lib/libssh/ -lssh -lcrypto
-.endif
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index e5e5cdb9da68..735c00d09d9e 100644
--- a/libexec/rshd/Makefile
+++ b/libexec/rshd/Makefile
@@ -21,8 +21,3 @@ LDADD+=	${MINUSLPAM}
 CFLAGS+= -DINET6
 
 .include <bsd.prog.mk>
-
-.if defined(NOSHARED) && !defined(NOPAM)
-DPADD+=	${LIBCRYPTO}
-LDADD+=	-L${.OBJDIR}/../../secure/lib/libssh -lssh -lcrypto
-.endif
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 62f57986497d..94a296ce2f86 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -67,8 +67,9 @@ LIBPAM+=	${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR}
 MINUSLPAM+=	-lkrb -lcrypto -lcom_err
 .endif
 LIBPAM+=	${LIBRADIUS} ${LIBTACPLUS} ${LIBSKEY} ${LIBCRYPT} ${LIBMD} \
-		${LIBUTIL} ${LIBOPIE}
-MINUSLPAM+=	-lradius -ltacplus -lskey -lcrypt -lmd -lutil -lopie
+		${LIBUTIL} ${LIBOPIE} ${LIBCRYPTO}
+MINUSLPAM+=	-lradius -ltacplus -lskey -lcrypt -lmd -lutil -lopie \
+		-L${.OBJDIR}/../../secure/lib/libssh/ -lssh -lcrypto
 .endif
 
 LIBPC?=		${DESTDIR}${LIBDIR}/libpc.a	# XXX doesn't exist
-- 
cgit v1.3