From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Tue, 12 Jul 2005 23:30:24 +0000 (+0000)
Subject: Hook up remaining PAM modules. Don't use DPADD for now, it's conflicting
X-Git-Tag: v2.0.1~6631
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/590a134dcf81fcfa01087452eab3f378056ce34d

Hook up remaining PAM modules. Don't use DPADD for now, it's conflicting
with the LIBDIR setting for the target location.
---

diff --git a/lib/pam_module/Makefile b/lib/pam_module/Makefile
index e3cbad004c..93eb36a32d 100644
--- a/lib/pam_module/Makefile
+++ b/lib/pam_module/Makefile
@@ -1,5 +1,9 @@
-# $DragonFly: src/lib/pam_module/Makefile,v 1.1 2005/07/08 15:42:01 joerg Exp $
+# $DragonFly: src/lib/pam_module/Makefile,v 1.2 2005/07/12 23:30:24 joerg Exp $
 
-SUBDIR=	pam_cleartext_pass_ok pam_deny pam_permit pam_unix
+SUBDIR=		pam_cleartext_pass_ok pam_deny pam_opie pam_opieaccess
+SUBDIR+=	pam_permit pam_radius pam_ssh pam_tacplus pam_unix
+.if defined(MAKE_KERBEROS5) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+SUBDIR+=	pam_krb5
+.endif
 
 .include <bsd.subdir.mk>
diff --git a/lib/pam_module/Makefile.inc b/lib/pam_module/Makefile.inc
index 02161cf32a..de2332eba1 100644
--- a/lib/pam_module/Makefile.inc
+++ b/lib/pam_module/Makefile.inc
@@ -1,4 +1,4 @@
-# $DragonFly: src/lib/pam_module/Makefile.inc,v 1.1 2005/07/08 15:42:01 joerg Exp $
+# $DragonFly: src/lib/pam_module/Makefile.inc,v 1.2 2005/07/12 23:30:24 joerg Exp $
 
 SHLIB_NAME= ${LIB}.so.${MODULE_SHLIB_MAJOR}
 SHLIB_MAJOR=	${MODULE_SHLIB_MAJOR}
@@ -8,7 +8,6 @@ NOPROFILE=	yes
 LIBDIR=		/usr/lib/security
 
 LDADD+=	-lpam
-DPADD+=	${LIBPAM}
 
 OPENPAM_DIR=	${.CURDIR}/../../../contrib/openpam
 
diff --git a/lib/pam_module/pam_tacplus/Makefile b/lib/pam_module/pam_tacplus/Makefile
index 0e417cca8a..8790344456 100644
--- a/lib/pam_module/pam_tacplus/Makefile
+++ b/lib/pam_module/pam_tacplus/Makefile
@@ -1,4 +1,4 @@
-# $DragonFly: src/lib/pam_module/pam_tacplus/Makefile,v 1.2 2005/07/12 22:45:38 joerg Exp $
+# $DragonFly: src/lib/pam_module/pam_tacplus/Makefile,v 1.3 2005/07/12 23:30:24 joerg Exp $
 
 LIB=	pam_tacplus
 SRCS=	pam_tacplus.c
@@ -6,6 +6,5 @@ WARNS?=	6
 MAN=	pam_tacplus.8
 
 LDADD=	-ltacplus
-DPADD=	${LIBTACPLUS}
 
 .include <bsd.lib.mk>
diff --git a/lib/pam_module/pam_unix/Makefile b/lib/pam_module/pam_unix/Makefile
index 94502fdb6e..f42d939559 100644
--- a/lib/pam_module/pam_unix/Makefile
+++ b/lib/pam_module/pam_unix/Makefile
@@ -1,4 +1,4 @@
-# $DragonFly: src/lib/pam_module/pam_unix/Makefile,v 1.1 2005/07/08 15:42:01 joerg Exp $
+# $DragonFly: src/lib/pam_module/pam_unix/Makefile,v 1.2 2005/07/12 23:30:24 joerg Exp $
 
 LIB=	pam_unix
 SRCS=	pam_unix.c
@@ -6,7 +6,6 @@ WARNS?=	2
 WARNS_NO_UNUSED_PARAMETERS=
 
 LDADD=	-lcrypt
-DPADD=	${LIBCRYPT}
 
 .include <bsd.lib.mk>