Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ Reachover for XdecNetBSD, XalphaNetBSD, Xarm32VIDC 

XXX certain extensions should/should not be built and linked that are.
XXX X -> symlink defaults may not be appropriate.
This commit is contained in:
rtr 2004-01-18 05:35:03 +00:00
parent a6ced7eb12
commit c3936a1977
14 changed files with 322 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
x11/Xserver/Makefile.common
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.8 2004/01/17 04:06:18 rtr Exp $
# $NetBSD: Makefile.common,v 1.9 2004/01/18 05:35:03 rtr Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@ -46,6 +46,18 @@ XSERVER_XAMIGA= yes
XSERVER_HAS_AFB= yes
.endif
.if ${MACHINE} == "alpha" || ${MACHINE} == "pmax"
XSERVER_XDECNETBSD= yes
.endif
.if ${MACHINE} == "acorn32"
XSERVER_XARM32VIDC= yes
.endif
.if ${MACHINE} == "alpha"
XSERVER_XALPHANETBSD= yes
.endif
# Does this server need Xfont/fontbase libraries?
XSERVER_NEEDS_XFONT?= no
# Does this server use cfb* libraries?
@ -73,3 +85,9 @@ XSERVER_XAMIGA?=no
XSERVER_XVFB?= yes
# Does this platform build the Xmac68k X server?
XSERVER_XMAC68K?= no
# Does this platform build the XdecNetBSD server?
XSERVER_XDECNETBSD?= no
# Does this platform build the Xarm32VIDC server?
XSERVER_XARM32VIDC?= no
# Does this platform build the XalphaNetBSD server?
XSERVER_XALPHANETBSD?= no

14
x11/Xserver/Xserver/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2004/01/17 04:03:26 rtr Exp $
# $NetBSD: Makefile,v 1.11 2004/01/18 05:35:03 rtr Exp $
.include <bsd.own.mk>
@ -34,6 +34,18 @@ SUBDIR+= Xmac68k
SUBDIR+= Xamiga
.endif
.if ${XSERVER_XDECNETBSD} == "yes"
SUBDIR+= XdecNetBSD
.endif
.if ${XSERVER_XALPHANETBSD} == "yes"
SUBDIR+= XalphaNetBSD
.endif
.if ${XSERVER_XARM32VIDC} == "yes"
SUBDIR+= Xarm32VIDC
.endif
.include "Makefile.Xserver"
.include <bsd.subdir.mk>

5
x11/Xserver/Xserver/Makefile.Xserver
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.Xserver,v 1.12 2004/01/17 04:03:26 rtr Exp $
# $NetBSD: Makefile.Xserver,v 1.13 2004/01/18 05:35:03 rtr Exp $
.PATH: ${NETBSDSRCDIR}/x11/Xserver/Xserver
@ -11,7 +11,8 @@
hw/xfree86/xf86config hw/xfree86/loader \
\
hw/netbsd/macppc hw/netbsd/hpc hw/netbsd/x68k \
hw/netbsd/mac68k hw/netbsd/amiga
hw/netbsd/mac68k hw/netbsd/amiga hw/netbsd/dec \
hw/netbsd/arm32vidc hw/netbsd/alpha
.if !defined(LIBDIR.${_SL})
LIBDIR.${_SL}!= cd ${NETBSDSRCDIR}/x11/Xserver/${_SL} && ${PRINTOBJDIR}

29
x11/Xserver/Xserver/XalphaNetBSD/Makefile Normal file
View File

@ -0,0 +1,29 @@
# $NetBSD: Makefile,v 1.1 2004/01/18 05:35:04 rtr Exp $
.include <bsd.own.mk>
PROG= XalphaNetBSD
BINMODE=4711
MKMAN= no
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/alpha
.include "../Makefile.Xserver"
LDADD= ${LDADD.dix} ${LDADD.hw/netbsd/alpha} ${LDADD.os} -lXfont \
-lfreetype ${LDADD.cfb} ${LDADD.cfb32} ${LDADD.mfb} ${LDADD.xkb} \
${LDADD.mi} ${LDADD.Xext/ext} ${LDADD.lbx} \
-llbxutil ${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} \
${LDADD.dbe} ${LDADD.record} ${LDADD.GL/glx} ${LDADD.GL/GLcore} \
-lXau -lXdmcp -lz -lm
DPADD= ${DPADD.dix} ${DPADD.hw/netbsd/alpha} ${DPADD.os} \
${LIBXFONT} ${LIBFREETYPE} ${DPADD.cfb} ${DPADD.cfb16} \
${DPADD.mfb} ${DPADD.xkb} ${DPADD.mi} ${DPADD.Xext/ext} \
${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render \
${DPADD.dix/xpstubs} ${DPADD.dbe} ${DPADD.record} \
${DPADD.GL/glx} ${LDADD.GL/GLcore} ${LIBXAU} ${LIBXDMCP} \
${LIBZ} ${LIBM}
.include <bsd.x11.mk>
.include <bsd.prog.mk>

1
x11/Xserver/Xserver/XalphaNetBSD/XalphaNetBSD.c Normal file
View File

@ -0,0 +1 @@
/* $NetBSD: XalphaNetBSD.c,v 1.1 2004/01/18 05:35:04 rtr Exp $ */

31
x11/Xserver/Xserver/Xarm32VIDC/Makefile Normal file
View File

@ -0,0 +1,31 @@
# $NetBSD: Makefile,v 1.1 2004/01/18 05:35:04 rtr Exp $
.include <bsd.own.mk>
PROG= Xarm32VIDC
BINMODE=4711
MKMAN= no
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/arm32vidc
.include "../Makefile.Xserver"
LDADD= ${LDADD.dix} ${LDADD.hw/netbsd/arm32vidc} ${LDADD.os} -lXfont \
-lfreetype ${LDADD.cfb} ${LDADD.cfb16} ${LDADD.mfb} ${LDADD.xkb} \
${LDADD.mi} ${LDADD.Xext/ext} ${LDADD.lbx} \
-llbxutil ${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} \
${LDADD.dbe} ${LDADD.record} ${LDADD.GL/glx} ${LDADD.GL/GLcore} \
-lXau -lXdmcp -lz -lm
DPADD= ${DPADD.dix} ${DPADD.hw/netbsd/arm32vidc} ${DPADD.os} \
${LIBXFONT} ${LIBFREETYPE} ${DPADD.cfb} ${DPADD.cfb16} \
${DPADD.mfb} ${DPADD.xkb} ${DPADD.mi} ${DPADD.Xext/ext} \
${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render \
${DPADD.dix/xpstubs} ${DPADD.dbe} ${DPADD.record} \
${DPADD.GL/glx} ${LDADD.GL/GLcore} ${LIBXAU} ${LIBXDMCP} \
${LIBZ} ${LIBM}
SYMLINKS= ${X11BINDIR}/Xarm32VIDC ${X11BINDIR}/X
.include <bsd.x11.mk>
.include <bsd.prog.mk>

1
x11/Xserver/Xserver/Xarm32VIDC/Xarm32VIDC.c Normal file
View File

@ -0,0 +1 @@
/* $NetBSD: Xarm32VIDC.c,v 1.1 2004/01/18 05:35:04 rtr Exp $ */

30
x11/Xserver/Xserver/XdecNetBSD/Makefile Normal file
View File

@ -0,0 +1,30 @@
# $NetBSD: Makefile,v 1.1 2004/01/18 05:35:04 rtr Exp $
.include <bsd.own.mk>
PROG= XdecNetBSD
MKMAN= no
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec
.include "../Makefile.Xserver"
LDADD= ${LDADD.dix} ${LDADD.hw/netbsd/dec} ${LDADD.os} -lXfont \
-lfreetype ${LDADD.cfb} ${LDADD.cfb32} ${LDADD.mfb} ${LDADD.xkb} \
${LDADD.mi} ${LDADD.Xext/ext} ${LDADD.xinput} ${LDADD.lbx} \
-llbxutil ${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} \
${LDADD.dbe} ${LDADD.record} ${LDADD.GL/glx} \
${LDADD.GL/GLcore} -lXau -lXdmcp -lz -lm
DPADD= ${DPADD.dix} ${DPADD.hw/netbsd/dec} ${DPADD.os} ${LIBXFONT} \
${LIBFREETYPE} ${DPADD.cfb} ${DPADD.cfb32} ${DPADD.mfb} \
${DPADD.xkb} ${DPADD.mi} ${DPADD.Xext/ext} ${DPADD.xinput} \
${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} \
${DPADD.dix/xpstubs} ${DPADD.dbe} ${DPADD.record} \
${DPADD.GL/glx} ${DPADD.GL/GLcore} ${LIBXAU} ${LIBXDMCP} \
${LIBZ} ${LIBM}
SYMLINKS= ${X11BINDIR}/XdecNetBSD ${X11BINDIR}/X
.include <bsd.x11.mk>
.include <bsd.prog.mk>

1
x11/Xserver/Xserver/XdecNetBSD/XdecNetBSD.c Normal file
View File

@ -0,0 +1 @@
/* $NetBSD: XdecNetBSD.c,v 1.1 2004/01/18 05:35:04 rtr Exp $ */

14
x11/Xserver/hw/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2004/01/17 03:56:25 rtr Exp $
# $NetBSD: Makefile,v 1.11 2004/01/18 05:35:03 rtr Exp $
.include "../Makefile.common"
@ -36,4 +36,16 @@ SUBDIR+=netbsd/mac68k
SUBDIR+=netbsd/amiga
.endif
.if ${XSERVER_XDECNETBSD} != "no"
SUBDIR+=netbsd/dec
.endif
.if ${XSERVER_XARM32VIDC} != "no"
SUBDIR+=netbsd/arm32vidc
.endif
.if ${XSERVER_XALPHANETBSD} != "no"
SUBDIR+=netbsd/alpha
.endif
.include <bsd.subdir.mk>

59
x11/Xserver/hw/netbsd/alpha/Makefile Normal file
View File

@ -0,0 +1,59 @@
# $NetBSD: Makefile,v 1.1 2004/01/18 05:35:04 rtr Exp $
.include "../../../Makefile.serverlib"
.include <bsd.own.mk>
LIB= alpha
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/alpha
SRCS= alphaFbs.c alphaIo.c alphaCursor.c alphaKbd.c alphaMouse.c \
alphaKeyMap.c alphaInit.c alphaInEx.c
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/alpha/sfb
SRCS+= alphaSFB.c sfbgc.c sfbbitblt.c sfbblt.c sfbwindow.c sfbsimpleblt.c \
sfb32gc.c sfb32bitblt.c sfb32blt.c sfb32window.c
CPPFLAGS.sfb32gc.c= -DPSZ=32
CPPFLAGS.sfb32bitblt.c= -DPSZ=32
CPPFLAGS.sfb32blt.c= -DPSZ=32
CPPFLAGS.sfb32window.c= -DPSZ=32
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/alpha/tga
SRCS+= alphaTGA.c tgagc.c tgabitblt.c tgablt.c tgawindow.c tgasimpleblt.c \
tga32gc.c tga32bitblt.c tga32blt.c tga32window.c
CPPFLAGS.tga32gc.c= -DPSZ=32
CPPFLAGS.tga32bitblt.c= -DPSZ=32
CPPFLAGS.tga32blt.c= -DPSZ=32
CPPFLAGS.tga32window.c= -DPSZ=32
XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/alpha \
-I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/alpha/sfb \
-I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/alpha/tga \
-I${X11SRCDIR.xc}/programs/Xserver/mfb \
-I${X11SRCDIR.xc}/programs/Xserver/mi \
-I${X11SRCDIR.xc}/programs/Xserver/cfb \
-I${X11SRCDIR.xc}/programs/Xserver/include \
-I${X11SRCDIR.xc}/programs/Xserver/os \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${X11SRCDIR.xc}/include/fonts \
-I${XSERVERINCDIR}
CPPFLAGS.alphaKbd.c= -Wno-error
BUILDSYMLINKS+= ../../../mi/miinitext.c alphaInEx.c \
sfbgc.c sfb32gc.c \
sfbbitblt.c sfb32bitblt.c \
sfbblt.c sfb32blt.c \
sfbwindow.c sfb32window.c \
tgagc.c tga32gc.c \
tgabitblt.c tga32bitblt.c \
tgablt.c tga32blt.c \
tgawindow.c tga32window.c
.include <bsd.x11.mk>
.include <bsd.lib.mk>

26
x11/Xserver/hw/netbsd/arm32vidc/Makefile Normal file
View File

@ -0,0 +1,26 @@
# $NetBSD: Makefile,v 1.1 2004/01/18 05:35:04 rtr Exp $
.include "../../../Makefile.serverlib"
.include <bsd.own.mk>
LIB= arm32vidc
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/arm32vidc
SRCS= vidc.c rpccons.c wscons.c arm32vidcInEx.c
XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/arm32vidc \
-I${X11SRCDIR.xc}/programs/Xserver/mfb \
-I${X11SRCDIR.xc}/programs/Xserver/mi \
-I${X11SRCDIR.xc}/programs/Xserver/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xc}/include/fonts \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${XSERVERINCDIR}
BUILDSYMLINKS+= ../../../mi/miinitext.c arm32vidcInEx.c
.include <bsd.x11.mk>
.include <bsd.lib.mk>

93
x11/Xserver/hw/netbsd/dec/Makefile Normal file
View File

@ -0,0 +1,93 @@
# $NetBSD: Makefile,v 1.1 2004/01/18 05:35:04 rtr Exp $
.include "../../../Makefile.serverlib"
.include <bsd.own.mk>
LIB= dec
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec
SRCS= decInit.c decFbs.c decIo.c decCursor.c decKbd.c decKeyMap.c \
decColormap.c decMouse.c decInEx.c
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec/sfb
SRCS+= decSFB.c sfbgc.c sfbbitblt.c sfbblt.c sfbwindow.c sfbsimpleblt.c \
sfb32gc.c sfb32bitblt.c sfb32blt.c sfb32window.c
CPPFLAGS.sfb32gc.c= -DPSZ=32
CPPFLAGS.sfb32bitblt.c= -DPSZ=32
CPPFLAGS.sfb32blt.c= -DPSZ=32
CPPFLAGS.sfb32window.c= -DPSZ=32
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec/px
SRCS+= pxbitblt.c pxbresd.c pxgc.c pxgetsp.c pxline.c pxpacket.c \
pxpolypnt.c pxsetsp.c pxwindow.c pxsegment.c pxfillrct.c \
pxfillrctS.c pxfillrctSO.c pxfillsp.c pxPglyph.c \
pxIglyph.c pximage.c pxmisc.c pxpushpxl.c pxfillarc.c \
pxzerarc.c decPX.c
CPPFLAGS.pxsegment.c= -D_POLYSEGMENT=1
CPPFLAGS.pxfillrctS.c= -D_STIPPLE=1
CPPFLAGS.pxfillrctSO.c= -D_STIPPLE=1 -D_OPAQUE=1
CPPFLAGS.pxPglyph.c= -D_POLYGLYPH=1
CPPFLAGS.pxIglyph.c= -D_IMAGEGLYPH=1
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec/cfb
SRCS+= decCfb.c
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec/mfb
SRCS+= decMfb.c
.if ${MACHINE} == "alpha"
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec/tga
SRCS+= decTGA.c tgagc.c tgabitblt.c tgablt.c tgawindow.c tgasimpleblt.c \
tga32gc.c tga32bitblt.c tga32blt.c tga32window.c
CPPFLAGS.tga32gc.c= -DPSZ=32
CPPFLAGS.tga32bitblt.c= -DPSZ=32
CPPFLAGS.tga32blt.c= -DPSZ=32
CPPFLAGS.tga32window.c= -DPSZ=32
BUILDSYMLINKS= tgagc.c tga32gc.c \
tgabitblt.c tga32bitblt.c \
tgablt.c tga32blt.c \
tgawindow.c tga32window.c
.endif
XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec \
-I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec/sfb \
-I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec/px \
-I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec/cfb \
-I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec/mfb \
-I${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec/tga \
-I${X11SRCDIR.xc}/programs/Xserver/mfb \
-I${X11SRCDIR.xc}/programs/Xserver/mi \
-I${X11SRCDIR.xc}/programs/Xserver/cfb \
-I${X11SRCDIR.xc}/programs/Xserver/include \
-I${X11SRCDIR.xc}/programs/Xserver/os \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${X11SRCDIR.xc}/include/fonts \
-I${XSERVERINCDIR}
COPTS.decKbd.c= -Wno-error
#CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
# -UXF86DRI -UXF86BIGFONT
BUILDSYMLINKS+= ../../../mi/miinitext.c decInEx.c \
sfbgc.c sfb32gc.c \
sfbbitblt.c sfb32bitblt.c \
sfbblt.c sfb32blt.c \
sfbwindow.c sfb32window.c \
pxline.c pxsegment.c \
pxfillrct.c pxfillrctS.c \
pxfillrct.c pxfillrctSO.c \
pxglyph.c pxPglyph.c \
pxglyph.c pxIglyph.c
.include <bsd.x11.mk>
.include <bsd.lib.mk>

5
x11/Xserver/xinput/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/01/17 03:50:51 rtr Exp $
# $NetBSD: Makefile,v 1.6 2004/01/18 05:35:03 rtr Exp $
.include "../Makefile.serverlib"
@ -20,7 +20,8 @@ CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/include \
-I${DESTDIR}${X11INCDIR}/X11
.if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" || \
${MACHINE} == "amiga"
${MACHINE} == "amiga" || ${MACHINE} == "alpha" || \
${MACHINE} == "pmax" || ${MACHINE} == "acorn32"
CPPFLAGS+= -DXINPUT
.endif