[src/trunk]: src/x11 Convert to using PAM_STATIC_LDADD / PAM_STATIC_DPADD ins...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ef95a926b9bc
branches:  trunk
changeset: 580806:ef95a926b9bc
user:      he <he%NetBSD.org@localhost>
date:      Mon May 09 16:15:48 2005 +0000

description:
Convert to using PAM_STATIC_LDADD / PAM_STATIC_DPADD instead of directly
listing the needed libraries.

diffstat:

 x11/Xserver/Xserver/Makefile.Xserver |  6 +++---
 x11/bin/xdm/Makefile.xdm             |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 70e0b4b7bbfe -r ef95a926b9bc x11/Xserver/Xserver/Makefile.Xserver
--- a/x11/Xserver/Xserver/Makefile.Xserver      Mon May 09 14:36:39 2005 +0000
+++ b/x11/Xserver/Xserver/Makefile.Xserver      Mon May 09 16:15:48 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.Xserver,v 1.20 2005/05/08 19:21:01 he Exp $
+#      $NetBSD: Makefile.Xserver,v 1.21 2005/05/09 16:15:48 he Exp $
 
 .for _SL in    dix os mi printer printer/pcl printer/ps printer/raster \
                Xext/ext Xext/exts GL/glx GL/GLcore xkb xinput lbx dbe \
@@ -25,8 +25,8 @@
 DPADD.${_SL}=  ${LIBDIR.${_SL}}/lib${_SL:T}.a
 .endfor
 .if (${USE_PAM} != "no")
-LDADD.os +=-lpam -lrpcsvc -lutil -lcrypt
-DPADD.os +=${LIBPAM} ${LIBRPCSVC} ${LIBUTIL} ${LIBCRYPT}
+LDADD.os +=-lpam ${PAM_STATIC_LDADD}
+DPADD.os +=${LIBPAM} ${PAM_STATIC_DPADD}
 .endif
 
 LIBCWRAPPER=   ${LIBDIR.os}/libc_wrapper.o
diff -r 70e0b4b7bbfe -r ef95a926b9bc x11/bin/xdm/Makefile.xdm
--- a/x11/bin/xdm/Makefile.xdm  Mon May 09 14:36:39 2005 +0000
+++ b/x11/bin/xdm/Makefile.xdm  Mon May 09 16:15:48 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xdm,v 1.10 2005/05/08 17:47:13 he Exp $
+#      $NetBSD: Makefile.xdm,v 1.11 2005/05/09 16:15:49 he Exp $
 
 XDMVARDIR=     /var/db/xdm
 XDMDIR=                ${X11ETCDIR}/xdm
@@ -17,8 +17,8 @@
 
 .if (${USE_PAM} != "no")
 CPPFLAGS+=     -DUSE_PAM
-LDADD+=                -lpam -lrpcsvc -lutil -lcrypt
-DPADD+=                ${LIBPAM} ${LIBRPCSVC} ${LIBUTIL} ${LIBCRYPT}
+LDADD+=                -lpam ${PAM_STATIC_LDADD}
+DPADD+=                ${LIBPAM} ${PAM_STATIC_DPADD}
 .endif
 
 .PATH:         ${X11SRCDIR.xc}/programs/xdm