From aab0c4649e53131502c670f04cd2cabec488bebe Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Wed, 10 Apr 2002 18:07:05 +0000
Subject: Moved SHLIB_NAME definition into one place.

Approved by:	des
---
 lib/libpam/modules/Makefile.inc              | 1 +
 lib/libpam/modules/pam_deny/Makefile         | 3 +--
 lib/libpam/modules/pam_ftp/Makefile          | 1 -
 lib/libpam/modules/pam_kerberosIV/Makefile   | 3 +--
 lib/libpam/modules/pam_krb5/Makefile         | 3 +--
 lib/libpam/modules/pam_lastlog/Makefile      | 1 -
 lib/libpam/modules/pam_login_access/Makefile | 1 -
 lib/libpam/modules/pam_nologin/Makefile      | 1 -
 lib/libpam/modules/pam_opie/Makefile         | 3 +--
 lib/libpam/modules/pam_opieaccess/Makefile   | 1 -
 lib/libpam/modules/pam_passwdqc/Makefile     | 1 -
 lib/libpam/modules/pam_permit/Makefile       | 3 +--
 lib/libpam/modules/pam_radius/Makefile       | 3 +--
 lib/libpam/modules/pam_rootok/Makefile       | 1 -
 lib/libpam/modules/pam_securetty/Makefile    | 1 -
 lib/libpam/modules/pam_self/Makefile         | 1 -
 lib/libpam/modules/pam_ssh/Makefile          | 1 -
 lib/libpam/modules/pam_tacplus/Makefile      | 3 +--
 lib/libpam/modules/pam_unix/Makefile         | 3 +--
 lib/libpam/modules/pam_wheel/Makefile        | 1 -
 20 files changed, 9 insertions(+), 27 deletions(-)

(limited to 'lib/libpam')

diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc
index 70f85db..66b62d2 100644
--- a/lib/libpam/modules/Makefile.inc
+++ b/lib/libpam/modules/Makefile.inc
@@ -4,6 +4,7 @@ PAMDIR=		${.CURDIR}/../../../../contrib/openpam
 
 INTERNALLIB=	yes
 INTERNALSTATICLIB=yes
+SHLIB_NAME?=	${LIB}.so.${SHLIB_MAJOR}
 
 CFLAGS+=	-I${PAMDIR}/include
 CFLAGS+=	-I${.CURDIR}/../../libpam
diff --git a/lib/libpam/modules/pam_deny/Makefile b/lib/libpam/modules/pam_deny/Makefile
index adbda34..005e00e 100644
--- a/lib/libpam/modules/pam_deny/Makefile
+++ b/lib/libpam/modules/pam_deny/Makefile
@@ -22,10 +22,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+# $FreeBSD$
 
 LIB=		pam_deny
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_deny.c
 MAN=		pam_deny.8
 
diff --git a/lib/libpam/modules/pam_ftp/Makefile b/lib/libpam/modules/pam_ftp/Makefile
index 414325e..c7536d3 100644
--- a/lib/libpam/modules/pam_ftp/Makefile
+++ b/lib/libpam/modules/pam_ftp/Makefile
@@ -25,7 +25,6 @@
 # $FreeBSD$
 
 LIB=		pam_ftp
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_ftp.c
 MAN=		pam_ftp.8
 
diff --git a/lib/libpam/modules/pam_kerberosIV/Makefile b/lib/libpam/modules/pam_kerberosIV/Makefile
index 14c925b..4c67925 100644
--- a/lib/libpam/modules/pam_kerberosIV/Makefile
+++ b/lib/libpam/modules/pam_kerberosIV/Makefile
@@ -22,10 +22,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+# $FreeBSD$
 
 LIB=		pam_kerberosIV
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_kerberosIV.c klogin.c
 NO_WERROR=	yes
 CFLAGS+=	-DKERBEROS
diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile
index 378af37..d65d3b4 100644
--- a/lib/libpam/modules/pam_krb5/Makefile
+++ b/lib/libpam/modules/pam_krb5/Makefile
@@ -22,10 +22,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+# $FreeBSD$
 
 LIB=		pam_krb5
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_krb5.c
 NO_WERROR=	yes
 DPADD=		${LIBKRB5} ${LIBGSSAPI} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \
diff --git a/lib/libpam/modules/pam_lastlog/Makefile b/lib/libpam/modules/pam_lastlog/Makefile
index 8a516ed..1e7290e 100644
--- a/lib/libpam/modules/pam_lastlog/Makefile
+++ b/lib/libpam/modules/pam_lastlog/Makefile
@@ -25,7 +25,6 @@
 # $FreeBSD$
 
 LIB=		pam_lastlog
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_lastlog.c
 DPADD=		${LIBUTIL}
 LDADD=		-lutil
diff --git a/lib/libpam/modules/pam_login_access/Makefile b/lib/libpam/modules/pam_login_access/Makefile
index 2235292..d31d6cc 100644
--- a/lib/libpam/modules/pam_login_access/Makefile
+++ b/lib/libpam/modules/pam_login_access/Makefile
@@ -25,7 +25,6 @@
 # $FreeBSD$
 
 LIB=		pam_login_access
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_login_access.c login_access.c
 MAN=		pam_login_access.8
 
diff --git a/lib/libpam/modules/pam_nologin/Makefile b/lib/libpam/modules/pam_nologin/Makefile
index d907dae..a6129eb 100644
--- a/lib/libpam/modules/pam_nologin/Makefile
+++ b/lib/libpam/modules/pam_nologin/Makefile
@@ -25,7 +25,6 @@
 # $FreeBSD$
 
 LIB=		pam_nologin
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_nologin.c
 DPADD=		${LIBUTIL}
 LDADD=		-lutil
diff --git a/lib/libpam/modules/pam_opie/Makefile b/lib/libpam/modules/pam_opie/Makefile
index 330b4cc..c6f1708 100644
--- a/lib/libpam/modules/pam_opie/Makefile
+++ b/lib/libpam/modules/pam_opie/Makefile
@@ -23,10 +23,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+# $FreeBSD$
 
 LIB=		pam_opie
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_opie.c
 DPADD=		${LIBOPIE}
 LDADD=		-lopie
diff --git a/lib/libpam/modules/pam_opieaccess/Makefile b/lib/libpam/modules/pam_opieaccess/Makefile
index 2be222c..6546845 100644
--- a/lib/libpam/modules/pam_opieaccess/Makefile
+++ b/lib/libpam/modules/pam_opieaccess/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 LIB=		pam_opieaccess
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		${LIB}.c
 DPADD=		${LIBOPIE}
 LDADD=		-lopie
diff --git a/lib/libpam/modules/pam_passwdqc/Makefile b/lib/libpam/modules/pam_passwdqc/Makefile
index ddb5cbd..1c12fcb 100644
--- a/lib/libpam/modules/pam_passwdqc/Makefile
+++ b/lib/libpam/modules/pam_passwdqc/Makefile
@@ -3,7 +3,6 @@
 SRCDIR=		${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc
 
 LIB=		pam_passwdqc
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c
 CFLAGS+=	-I${SRCDIR} -DPAM_AUTHTOK_RECOVER_ERR=PAM_AUTHTOK_RECOVERY_ERR
 MAN=		#pam_passwdqc.8
diff --git a/lib/libpam/modules/pam_permit/Makefile b/lib/libpam/modules/pam_permit/Makefile
index e549b03..7a60cd7 100644
--- a/lib/libpam/modules/pam_permit/Makefile
+++ b/lib/libpam/modules/pam_permit/Makefile
@@ -22,10 +22,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+# $FreeBSD$
 
 LIB=		pam_permit
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_permit.c
 MAN=		pam_permit.8
 
diff --git a/lib/libpam/modules/pam_radius/Makefile b/lib/libpam/modules/pam_radius/Makefile
index be084b2..af75f0b 100644
--- a/lib/libpam/modules/pam_radius/Makefile
+++ b/lib/libpam/modules/pam_radius/Makefile
@@ -22,10 +22,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+# $FreeBSD$
 
 LIB=		pam_radius
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_radius.c
 DPADD=		${LIBRADIUS}
 LDADD=		-lradius
diff --git a/lib/libpam/modules/pam_rootok/Makefile b/lib/libpam/modules/pam_rootok/Makefile
index 809bae1..74433fc 100644
--- a/lib/libpam/modules/pam_rootok/Makefile
+++ b/lib/libpam/modules/pam_rootok/Makefile
@@ -25,7 +25,6 @@
 # $FreeBSD$
 
 LIB=		pam_rootok
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_rootok.c
 MAN=		pam_rootok.8
 
diff --git a/lib/libpam/modules/pam_securetty/Makefile b/lib/libpam/modules/pam_securetty/Makefile
index bdecfde..adfd925 100644
--- a/lib/libpam/modules/pam_securetty/Makefile
+++ b/lib/libpam/modules/pam_securetty/Makefile
@@ -25,7 +25,6 @@
 # $FreeBSD$
 
 LIB=		pam_securetty
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_securetty.c
 MAN=		pam_securetty.8
 
diff --git a/lib/libpam/modules/pam_self/Makefile b/lib/libpam/modules/pam_self/Makefile
index 985dd4e..671ff1a 100644
--- a/lib/libpam/modules/pam_self/Makefile
+++ b/lib/libpam/modules/pam_self/Makefile
@@ -25,7 +25,6 @@
 # $FreeBSD$
 
 LIB=		pam_self
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_self.c
 MAN=		pam_self.8
 
diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile
index 945bb4c..c069f9b 100644
--- a/lib/libpam/modules/pam_ssh/Makefile
+++ b/lib/libpam/modules/pam_ssh/Makefile
@@ -4,7 +4,6 @@
 SSHSRC=	${.CURDIR}/../../../../crypto/openssh
 
 LIB=		pam_ssh
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_ssh.c
 CFLAGS+=	-I${SSHSRC}
 DPADD=		${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL}
diff --git a/lib/libpam/modules/pam_tacplus/Makefile b/lib/libpam/modules/pam_tacplus/Makefile
index 5c5deb5..04f3764 100644
--- a/lib/libpam/modules/pam_tacplus/Makefile
+++ b/lib/libpam/modules/pam_tacplus/Makefile
@@ -22,10 +22,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+# $FreeBSD$
 
 LIB=		pam_tacplus
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_tacplus.c
 DPADD=		${LIBTACPLUS}
 LDADD=		-ltacplus
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile
index 3a6050c..883d16c 100644
--- a/lib/libpam/modules/pam_unix/Makefile
+++ b/lib/libpam/modules/pam_unix/Makefile
@@ -22,10 +22,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+# $FreeBSD$
 
 LIB=		pam_unix
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_unix.c pw_copy.c pw_yp.c pw_util.c ypxfr_misc.c ${GENSRCS}
 CFLAGS+=	-DYP -Dyp_error=warnx \
 		-I. \
diff --git a/lib/libpam/modules/pam_wheel/Makefile b/lib/libpam/modules/pam_wheel/Makefile
index b09e115..95479ce 100644
--- a/lib/libpam/modules/pam_wheel/Makefile
+++ b/lib/libpam/modules/pam_wheel/Makefile
@@ -25,7 +25,6 @@
 # $FreeBSD$
 
 LIB=		pam_wheel
-SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
 SRCS=		pam_wheel.c
 MAN=		pam_wheel.8
 
-- 
cgit v1.1