[src/trunk]: src/external/mit/xorg/bin/xdm In the PIC case, build libXdmGreet...

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

details:   https://anonhg.NetBSD.org/src/rev/80880a057f4b
branches:  trunk
changeset: 787399:80880a057f4b
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jun 16 01:51:29 2013 +0000

description:
In the PIC case, build libXdmGreet; perhaps we should always build and
link against it, even in the static case?

diffstat:

 external/mit/xorg/bin/xdm/Makefile         |   7 +++++--
 external/mit/xorg/bin/xdm/greeter/Makefile |  22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diffs (54 lines):

diff -r cd9b3ee9634b -r 80880a057f4b external/mit/xorg/bin/xdm/Makefile
--- a/external/mit/xorg/bin/xdm/Makefile        Sun Jun 16 00:13:58 2013 +0000
+++ b/external/mit/xorg/bin/xdm/Makefile        Sun Jun 16 01:51:29 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2013/06/06 09:13:41 mrg Exp $
+#      $NetBSD: Makefile,v 1.12 2013/06/16 01:51:29 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -11,6 +11,9 @@
 .if ${MKPIC} == "no"
 SRCS+=         Login.c greet.c verify.c
 CPPFLAGS+=     -DSTATIC_GREETER_LIB
+.else
+# XXX: Perhaps always build libXdmGreet and link against that?
+SUBDIR+=       greeter
 .endif
 
 CPPFLAGS+=             -DRETSIGTYPE=void
@@ -42,7 +45,7 @@
 DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
 .endif
 
-SUBDIR=                chooser config
+SUBDIR+=       chooser config
 TARGETS+=      configinstall
 
 .include "Makefile.xdm"
diff -r cd9b3ee9634b -r 80880a057f4b external/mit/xorg/bin/xdm/greeter/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/bin/xdm/greeter/Makefile        Sun Jun 16 01:51:29 2013 +0000
@@ -0,0 +1,22 @@
+#      $NetBSD: Makefile,v 1.1 2013/06/16 01:51:29 christos Exp $
+
+NOMAN= 1
+
+.include <bsd.own.mk>
+
+SHLIB_MAJOR=0
+SHLIB_MINOR=0
+LIB=   XdmGreet
+SRCS=  Login.c greet.c verify.c
+CPPFLAGS+= -DRETSIGTYPE=void
+
+LDADD+=        -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lXdmcp -lXinerama
+DPADD+=        ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
+       ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBXDMCP} ${LIBXINERAMA}
+
+.include "../Makefile.xdm"
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
+
+.PATH: ${X11SRCDIR.xdm}/greeter