Enable build.sh -x building for the usbtablet driver new in xsrc
distrib/sets/lists/xserver/md.* to list the additional files for XFree86 using ports share/mk/bsd.x11.mk and x11/... for the actual building Contributes to closing PR xsrc/23964 Reviewed by tron@NetBSD.org
This commit is contained in:
spz
parent
89bc307830
commit
1802f2d1d7
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: md.amd64,v 1.17 2005/03/28 13:48:04 lukem Exp $
|
||||
# $NetBSD: md.amd64,v 1.18 2005/11/12 22:57:46 spz Exp $
|
||||
./usr/X11R6/bin/X
|
||||
./usr/X11R6/bin/XFree86
|
||||
./usr/X11R6/bin/Xvfb
|
||||
|
|
@ -162,6 +162,7 @@
|
|||
./usr/X11R6/lib/modules/input/spaceorb_drv.o
|
||||
./usr/X11R6/lib/modules/input/summa_drv.o
|
||||
./usr/X11R6/lib/modules/input/tek4957_drv.o
|
||||
./usr/X11R6/lib/modules/input/usbtablet_drv.o
|
||||
./usr/X11R6/lib/modules/input/void_drv.o
|
||||
./usr/X11R6/lib/modules/input/wacom_drv.o
|
||||
./usr/X11R6/lib/modules/libcfb.a
|
||||
|
|
@ -235,6 +236,7 @@
|
|||
./usr/X11R6/man/cat4/tek4957.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/trident.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/tseng.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/usbtablet.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/vesa.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/vga.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/void.0 -unknown- .cat
|
||||
|
|
@ -286,6 +288,7 @@
|
|||
./usr/X11R6/man/man4/tek4957.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/trident.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/tseng.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/usbtablet.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/vesa.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/vga.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/void.4 -unknown- .man
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: md.cats,v 1.13 2005/03/28 13:48:04 lukem Exp $
|
||||
# $NetBSD: md.cats,v 1.14 2005/11/12 22:57:46 spz Exp $
|
||||
./usr/X11R6/bin/X
|
||||
./usr/X11R6/bin/XFree86
|
||||
./usr/X11R6/bin/gtf
|
||||
|
|
@ -158,6 +158,7 @@
|
|||
./usr/X11R6/lib/modules/input/spaceorb_drv.o
|
||||
./usr/X11R6/lib/modules/input/summa_drv.o
|
||||
./usr/X11R6/lib/modules/input/tek4957_drv.o
|
||||
./usr/X11R6/lib/modules/input/usbtablet_drv.o
|
||||
./usr/X11R6/lib/modules/input/void_drv.o
|
||||
./usr/X11R6/lib/modules/input/wacom_drv.o
|
||||
./usr/X11R6/lib/modules/libcfb.a
|
||||
|
|
@ -230,6 +231,7 @@
|
|||
./usr/X11R6/man/cat4/tek4957.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/trident.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/tseng.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/usbtablet.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/vesa.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/vga.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/void.0 -unknown- .cat
|
||||
|
|
@ -280,6 +282,7 @@
|
|||
./usr/X11R6/man/man4/tek4957.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/trident.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/tseng.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/usbtablet.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/vesa.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/vga.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/void.4 -unknown- .man
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: md.i386,v 1.34 2005/03/28 13:48:04 lukem Exp $
|
||||
# $NetBSD: md.i386,v 1.35 2005/11/12 22:57:46 spz Exp $
|
||||
./usr/X11R6/bin/X
|
||||
./usr/X11R6/bin/XFree86
|
||||
./usr/X11R6/bin/Xvfb
|
||||
|
|
@ -174,6 +174,7 @@
|
|||
./usr/X11R6/lib/modules/input/spaceorb_drv.o
|
||||
./usr/X11R6/lib/modules/input/summa_drv.o
|
||||
./usr/X11R6/lib/modules/input/tek4957_drv.o
|
||||
./usr/X11R6/lib/modules/input/usbtablet_drv.o
|
||||
./usr/X11R6/lib/modules/input/void_drv.o
|
||||
./usr/X11R6/lib/modules/input/wacom_drv.o
|
||||
./usr/X11R6/lib/modules/libafb.a
|
||||
|
|
@ -251,6 +252,7 @@
|
|||
./usr/X11R6/man/cat4/tek4957.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/trident.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/tseng.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/usbtablet.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/vesa.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/vga.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/via.0 -unknown- .cat
|
||||
|
|
@ -307,6 +309,7 @@
|
|||
./usr/X11R6/man/man4/tek4957.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/trident.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/tseng.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/usbtablet.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/vesa.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/vga.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/via.4 -unknown- .man
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: md.macppc,v 1.25 2005/03/28 13:48:04 lukem Exp $
|
||||
# $NetBSD: md.macppc,v 1.26 2005/11/12 22:57:46 spz Exp $
|
||||
./usr/X11R6/bin/X
|
||||
./usr/X11R6/bin/XFree86
|
||||
./usr/X11R6/bin/Xmacppc
|
||||
|
|
@ -149,6 +149,7 @@
|
|||
./usr/X11R6/lib/modules/input/spaceorb_drv.o
|
||||
./usr/X11R6/lib/modules/input/summa_drv.o
|
||||
./usr/X11R6/lib/modules/input/tek4957_drv.o
|
||||
./usr/X11R6/lib/modules/input/usbtablet_drv.o
|
||||
./usr/X11R6/lib/modules/input/void_drv.o
|
||||
./usr/X11R6/lib/modules/input/wacom_drv.o
|
||||
./usr/X11R6/lib/modules/libcfb.a
|
||||
|
|
@ -212,6 +213,7 @@
|
|||
./usr/X11R6/man/cat4/tdfx.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/tek4957.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/trident.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/usbtablet.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/vga.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/void.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/wacom.0 -unknown- .cat
|
||||
|
|
@ -254,6 +256,7 @@
|
|||
./usr/X11R6/man/man4/tdfx.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/tek4957.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/trident.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/usbtablet.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/vga.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/void.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/wacom.4 -unknown- .man
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: md.sparc,v 1.16 2005/10/01 22:51:31 macallan Exp $
|
||||
# $NetBSD: md.sparc,v 1.17 2005/11/12 22:57:46 spz Exp $
|
||||
./usr/X11R6/bin/X
|
||||
./usr/X11R6/bin/XFree86
|
||||
./usr/X11R6/bin/Xsun
|
||||
|
|
@ -109,6 +109,7 @@
|
|||
./usr/X11R6/lib/modules/input/spaceorb_drv.o
|
||||
./usr/X11R6/lib/modules/input/summa_drv.o
|
||||
./usr/X11R6/lib/modules/input/tek4957_drv.o
|
||||
./usr/X11R6/lib/modules/input/usbtablet_drv.o
|
||||
./usr/X11R6/lib/modules/input/void_drv.o
|
||||
./usr/X11R6/lib/modules/input/wacom_drv.o
|
||||
./usr/X11R6/lib/modules/libcfb.a
|
||||
|
|
@ -170,6 +171,7 @@
|
|||
./usr/X11R6/man/cat4/sunleo.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/suntcx.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/tek4957.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/usbtablet.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/void.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/wacom.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/wsfb.0 -unknown- .cat
|
||||
|
|
@ -209,6 +211,7 @@
|
|||
./usr/X11R6/man/man4/sunleo.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/suntcx.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/tek4957.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/usbtablet.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/void.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/wacom.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/wsfb.4 -unknown- .man
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: md.sparc64,v 1.13 2005/07/19 04:33:14 martin Exp $
|
||||
# $NetBSD: md.sparc64,v 1.14 2005/11/12 22:57:46 spz Exp $
|
||||
./usr/X11R6/bin/X
|
||||
./usr/X11R6/bin/XFree86
|
||||
./usr/X11R6/bin/Xsun
|
||||
|
|
@ -113,6 +113,7 @@
|
|||
./usr/X11R6/lib/modules/input/spaceorb_drv.o
|
||||
./usr/X11R6/lib/modules/input/summa_drv.o
|
||||
./usr/X11R6/lib/modules/input/tek4957_drv.o
|
||||
./usr/X11R6/lib/modules/input/usbtablet_drv.o
|
||||
./usr/X11R6/lib/modules/input/void_drv.o
|
||||
./usr/X11R6/lib/modules/input/wacom_drv.o
|
||||
./usr/X11R6/lib/modules/libcfb.a
|
||||
|
|
@ -178,6 +179,7 @@
|
|||
./usr/X11R6/man/cat4/sunleo.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/suntcx.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/tek4957.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/usbtablet.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/vga.0 xserver-obsolete obsolete
|
||||
./usr/X11R6/man/cat4/void.0 -unknown- .cat
|
||||
./usr/X11R6/man/cat4/wacom.0 -unknown- .cat
|
||||
|
|
@ -220,6 +222,7 @@
|
|||
./usr/X11R6/man/man4/sunleo.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/suntcx.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/tek4957.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/usbtablet.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/vga.4 xserver-obsolete obsolete
|
||||
./usr/X11R6/man/man4/void.4 -unknown- .man
|
||||
./usr/X11R6/man/man4/wacom.4 -unknown- .man
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.x11.mk,v 1.50 2005/10/01 22:51:31 macallan Exp $
|
||||
# $NetBSD: bsd.x11.mk,v 1.51 2005/11/12 22:57:46 spz Exp $
|
||||
|
||||
.include <bsd.init.mk>
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ X11FLAGS.SERVER= -DSHAPE -DXKB -DLBX -DXAPPGROUP -DXCSECURITY \
|
|||
|
||||
# OS_DEFINES
|
||||
X11FLAGS.OS_DEFINES= -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR \
|
||||
-DDDXOSVERRORF -DDDXTIME
|
||||
-DDDXOSVERRORF -DDDXTIME -DUSB_HID
|
||||
|
||||
.if !(${MACHINE} == "acorn32" || \
|
||||
${MACHINE} == "alpha" || \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.12 2004/04/15 14:53:40 drochner Exp $
|
||||
# $NetBSD: Makefile,v 1.13 2005/11/12 22:57:46 spz Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ LDADD+= ${LDADD.hw/xfree86/xf86} ${LDADD.hw/xfree86/xf86config} \
|
|||
${LDADD.render} ${LDADD.dix/xpstubs} ${LDADD.mi} ${LDADD.Xext/exts} \
|
||||
${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
|
||||
${LDADD.randr} ${LDADD.render} ${LDADD.hw/xfree86/xf86_os} \
|
||||
-lz -lm
|
||||
-lusbhid -lz -lm
|
||||
|
||||
DPADD= ${DPADD.hw/xfree86/xf86} ${DPADD.hw/xfree86/xf86config} \
|
||||
${DPADD.hw/xfree86/xf86_os} ${DPADD.hw/xfree86/loader} \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# $NetBSD: Makefile,v 1.4 2005/03/23 01:00:32 rtr Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2005/11/12 22:57:46 spz Exp $
|
||||
|
||||
SUBDIR= acecad mouse calcomp citron digitaledge dmc dynapro elographics fpit \
|
||||
hyperpen js_x kbd magellan microtouch mutouch palmax penmount \
|
||||
spaceorb summa tek4957 void wacom
|
||||
spaceorb summa tek4957 usbtablet void wacom
|
||||
|
||||
.if ${MACHINE} == "sgimips"
|
||||
SUBDIR= mouse kbd void
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
# $NetBSD: Makefile,v 1.1 2005/11/12 22:57:46 spz Exp $
|
||||
|
||||
XMODULEDIR= ${X11USRLIBDIR}/modules/input
|
||||
|
||||
.include "../../../../Makefile.serverlib"
|
||||
|
||||
MODULE= usbtablet_drv
|
||||
MAN= usbtablet.4
|
||||
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/usbtablet
|
||||
|
||||
SRCS= xf86USBtablet.c
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/usbtablet \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/include \
|
||||
-I${X11SRCDIR.xc}/programs/Xserver/mi \
|
||||
-I${DESTDIR}${X11INCDIR}/X11 \
|
||||
-I${DESTDIR}${X11INCDIR}/X11/extensions \
|
||||
-I${XSERVERINCDIR}
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
LIBDIR= ${XMODULEDIR}
|
||||
.include "../../Makefile.drivermod"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.9 2005/10/01 22:51:31 macallan Exp $
|
||||
# $NetBSD: Makefile,v 1.10 2005/11/12 22:57:47 spz Exp $
|
||||
|
||||
.include <bsd.sys.mk> # for HOST_SH
|
||||
|
||||
|
|
@ -94,7 +94,7 @@ DRIVERS+= ati i810 ark cyrix siliconmotion via fbdev vesa vga \
|
|||
IDRIVERS= mouse keyboard acecad calcomp citron digitaledge \
|
||||
dmc dynapro elographics tek4957 microtouch \
|
||||
mutouch penmount spaceorb summa wacom void \
|
||||
magellan hyperpen jamstudio fpit palmax
|
||||
magellan hyperpen jamstudio fpit palmax usbtablet
|
||||
|
||||
CPPFLAGS.xf86Bus.c= -DBUILDERADDR='"xfree86@xfree86.org"'
|
||||
CPPFLAGS.xf86Init.c= -DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
|
||||
|
|
|
|||
Loading…
Reference in New Issue