Module Name: src Committed By: christos Date: Sun Jun 16 01:51:29 UTC 2013
Modified Files: src/external/mit/xorg/bin/xdm: Makefile Added Files: src/external/mit/xorg/bin/xdm/greeter: Makefile Log Message: In the PIC case, build libXdmGreet; perhaps we should always build and link against it, even in the static case? To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/bin/xdm/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/xdm/greeter/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/mit/xorg/bin/xdm/Makefile diff -u src/external/mit/xorg/bin/xdm/Makefile:1.11 src/external/mit/xorg/bin/xdm/Makefile:1.12 --- src/external/mit/xorg/bin/xdm/Makefile:1.11 Thu Jun 6 05:13:41 2013 +++ src/external/mit/xorg/bin/xdm/Makefile Sat Jun 15 21:51:29 2013 @@ -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 @@ SRCS= access.c auth.c choose.c daemon.c .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 @@ LDADD+= -lpam ${PAM_STATIC_LDADD} DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD} .endif -SUBDIR= chooser config +SUBDIR+= chooser config TARGETS+= configinstall .include "Makefile.xdm" Added files: Index: src/external/mit/xorg/bin/xdm/greeter/Makefile diff -u /dev/null src/external/mit/xorg/bin/xdm/greeter/Makefile:1.1 --- /dev/null Sat Jun 15 21:51:29 2013 +++ src/external/mit/xorg/bin/xdm/greeter/Makefile Sat Jun 15 21:51:29 2013 @@ -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