Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-3]: src/x11/Xserver Pull up revision 1.1 (requested by jmc in tic...



details:   https://anonhg.NetBSD.org/src/rev/4c3a7cf39ef9
branches:  netbsd-3
changeset: 575175:4c3a7cf39ef9
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 06 20:59:49 2005 +0000

description:
Pull up revision 1.1 (requested by jmc in ticket #114):
Xdmx server

diffstat:

 x11/Xserver/Xserver/Xdmx/Makefile     |  60 +++++++++++++++++++++++++++++++++++
 x11/Xserver/hw/dmx/Makefile           |  47 +++++++++++++++++++++++++++
 x11/Xserver/hw/dmx/dmxconfig/Makefile |  25 ++++++++++++++
 x11/Xserver/hw/dmx/dmxinput/Makefile  |  26 +++++++++++++++
 4 files changed, 158 insertions(+), 0 deletions(-)

diffs (174 lines):

diff -r 7450d6704cc5 -r 4c3a7cf39ef9 x11/Xserver/Xserver/Xdmx/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/Xserver/Xdmx/Makefile Wed Apr 06 20:59:49 2005 +0000
@@ -0,0 +1,60 @@
+#      $NetBSD: Makefile,v 1.1.2.2 2005/04/06 20:59:49 tron Exp $
+
+.include <bsd.own.mk>
+
+PROG=  Xdmx
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/dmx
+
+.include "../Makefile.Xserver"
+
+LDADD+= ${LDADD.dix} \
+       ${LDADD.hw/dmx} \
+       ${LDADD.os} \
+       ${LDADD.randr} \
+       ${LDADD.hw/dmx/dmxconfig} \
+       ${LDADD.miext/shadow} \
+       ${LDADD.fb} \
+       ${LDADD.mi} \
+       ${LDADD.Xext/ext} \
+       ${LDADD.record} \
+       ${LDADD.xtrap} \
+       ${LDADD.xkb} \
+       ${LDADD.xinput} \
+       ${LDADD.lbx} \
+       -llbxutil \
+       ${LDADD.render} \
+       ${LDADD.hw/dmx/dmxinput} \
+       -lXfont \
+       -lfreetype \
+       ${LDADD.dix/xpstubs} \
+       -lXi -lXmu -lXt -lSM \
+       -lICE -lXext -lX11 \
+       -lXrender -lXext -lX11 \
+       -lz -lm -lXdmcp
+
+DPADD+= ${DPADD.dix} \
+       ${DPADD.hw/dmx} \
+       ${DPADD.os} \
+       ${DPADD.randr} \
+       ${DPADD.hw/dmx/dmxconfig} \
+       ${DPADD.miext/shadow} \
+       ${DPADD.fb} \
+       ${DPADD.mi} \
+       ${DPADD.Xext/ext} \
+       ${DPADD.record} \
+       ${DPADD.xtrap} \
+       ${DPADD.xkb} \
+       ${DPADD.xinput} \
+       ${DPADD.lbx} \
+       ${DPADD.render} \
+       ${DPADD.hw/dmx/dmxinput} \
+       ${DPADD.dix/xpstubs}
+
+.if ${MACHINE_ARCH} == "i386"
+LDADD+=        -li386
+DPADD+=        ${LIBI386}
+.endif
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff -r 7450d6704cc5 -r 4c3a7cf39ef9 x11/Xserver/hw/dmx/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/dmx/Makefile       Wed Apr 06 20:59:49 2005 +0000
@@ -0,0 +1,47 @@
+#      $NetBSD: Makefile,v 1.3.2.2 2005/04/06 20:59:49 tron Exp $
+
+.include "../../Makefile.serverlib"
+
+LIB=           dmx
+
+.PATH:         ${X11SRCDIR.xc}/programs/Xserver/hw/dmx
+SRCS=          dmxinit.c dmxscrinit.c dmxshadow.c dmxcursor.c dmxinput.c \
+               dmxdpms.c dmxgc.c dmxgcops.c dmxwindow.c dmxpixmap.c \
+               dmxfont.c dmxcmap.c dmxvisual.c dmxlog.c dmxcb.c dmxprop.c \
+               dmxstat.c dmxsync.c dmxextension.c dmxpict.c
+
+.PATH:          ${X11SRCDIR.xc}/programs/Xserver/mi
+SRCS+=         miinitext.c
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/dmx \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${X11SRCDIR.xc}/include/fonts \
+               -I${X11SRCDIR.xc}/programs/Xserver/mi \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+               -I${X11SRCDIR.xc}/programs/Xserver/os \
+               -I${X11SRCDIR.xc}/programs/Xserver/fb \
+               -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
+               -I${X11SRCDIR.xc}/programs/Xserver/render \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions \
+               -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+               -I${XSERVERINCDIR}
+
+CPPFLAGS+=     -DVENDOR_STRING="\"The XFree86 Project, Inc\"" \
+               -DVENDOR_RELEASE="${XVERSION}" \
+               -DOSNAME='"NetBSD/i386 2.99.16 [ELF]"' \
+               -DOSVENDOR='"The NetBSD Foundation, Inc."'
+
+CPPFLAGS+=     ${X11FLAGS.OS_DEFINES} \
+               ${X11FLAGS.EXTENSION} \
+               -DDMXEXT
+
+CPPFLAGS+=     -UGLXEXT -UXV -UDBE -UXF86VIDMODE -UXF86MISC -UXFreeXDGA \
+               -UMITSHM -UTOGCUP -UMITMISC -USCREENSAVER -URANDR -UFONTCACHE
+
+CPPFLAGS.miinitext.c=  -UDPMSExtension
+
+.include <bsd.x11.mk>
+XVERSION!=     ${PRINTX11VERSION}
+.include <bsd.lib.mk>
+SUBDIR=        dmxinput dmxconfig
+.include <bsd.subdir.mk>
diff -r 7450d6704cc5 -r 4c3a7cf39ef9 x11/Xserver/hw/dmx/dmxconfig/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/dmx/dmxconfig/Makefile     Wed Apr 06 20:59:49 2005 +0000
@@ -0,0 +1,25 @@
+#      $NetBSD: Makefile,v 1.1.2.2 2005/04/06 20:59:49 tron Exp $
+
+.include "../../../Makefile.serverlib"
+
+LIB=           dmxconfig
+
+.PATH:         ${X11SRCDIR.xc}/programs/Xserver/hw/dmx/config
+SRCS=          scanner.l parser.y parser.c scanner.c dmxparse.c dmxprint.c dmxcompat.c dmxconfig.c
+
+YHEADER=       # defined
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/dmx/config \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/dmx \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${X11SRCDIR.xc}/include/fonts \
+               -I${X11SRCDIR.xc}/programs/Xserver/mi \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+               -I${X11SRCDIR.xc}/programs/Xserver/render \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions \
+               -I. \
+               -I${XSERVERINCDIR}
+
+.include <bsd.x11.mk>
+XVERSION!=     ${PRINTX11VERSION}
+.include <bsd.lib.mk>
diff -r 7450d6704cc5 -r 4c3a7cf39ef9 x11/Xserver/hw/dmx/dmxinput/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/dmx/dmxinput/Makefile      Wed Apr 06 20:59:49 2005 +0000
@@ -0,0 +1,26 @@
+#      $NetBSD: Makefile,v 1.1.2.2 2005/04/06 20:59:49 tron Exp $
+
+.include "../../../Makefile.serverlib"
+
+LIB=           dmxinput
+
+.PATH:         ${X11SRCDIR.xc}/programs/Xserver/hw/dmx/input
+SRCS=          dmxdummy.c dmxbackend.c dmxconsole.c dmxcommon.c \
+               dmxinputinit.c dmxarg.c dmxsigio.c dmxevents.c \
+               dmxxinput.c dmxmotion.c dmxeq.c dmxmap.c ChkNotMaskEv.c
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/dmx/input \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/dmx \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${X11SRCDIR.xc}/include/fonts \
+               -I${X11SRCDIR.xc}/programs/Xserver/mi \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+               -I${X11SRCDIR.xc}/programs/Xserver/render \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions \
+               -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+               -I${X11SRCDIR.xc}/programs/Xserver/Xi \
+               -I${XSERVERINCDIR}
+
+.include <bsd.x11.mk>
+XVERSION!=     ${PRINTX11VERSION}
+.include <bsd.lib.mk>



Home | Main Index | Thread Index | Old Index