From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Thu, 28 Jul 2005 19:25:41 +0000 (+0000)
Subject: Instead of overriding LIBDIR, override the new TARGET_LIBDIR variables.
X-Git-Tag: v2.0.1~6463
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/d67c43174ac5dabac38733df850de3761c63294d

Instead of overriding LIBDIR, override the new TARGET_LIBDIR variables.
This allows the normal dependency handling to be readded.
---

diff --git a/lib/pam_module/Makefile.inc b/lib/pam_module/Makefile.inc
index de2332eba1..221e3f22ec 100644
--- a/lib/pam_module/Makefile.inc
+++ b/lib/pam_module/Makefile.inc
@@ -1,11 +1,12 @@
-# $DragonFly: src/lib/pam_module/Makefile.inc,v 1.2 2005/07/12 23:30:24 joerg Exp $
+# $DragonFly: src/lib/pam_module/Makefile.inc,v 1.3 2005/07/28 19:25:40 joerg Exp $
 
 SHLIB_NAME= ${LIB}.so.${MODULE_SHLIB_MAJOR}
 SHLIB_MAJOR=	${MODULE_SHLIB_MAJOR}
 NOINSTALLLIB=	yes
 NOPROFILE=	yes
 
-LIBDIR=		/usr/lib/security
+TARGET_LIBDIR=		/usr/lib/security
+TARGET_SHLIBDIR=	/usr/lib/security
 
 LDADD+=	-lpam
 
diff --git a/lib/pam_module/pam_cleartext_pass_ok/Makefile b/lib/pam_module/pam_cleartext_pass_ok/Makefile
index e9d05f5209..1b606cf5eb 100644
--- a/lib/pam_module/pam_cleartext_pass_ok/Makefile
+++ b/lib/pam_module/pam_cleartext_pass_ok/Makefile
@@ -1,10 +1,11 @@
-# $DragonFly: src/lib/pam_module/pam_cleartext_pass_ok/Makefile,v 1.2 2005/07/12 22:55:46 joerg Exp $
+# $DragonFly: src/lib/pam_module/pam_cleartext_pass_ok/Makefile,v 1.3 2005/07/28 19:25:40 joerg Exp $
 
 LIB=	pam_cleartext_pass_ok
 SRCS=	pam_cleartext_pass_ok.c
 WARNS?=	6
 NOMAN=
 
+DPADD=	${LIBSKEY}
 LDADD=	-lskey
 
 .include <bsd.lib.mk>
diff --git a/lib/pam_module/pam_krb5/Makefile b/lib/pam_module/pam_krb5/Makefile
index d5656c7db8..832d309a48 100644
--- a/lib/pam_module/pam_krb5/Makefile
+++ b/lib/pam_module/pam_krb5/Makefile
@@ -1,11 +1,12 @@
-# $DragonFly: src/lib/pam_module/pam_krb5/Makefile,v 1.2 2005/07/14 12:30:14 joerg Exp $
+# $DragonFly: src/lib/pam_module/pam_krb5/Makefile,v 1.3 2005/07/28 19:25:41 joerg Exp $
 
 LIB=	pam_krb5
 SRCS=	pam_krb5.c
 WARNS?=	6
 MAN=	pam_krb5.8
 
-LDADD=		-lkrb5 -lgssapi -lasn1 -lcrypto -lcrypt -lcom_err \
-		-lroken 
+DPADD=	${LIBKRB5} ${LIBGSSAPI} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \
+	${LIBCOM_ERR} ${LIBROKEN}
+LDADD=	-lkrb5 -lgssapi -lasn1 -lcrypto -lcrypt -lcom_err -lroken 
 
 .include <bsd.lib.mk>
diff --git a/lib/pam_module/pam_opie/Makefile b/lib/pam_module/pam_opie/Makefile
index d2cc07f91b..21d9d445d1 100644
--- a/lib/pam_module/pam_opie/Makefile
+++ b/lib/pam_module/pam_opie/Makefile
@@ -1,10 +1,11 @@
-# $DragonFly: src/lib/pam_module/pam_opie/Makefile,v 1.1 2005/07/12 22:53:20 joerg Exp $
+# $DragonFly: src/lib/pam_module/pam_opie/Makefile,v 1.2 2005/07/28 19:25:41 joerg Exp $
 
 LIB=	pam_opie
 SRCS=	pam_opie.c
 WARNS?=	6
 MAN=	pam_opie.8
 
+DPADD=	${LIBOPIE}
 LDADD=	-lopie
 
 .include <bsd.lib.mk>
diff --git a/lib/pam_module/pam_opieaccess/Makefile b/lib/pam_module/pam_opieaccess/Makefile
index 2bcd65ced7..4743603754 100644
--- a/lib/pam_module/pam_opieaccess/Makefile
+++ b/lib/pam_module/pam_opieaccess/Makefile
@@ -1,10 +1,11 @@
-# $DragonFly: src/lib/pam_module/pam_opieaccess/Makefile,v 1.1 2005/07/12 23:08:53 joerg Exp $
+# $DragonFly: src/lib/pam_module/pam_opieaccess/Makefile,v 1.2 2005/07/28 19:25:41 joerg Exp $
 
 LIB=	pam_opieaccess
 SRCS=	pam_opieaccess.c
 WARNS?=	6
 MAN=	pam_opieaccess.8
 
+DPADD=	${LIBOPIE}
 LDADD=	-lopie
 
 .include <bsd.lib.mk>
diff --git a/lib/pam_module/pam_radius/Makefile b/lib/pam_module/pam_radius/Makefile
index d7b732feab..b3e16ecb58 100644
--- a/lib/pam_module/pam_radius/Makefile
+++ b/lib/pam_module/pam_radius/Makefile
@@ -1,10 +1,11 @@
-# $DragonFly: src/lib/pam_module/pam_radius/Makefile,v 1.1 2005/07/12 23:13:26 joerg Exp $
+# $DragonFly: src/lib/pam_module/pam_radius/Makefile,v 1.2 2005/07/28 19:25:41 joerg Exp $
 
 LIB=	pam_radius
 SRCS=	pam_radius.c
 WARNS?=	6
 MAN=	pam_radius.8
 
+DPADD=	${LIBRADIUS}
 LDADD=	-lradius
 
 .include <bsd.lib.mk>
diff --git a/lib/pam_module/pam_ssh/Makefile b/lib/pam_module/pam_ssh/Makefile
index 0c7f28b607..7b3fe432d9 100644
--- a/lib/pam_module/pam_ssh/Makefile
+++ b/lib/pam_module/pam_ssh/Makefile
@@ -1,4 +1,4 @@
-# $DragonFly: src/lib/pam_module/pam_ssh/Makefile,v 1.1 2005/07/12 23:26:49 joerg Exp $
+# $DragonFly: src/lib/pam_module/pam_ssh/Makefile,v 1.2 2005/07/28 19:25:41 joerg Exp $
 
 LIB=	pam_ssh
 SRCS=	pam_ssh.c
@@ -6,6 +6,7 @@ WARNS?=	6
 MAN=	pam_ssh.8
 
 LDADD=	-lssh -lcrypto -lcrypt
+DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
 
 SSHDIR=		${.CURDIR}/../../../crypto/openssh-4
 CFLAGS+=	-I${SSHDIR}
diff --git a/lib/pam_module/pam_tacplus/Makefile b/lib/pam_module/pam_tacplus/Makefile
index 8790344456..c8f079db49 100644
--- a/lib/pam_module/pam_tacplus/Makefile
+++ b/lib/pam_module/pam_tacplus/Makefile
@@ -1,10 +1,11 @@
-# $DragonFly: src/lib/pam_module/pam_tacplus/Makefile,v 1.3 2005/07/12 23:30:24 joerg Exp $
+# $DragonFly: src/lib/pam_module/pam_tacplus/Makefile,v 1.4 2005/07/28 19:25:41 joerg Exp $
 
 LIB=	pam_tacplus
 SRCS=	pam_tacplus.c
 WARNS?=	6
 MAN=	pam_tacplus.8
 
+DPADD=	${LIBTACPLUS}
 LDADD=	-ltacplus
 
 .include <bsd.lib.mk>
diff --git a/lib/pam_module/pam_unix/Makefile b/lib/pam_module/pam_unix/Makefile
index f42d939559..4d2ba2da28 100644
--- a/lib/pam_module/pam_unix/Makefile
+++ b/lib/pam_module/pam_unix/Makefile
@@ -1,10 +1,11 @@
-# $DragonFly: src/lib/pam_module/pam_unix/Makefile,v 1.2 2005/07/12 23:30:24 joerg Exp $
+# $DragonFly: src/lib/pam_module/pam_unix/Makefile,v 1.3 2005/07/28 19:25:41 joerg Exp $
 
 LIB=	pam_unix
 SRCS=	pam_unix.c
 WARNS?=	2
 WARNS_NO_UNUSED_PARAMETERS=
 
+DPADD=	${LIBCRYPT}
 LDADD=	-lcrypt
 
 .include <bsd.lib.mk>