Cleaner method of making PAMable apps static (in the optional case of

wanting static apps).
svn path=/head/; revision=76106
2001-04-28 15:18:10 +00:00 · 2001-04-28 15:18:10 +00:00 · c7d9dcd340 · 2020-12-20 02:59:44 +00:00
commit c7d9dcd340
parent cd8136756a
3 changed files with 3 additions and 12 deletions
--- 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
--- 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
--- 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