Sun Jun 16 01:51:29 2013 UTC ()
In the PIC case, build libXdmGreet; perhaps we should always build and
link against it, even in the static case?


(christos)
diff -r1.11 -r1.12 src/external/mit/xorg/bin/xdm/Makefile
diff -r0 -r1.1 src/external/mit/xorg/bin/xdm/greeter/Makefile
cvs diff -r1.11 -r1.12 src/external/mit/xorg/bin/xdm/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xdm/Makefile 2013/06/06 09:13:41 1.11
+++ src/external/mit/xorg/bin/xdm/Makefile 2013/06/16 01:51:29 1.12
@@ -1,26 +1,29 @@ @@ -1,26 +1,29 @@
1# $NetBSD: Makefile,v 1.11 2013/06/06 09:13:41 mrg Exp $ 1# $NetBSD: Makefile,v 1.12 2013/06/16 01:51:29 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= xdm 5PROG= xdm
6SRCS= access.c auth.c choose.c daemon.c dm.c dpylist.c \ 6SRCS= access.c auth.c choose.c daemon.c dm.c dpylist.c \
7 error.c file.c genauth.c mitauth.c netaddr.c policy.c \ 7 error.c file.c genauth.c mitauth.c netaddr.c policy.c \
8 protodpy.c reset.c resource.c server.c session.c socket.c \ 8 protodpy.c reset.c resource.c server.c session.c socket.c \
9 streams.c util.c xdmauth.c xdmcp.c prngc.c 9 streams.c util.c xdmauth.c xdmcp.c prngc.c
10 10
11.if ${MKPIC} == "no" 11.if ${MKPIC} == "no"
12SRCS+= Login.c greet.c verify.c 12SRCS+= Login.c greet.c verify.c
13CPPFLAGS+= -DSTATIC_GREETER_LIB 13CPPFLAGS+= -DSTATIC_GREETER_LIB
 14.else
 15# XXX: Perhaps always build libXdmGreet and link against that?
 16SUBDIR+= greeter
14.endif 17.endif
15 18
16CPPFLAGS+= -DRETSIGTYPE=void 19CPPFLAGS+= -DRETSIGTYPE=void
17CPPFLAGS.auth.c= -DBSD44SOCKETS 20CPPFLAGS.auth.c= -DBSD44SOCKETS
18CPPFLAGS.socket.c= -DBSD44SOCKETS 21CPPFLAGS.socket.c= -DBSD44SOCKETS
19CPPFLAGS.xdmcp.c= -DBSD44SOCKETS 22CPPFLAGS.xdmcp.c= -DBSD44SOCKETS
20CPPFLAGS.xdmshell.c= -DHAS_VFORK 23CPPFLAGS.xdmshell.c= -DHAS_VFORK
21CPPFLAGS.resource.c= \ 24CPPFLAGS.resource.c= \
22 -DDEF_SERVER_LINE="\":0 local ${X11BINDIR}/X :0\"" \ 25 -DDEF_SERVER_LINE="\":0 local ${X11BINDIR}/X :0\"" \
23 -DXRDB_PROGRAM=\"${X11BINDIR}/xrdb\" \ 26 -DXRDB_PROGRAM=\"${X11BINDIR}/xrdb\" \
24 -DDEF_SESSION="\"${X11BINDIR}/xterm -ls\"" \ 27 -DDEF_SESSION="\"${X11BINDIR}/xterm -ls\"" \
25 -DDEF_USER_PATH=\"/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:${X11BINDIR}\" \ 28 -DDEF_USER_PATH=\"/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:${X11BINDIR}\" \
26 -DDEF_SYSTEM_PATH=\"/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR}\" \ 29 -DDEF_SYSTEM_PATH=\"/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR}\" \
@@ -32,27 +35,27 @@ CPPFLAGS.resource.c= \ @@ -32,27 +35,27 @@ CPPFLAGS.resource.c= \
32 35
33LDADD+= -lXau -lXdmcp -lXft -lXinerama -lXpm 36LDADD+= -lXau -lXdmcp -lXft -lXinerama -lXpm
34LDADD+= -lXmu -lXt -lSM -lICE -lXext -lXrender -lX11 37LDADD+= -lXmu -lXt -lSM -lICE -lXext -lXrender -lX11
35LDADD+= -lcrypt -lfreetype -lutil 38LDADD+= -lcrypt -lfreetype -lutil
36DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXFT} ${LIBXINERAMA} ${LIBXPM} 39DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXFT} ${LIBXINERAMA} ${LIBXPM}
37DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} 40DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
38DPADD+= ${LIBCRYPT} ${LIBFREETYPE} ${LIBUTIL} 41DPADD+= ${LIBCRYPT} ${LIBFREETYPE} ${LIBUTIL}
39 42
40.if (${USE_PAM} != "no") 43.if (${USE_PAM} != "no")
41LDADD+= -lpam ${PAM_STATIC_LDADD} 44LDADD+= -lpam ${PAM_STATIC_LDADD}
42DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD} 45DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
43.endif 46.endif
44 47
45SUBDIR= chooser config 48SUBDIR+= chooser config
46TARGETS+= configinstall 49TARGETS+= configinstall
47 50
48.include "Makefile.xdm" 51.include "Makefile.xdm"
49 52
50CPPFLAGS.resource.c+= -DDEF_CHOOSER=\"${XDMCHOOSERPATH}\" 53CPPFLAGS.resource.c+= -DDEF_CHOOSER=\"${XDMCHOOSERPATH}\"
51 54
52X11MANCPP= yes 55X11MANCPP= yes
53X11EXTRAMANDEFS+= -DARC4_RANDOM \ 56X11EXTRAMANDEFS+= -DARC4_RANDOM \
54 -DCHOOSERPATH=${XDMCHOOSERPATH} \ 57 -DCHOOSERPATH=${XDMCHOOSERPATH} \
55 -DGREETERLIBPATH=${XDMGREETERLIB} \ 58 -DGREETERLIBPATH=${XDMGREETERLIB} \
56 -DXDMDIR=${XDMDIR} \ 59 -DXDMDIR=${XDMDIR} \
57 -DXDMXAUTHDIR=${XDMVARDIR} \ 60 -DXDMXAUTHDIR=${XDMVARDIR} \
58 -DXDMLOGDIR=${XDMLOGDIR} \ 61 -DXDMLOGDIR=${XDMLOGDIR} \
File Added: src/external/mit/xorg/bin/xdm/greeter/Attic/Makefile
#	$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