diff options
| author | ru <ru@FreeBSD.org> | 2002-01-23 15:54:17 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-01-23 15:54:17 +0000 |
| commit | c9d8bf860852b7610efc15075539f0a6e59db321 (patch) | |
| tree | a5bcd89550bea724a32663eb66e8d4f6b444874d /lib | |
| parent | e64688fcfb6f0f21dfe93591e7e15c93f4a68a3c (diff) | |
| download | FreeBSD-src-c9d8bf860852b7610efc15075539f0a6e59db321.zip FreeBSD-src-c9d8bf860852b7610efc15075539f0a6e59db321.tar.gz | |
Add pam_ssh support to the static PAM library, libpam.a:
- Spam /usr/lib some more by making libssh a standard library.
- Tweak ${LIBPAM} and ${MINUSLPAM}.
- Garbage collect unused libssh_pic.a.
- Add fake -lz dependency to secure/ makefiles needed for
dynamic linkage with -lssh.
Reviewed by: des, markm
Approved by: markm
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libpam/libpam/Makefile | 4 | ||||
| -rw-r--r-- | lib/libpam/modules/pam_ssh/Makefile | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile index 5bfc749..70cde47 100644 --- a/lib/libpam/libpam/Makefile +++ b/lib/libpam/libpam/Makefile @@ -60,7 +60,7 @@ MLINKS+= pam.8 pam.conf.5 pam.8 pam.d.5 HDRS0= pam_client.h # Files from ${PAMDIR}/libpam_misc: -SRCS+= help_env.c misc_conv.c xstrdup.c +SRCS+= help_env.c misc_conv.c HDRS2= pam_misc.h # Files from ${.CURDIR}: @@ -86,7 +86,9 @@ STATIC_MODULES+= ${MODOBJDIR}/pam_radius/libpam_radius.a STATIC_MODULES+= ${MODOBJDIR}/pam_rootok/libpam_rootok.a STATIC_MODULES+= ${MODOBJDIR}/pam_securetty/libpam_securetty.a STATIC_MODULES+= ${MODOBJDIR}/pam_self/libpam_self.a +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) STATIC_MODULES+= ${MODOBJDIR}/pam_ssh/libpam_ssh.a +.endif STATIC_MODULES+= ${MODOBJDIR}/pam_tacplus/libpam_tacplus.a STATIC_MODULES+= ${MODOBJDIR}/pam_unix/libpam_unix.a STATIC_MODULES+= ${MODOBJDIR}/pam_wheel/libpam_wheel.a diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile index 84dfac9..9d86270 100644 --- a/lib/libpam/modules/pam_ssh/Makefile +++ b/lib/libpam/modules/pam_ssh/Makefile @@ -7,9 +7,8 @@ LIB= pam_ssh SHLIB_NAME= pam_ssh.so SRCS= pam_ssh.c CFLAGS+= -I${SSHSRC} -DPADD= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} -LDADD= -L${.OBJDIR}/../../../../secure/lib/libssh -lssh -lcrypto \ - -lcrypt -lutil -lz +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} +LDADD= -lssh -lcrypto -lcrypt -lutil -lz MAN= pam_ssh.8 .include <bsd.lib.mk> |
