Subject: non-loadable cross build changes
To: None <tech-x11@netbsd.org>
From: Tyler Retzlaff <rtr@twentynine.org>
List: tech-x11
Date: 04/16/2004 23:07:21
--Boundary-00=_Jq9fASWXFfjtb4G
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Just a heads up before I completely break -current src/x11.
I intend to start committing changes to src/x11 which will provide the
non-loadable XFree86 to be built and enabled/disabled with a knob.
Since I don't have a lot of free time I'l be committing in chunks which
hopefully won't break the build, however if I do just bare with me I'l try to
fix things up asap. The following patch is the first of a series of patches
I'l probably commit this first patch tomorrow providing nobody finds serious
flaws.
--Boundary-00=_Jq9fASWXFfjtb4G
Content-Type: text/x-diff;
charset="us-ascii";
name="x11.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="x11.diff"
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/GL/dri-notes/Makefile 2004-02-12 02:33:53.000000000 +1100
@@ -0,0 +1,12 @@
+# $NetBSD$
+
+# BuildOSMesaLib YES
+# BuildGlxExt YES
+# BuildXF86DRI YES
+# DriDrivers gamma i810 i830 mga r128 radeon r200 sis tdfx
+# GlxDriverUsesMesa GlxBuiltInMga
+# GlxBuiltInMga NO
+# GlxBuiltInXMesa NO
+# GlxUseBuiltInDRIDriverNO
+
+# mesa/src glx dri GL mesa/src/OSmesa mesa/src/drv
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/driver/Makefile 2004-03-14 02:22:52.000000000 +1100
@@ -0,0 +1,55 @@
+# $NetBSD$
+
+.include "../drivers/Makefile"
+
+LIB= driver
+
+.include "../drivers/cirrus/cirrus_alpine/Makefile.cirrus_alpine"
+.include "../drivers/cirrus/cirrus_laguna/Makefile.cirrus_laguna"
+
+.for FN in ${SRCS.cirrus_alpine}
+CPPFLAGS.${FN}+= ${CPPFLAGS.cirrus_alpine}
+.endfor
+
+.for FN in ${SRCS.cirrus_laguna}
+CPPFLAGS.${FN}+= ${CPPFLAGS.cirrus_laguna}
+.endfor
+
+SRCS+= ${SRCS.cirrus_alpine} ${SRCS.cirrus_laguna}
+
+.for DN in ${SUBDIR}
+.include "../drivers/${DN}/Makefile.${DN}"
+.for FN in ${SRCS.${DN}}
+CPPFLAGS.${FN}+= ${CPPFLAGS.${DN}}
+.endfor
+SRCS+= ${SRCS.${DN}}
+.endfor
+
+SRCS+= drvConf.c
+DPSRCS+= drvConf.c
+CLEANFILES+= drvConf.c
+
+drvConf.c:
+ @echo '#include "xf86.h"' > ${.TARGET}
+ @echo >> ${.TARGET}
+ @echo 'extern DriverRec' >> ${.TARGET}
+.for SD in ${SUBDIR:Natimisc:Nr128:Nradeon:[1..-2]:tu}
+ @echo ' ${SD},' >> ${.TARGET}
+.endfor
+ @echo ' ${SUBDIR:Natimisc:Nr128:Nradeon:[-1]:tu};' >> ${.TARGET}
+ @echo >> ${.TARGET}
+ @echo 'DriverPtr xf86DriverList[] = {' >> ${.TARGET}
+.for SD in ${SUBDIR:Natimisc:Nr128:Nradeon:tu}
+ @echo ' &${SD},' >> ${.TARGET}
+.endfor
+ @echo '};' >> ${.TARGET}
+ @echo 'int xf86NumDrivers = sizeof(xf86DriverList) / sizeof(xf86DriverList[0]);' >> ${.TARGET}
+
+CPPFLAGS.drvConf.c= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/include \
+ -I${XSERVERINCDIR}
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
+
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/idriver/Makefile 2004-03-14 02:34:17.000000000 +1100
@@ -0,0 +1,43 @@
+# $NetBSD$
+
+.include "../input/Makefile"
+
+LIB= idriver
+
+.for DN in ${SUBDIR}
+.include "../input/${DN}/Makefile.${DN}"
+.for FN in ${SRCS.${DN}}
+CPPFLAGS.${FN}+= ${CPPFLAGS.${DN}}
+.endfor
+SRCS+= ${SRCS.${DN}}
+.endfor
+
+SRCS+= drvConf.c
+DPSRCS+= drvConf.c
+CLEANFILES+= drvConf.c
+
+drvConf.c:
+ @echo '#include "xf86.h"' > ${.TARGET}
+ @echo '#include "xf86Xinput.h"' >> ${.TARGET}
+ @echo >> ${.TARGET}
+ @echo 'extern InputDriverRec' >> ${.TARGET}
+ @echo ' xf86KEYBOARD,' >> ${.TARGET}
+.for SD in ${SUBDIR:Njs_x:Nkbd:[1..-2]:tu}
+ @echo ' ${SD},' >> ${.TARGET}
+.endfor
+ @echo ' ${SUBDIR:Njs_x:Nkbd:[-1]:tu};' >> ${.TARGET}
+ @echo >> ${.TARGET}
+ @echo 'InputDriverPtr xf86InputDriverList[] = {' >> ${.TARGET}
+ @echo ' &xf86KEYBOARD,' >> ${.TARGET}
+.for SD in ${SUBDIR:Njs_x:Nkbd:tu}
+ @echo ' &${SD},' >> ${.TARGET}
+.endfor
+ @echo '};' >> ${.TARGET}
+ @echo 'int xf86NumInputDrivers = sizeof(xf86InputDriverList) / sizeof(xf86InputDriverList[0]);' >> ${.TARGET}
+
+CPPFLAGS.drvConf.c= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/include \
+ -I${XSERVERINCDIR}
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/apm/Makefile.apm 2004-03-13 14:33:07.000000000 +1100
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
+
+MAN+= apm.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/apm
+SRCS.apm= apm_accel.c apm_cursor.c apm_dga.c apm_driver.c apm_i2c.c
+
+CPPFLAGS.apm= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/apm \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/ark/Makefile.ark 2004-03-13 14:33:16.000000000 +1100
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ark
+SRCS.ark= ark_driver.c ark_accel.c
+
+CPPFLAGS.ark= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ark \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/ati/Makefile.ati 2004-03-13 15:57:45.000000000 +1100
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
+
+MAN+= ati.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati
+SRCS.ati= ati.c atiadapter.c atibus.c atichip.c atiident.c atioption.c \
+ atiprobe.c atividmem.c ativgaio.c atimodule.c radeon_probe.c \
+ r128_probe.c
+
+CPPFLAGS.ati= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/atimisc/Makefile.atimisc 2004-03-14 00:38:59.000000000 +1100
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati
+SRCS.atimisc= atiaccel.c atiadjust.c atiaudio.c aticlock.c aticonfig.c \
+ aticonsole.c aticursor.c atidac.c atidecoder.c atidsp.c \
+ atii2c.c atilock.c atimach64.c atimach64accel.c \
+ atimach64cursor.c atimach64i2c.c atimach64io.c \
+ atimach64xv.c atimode.c atipreinit.c atiprint.c \
+ atirgb514.c atiscreen.c atituner.c atiutil.c ativalid.c \
+ atixv.c atibank.c ativga.c atiwonder.c atiwonderio.c \
+ atidga.c atiload.c atimisc.c
+
+CPPFLAGS.atimisc= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/chips/Makefile.chips 2004-03-13 15:57:55.000000000 +1100
@@ -0,0 +1,45 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
+
+MAN+= chips.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/chips
+SRCS.chips= ct_driver.c ct_bank.c ct_accel.c ct_accelmm.c ct_accelhi.c \
+ ct_cursor.c ct_ddc.c ct_regs.c ct_dga.c ct_shadow.c ct_video.c
+
+CPPFLAGS.chips= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/chips \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf8_16bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
+
+CPPFLAGS.chips+=-DPSZ=8
+
+BUILDSYMLINKS+= ct_accel.c ct_accelmm.c \
+ ct_accel.c ct_accelhi.c
+
+CPPFLAGS.ct_accelmm.c= -DCHIPS_MMIO
+CPPFLAGS.ct_accelhi.c= -DCHIPS_MMIO -DCHIPS_HIQV
+CPPFLAGS.ct_driver.c= -Wno-error # gcc3/macppc
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/cirrus/Makefile.cirrus 2004-03-13 15:58:08.000000000 +1100
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:05 lukem Exp $
+
+MAN+= cirrus.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus
+SRCS.cirrus= cir_driver.c CirrusClk.c cir_shadow.c cir_dga.c
+
+CPPFLAGS.cirrus=-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/cirrus/cirrus_alpine/Makefile.cirrus_alpine 2004-03-14 01:20:24.000000000 +1100
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $
+
+MAN+= #defined
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus
+SRCS.cirrus_alpine= alp_driver.c alp_xaa.c alp_hwcurs.c alp_i2c.c alp_xaam.c
+
+CPPFLAGS.cirrus_alpine= \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/cirrus/cirrus_laguna/Makefile.cirrus_laguna 2004-03-14 01:21:02.000000000 +1100
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $
+
+MAN+= #defined
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus
+SRCS.cirrus_laguna= lg_driver.c lg_i2c.c lg_xaa.c lg_hwcurs.c
+
+CPPFLAGS.cirrus_laguna= \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/cyrix/Makefile.cyrix 2004-03-13 15:59:02.000000000 +1100
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
+
+MAN+= cyrix.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cyrix
+SRCS.cyrix= cyrix_driver.c cyrix_accel.c cyrix_bank.c cyrix_helper.c cyrix_shadow.c
+
+CPPFLAGS.cyrix= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cyrix \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/dummy/Makefile.dummy 2004-03-13 14:32:51.000000000 +1100
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/dummy
+SRCS.dummy= dummy_driver.c dummy_cursor.c dummy_dga.c
+
+CPPFLAGS.dummy= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/dummy \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/fbdev/Makefile.fbdev 2004-03-13 15:59:12.000000000 +1100
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
+
+MAN+= fbdev.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/fbdev
+SRCS.fbdev= fbdev.c
+
+CPPFLAGS.fbdev=-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/fbdev \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/afb \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/glint/Makefile.glint 2004-03-13 15:59:19.000000000 +1100
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
+
+MAN+= glint.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/glint
+SRCS.glint= glint_driver.c pm2_dac.c pm2ramdac.c pm2_accel.c pm_dac.c \
+ IBMramdac.c pm_accel.c tx_dac.c tx_accel.c pm2v_dac.c \
+ pm2vramdac.c pm2_video.c pm3_dac.c pm3_accel.c pm3_video.c \
+ TIramdac.c glint_shadow.c sx_accel.c glint_dga.c
+
+CPPFLAGS.glint=-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/glint \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf8_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
+
+CPPFLAGS.glint+=-DPPC_MMIO_IS_BE -DSPARC_MMIO_IS_BE
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/i128/Makefile.i128 2004-03-13 15:59:30.000000000 +1100
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
+
+MAN+= i128.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i128
+SRCS.i128= i128_driver.c i128init.c i128IBMDAC.c i128accel.c i128dga.c
+
+CPPFLAGS.i128= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i128 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf8_32bpp \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/i740/Makefile.i740 2004-03-13 15:59:37.000000000 +1100
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
+
+MAN+= i740.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i740
+SRCS.i740= i740_driver.c i740_cursor.c i740_accel.c i740_io.c i740_dga.c \
+ i740_i2c.c i740_video.c
+
+CPPFLAGS.i740= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i740 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/i810/Makefile.i810 2004-03-13 15:59:45.000000000 +1100
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= i810.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i810
+SRCS.i810= i810_driver.c i810_cursor.c i810_accel.c i810_memory.c \
+ i810_wmark.c i810_dga.c i810_video.c i810_io.c i830_driver.c \
+ i830_memory.c i830_cursor.c i830_accel.c i830_io.c i830_dga.c \
+ i830_video.c
+
+CPPFLAGS.i810= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i810 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
+
+CPPFLAGS.i810+= -DI830_XV
+
+BUILDSYMLINKS+= i810_io.c i830_io.c
+
+CPPFLAGS.i830_io.c= -DBUILD_FOR_I830
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/imstt/Makefile.imstt 2004-03-13 15:59:53.000000000 +1100
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= imstt.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/imstt
+SRCS.imstt= imstt_driver.c imstt_accel.c
+
+CPPFLAGS.imstt= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/imstt \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/mga/Makefile.mga 2004-03-13 16:00:00.000000000 +1100
@@ -0,0 +1,58 @@
+# $NetBSD: Makefile,v 1.5 2004/03/06 03:31:06 rtr Exp $
+
+MAN+= mga.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/mga
+SRCS.mga= mga_driver.c mga_hwcurs.c mga_dac3026.c mga_dacG.c \
+ mga_storm8.c mga_storm16.c mga_storm24.c mga_storm32.c \
+ mga_arc.c mga_dga.c mga_shadow.c mga_video.c \
+ mga_g450pll.c mga_dh.c mga_esc.c mga_merge.c
+
+BUILDSYMLINKS+= mga_storm.c mga_storm8.c \
+ mga_storm.c mga_storm16.c \
+ mga_storm.c mga_storm24.c \
+ mga_storm.c mga_storm32.c
+
+CPPFLAGS.mga= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/mga \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/mga/HALlib \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf8_32bpp \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/include/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc} \
+ -I${XSERVERINCDIR}
+
+.if ${X11DRI} != "no"
+SRCS.mga+= mga_dri.c
+
+CPPFLAGS.mga+= -I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
+ -I${X11SRCDIR.xc}/lib/GL/dri \
+ -I${X11SRCDIR.xc}/include
+
+CPPFLAGS.mga+= ${X11FLAGS.DRI}
+.endif
+
+CPPFLAGS.mga_storm8.c= -DPSZ=8
+CPPFLAGS.mga_storm16.c= -DPSZ=16
+CPPFLAGS.mga_storm24.c= -DPSZ=24
+CPPFLAGS.mga_storm32.c= -DPSZ=32
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/neomagic/Makefile.neomagic 2004-03-13 16:00:11.000000000 +1100
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= neomagic.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/neomagic
+SRCS.neomagic= neo_driver.c neo_bank.c neo_cursor.c neo_2097.c neo_2070.c \
+ neo_2090.c neo_2200.c neo_i2c.c neo_shadow.c neo_dga.c neo_video.c
+
+CPPFLAGS.neomagic= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/neomagic \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgafb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
+
+CPPFLAGS.neomagic+= -DPSZ=8
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/newport/Makefile.newport 2004-03-13 16:00:19.000000000 +1100
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= newport.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/newport
+SRCS.newport= newport_driver.c newport_regs.c newport_cmap.c newport_shadow.c \
+ newport_cursor.c
+
+CPPFLAGS.newport= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/newport \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${XSERVERINCDIR}
+
+FILES= XF86Config.indy
+FILESDIR= ${X11LIBDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/nsc/Makefile.nsc 2004-03-13 16:00:26.000000000 +1100
@@ -0,0 +1,49 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= nsc.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nsc
+SRCS.nsc= nsc_driver.c nsc_gx1_driver.c nsc_gx1_dga.c nsc_gx1_accel.c \
+ nsc_gx1_cursor.c nsc_gx1_video.c nsc_gx1_shadow.c \
+ nsc_gx2_driver.c nsc_gx2_accel.c nsc_gx2_cursor.c nsc_gx2_dga.c \
+ nsc_gx2_video.c nsc_gx2_shadow.c durango.c panel.c
+
+.if ${MACHINE} == "i386"
+SRCS.nsc+= nsc_msr_asm.S
+.endif
+
+CPPFLAGS.nsc= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nsc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf8_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nsc/gfx \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nsc/panel \
+ -I${XSERVERINCDIR}
+
+CPPFLAGS.nsc+= -DOPT_ACCEL
+
+CPPFLAGS.i2c_acc.c= -Wno-error # gcc3/macppc
+CPPFLAGS.durango.c= -Wno-error # gcc3/macppc
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/nv/Makefile.nv 2004-04-16 23:36:20.000000000 +1000
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile,v 1.6 2004/03/06 03:31:06 rtr Exp $
+
+MAN+= nv.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nv
+SRCS.nv= nv_driver.c nv_dac.c nv_setup.c nv_cursor.c nv_xaa.c nv_dga.c \
+ nv_shadow.c nv_hw.c nv_video.c
+
+.if ${X11LOADABLE} == "no"
+SRCS.nv+= riva_driver.c riva_dac.c riva_setup.c riva_cursor.c riva_xaa.c \
+ riva_dga.c riva_shadow.c riva_hw.c
+.endif
+
+CPPFLAGS.nv= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nv \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/include/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86 \
+ -I${XSERVERINCDIR}
+
+CPPFLAGS.nv+= -DPSZ=8
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/r128/Makefile.r128 2004-03-13 16:00:44.000000000 +1100
@@ -0,0 +1,47 @@
+# $NetBSD: Makefile,v 1.4 2004/03/06 03:31:07 rtr Exp $
+
+MAN+= r128.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati
+SRCS.r128= r128_accel.c r128_cursor.c r128_dga.c r128_driver.c r128_video.c \
+ r128_misc.c
+
+CPPFLAGS.r128= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
+
+.if ${X11DRI} != "no"
+SRCS.r128+= r128_dri.c
+
+CPPFLAGS.r128+= -I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
+ -I${X11SRCDIR.xc}/lib/GL/dri \
+ -I${X11SRCDIR.xc}/include
+
+CPPFLAGS.r128+= ${X11FLAGS.DRI}
+.endif
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/radeon/Makefile.radeon 2004-03-13 16:00:53.000000000 +1100
@@ -0,0 +1,47 @@
+# $NetBSD: Makefile,v 1.7 2004/03/06 03:31:07 rtr Exp $
+
+MAN+= radeon.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati
+SRCS.radeon= radeon_accel.c radeon_cursor.c radeon_dga.c radeon_driver.c \
+ radeon_video.c radeon_misc.c
+
+CPPFLAGS.radeon=-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
+
+.if ${X11DRI} != "no"
+SRCS.radeon+= radeon_dri.c
+
+CPPFLAGS.radeon+= -I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
+ -I${X11SRCDIR.xc}/lib/GL/dri \
+ -I${X11SRCDIR.xc}/include
+
+CPPFLAGS.radeon+= ${X11FLAGS.DRI}
+.endif
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/rendition/Makefile.rendition 2004-03-13 16:01:00.000000000 +1100
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= rendition.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/rendition
+SRCS.rendition= rendition.c vboard.c vmodes.c vramdac.c v1krisc.c \
+ hwcursor.c vloaduc.c accel.c rendition_shadow.c
+
+CPPFLAGS.rendition= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/rendition \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
+
+CPPFLAGS.rendition+= -DMODULEDIR=\"${X11USRLIBDIR}/modules/\"
+
+BUILDSYMLINKS+= accelX.c accel.c
+
+CPPFLAGS.accel.c= -DPSZ=16
+
+FILES= v10002d.uc v20002d.uc
+FILESDIR= ${X11USRLIBDIR}/modules
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/s3/Makefile.s3 2004-03-13 15:30:20.000000000 +1100
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/s3
+SRCS.s3= s3_driver.c s3_IBMRGB.c s3_Trio64DAC.c s3_accel_newmmio.c \
+ s3_accel_pio.c s3_cursor.c s3_bios.c s3_video.c s3_dga.c \
+ s3_Ti.c
+
+CPPFLAGS.s3= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/s3 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
+
+BUILDSYMLINKS+= s3_accel.c s3_accel_newmmio.c \
+ s3_accel.c s3_accel_pio.c
+
+CPPFLAGS.s3_accel_newmmio.c= -DS3_NEWMMIO
+CPPFLAGS.s3_accel_pio.c= -DS3_GENERIC
+CPPFLAGS.s3_video.c= -DS3_NEWMMIO
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/s3virge/Makefile.s3virge 2004-03-13 16:01:08.000000000 +1100
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= s3virge.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/s3virge
+SRCS.s3virge= s3v_driver.c s3v_accel.c s3v_dac.c s3v_hwcurs.c s3v_dga.c \
+ s3v_i2c.c s3v_shadow.c s3v_xv.c
+
+CPPFLAGS.s3virge= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/s3virge \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/savage/Makefile.savage 2004-03-13 16:01:14.000000000 +1100
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= savage.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/savage
+SRCS.savage= savage_driver.c savage_accel.c savage_cursor.c savage_dga.c \
+ savage_i2c.c savage_image.c savage_shadow.c savage_vbe.c \
+ savage_video.c
+
+CPPFLAGS.savage=-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/savage \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${XSERVERINCDIR}
+
+CPPFLAGS.savage+= -DPSZ=8
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/siliconmotion/Makefile.siliconmotion 2004-03-13 16:01:22.000000000 +1100
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= siliconmotion.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/siliconmotion
+SRCS.siliconmotion= smi_driver.c smi_accel.c smi_dac.c smi_hwcurs.c \
+ smi_dga.c smi_i2c.c smi_shadow.c smi_video.c
+
+CPPFLAGS.siliconmotion= \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/siliconmotion \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${XSERVERINCDIR}
+
+CPPFLAGS.siliconmotion+= -DPSZ=8
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/sis/Makefile.sis 2004-03-13 16:01:29.000000000 +1100
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= sis.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/sis
+SRCS.sis= sis_driver.c sis_dac.c sis_cursor.c sis_accel.c sis_setup.c \
+ sis300_accel.c sis310_accel.c sis_vga.c sis_vb.c \
+ sis_opt.c sis_dga.c sis_video.c init.c init301.c sis_shadow.c \
+ sis6326_video.c
+
+CPPFLAGS.sis= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/sis \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${XSERVERINCDIR}
+
+CPPFLAGS.sis_video.c= -Wno-error # gcc3/macppc
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/tdfx/Makefile.tdfx 2004-03-13 16:01:53.000000000 +1100
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= tdfx.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tdfx
+SRCS.tdfx= tdfx_driver.c tdfx_io.c tdfx_hwcurs.c tdfx_accel.c tdfx_dga.c \
+ tdfx_priv.c tdfx_sli.c tdfx_video.c
+
+CPPFLAGS.tdfx= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tdfx \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/tga/Makefile.tga 2004-03-13 15:30:29.000000000 +1100
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tga
+
+SRCS.tga= tga_driver.c tga_dac.c tga_accel.c BTramdac.c ICS1562.c \
+ BT463ramdac.c tga_cursor.c tga_line.c tga_seg.c IBM561ramdac.c
+
+CPPFLAGS.tga= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tga \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
+
+BUILDSYMLINKS+= tga_line.c tga_seg.c
+
+CPPFLAGS.tga_seg.c= -DPOLYSEGMENT
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/trident/Makefile.trident 2004-03-14 00:58:44.000000000 +1100
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= trident.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/trident
+SRCS.trident= trident_driver.c trident_dac.c tridenthelper.c \
+ trident_accel.c trident_i2c.c trident_bank.c \
+ image_accel.c blade_accel.c tvga_dac.c trident_dga.c \
+ trident_shadow.c trident_video.c xp_accel.c trident_tv.c
+
+CPPFLAGS.trident= \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/trident \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/tseng/Makefile.tseng 2004-03-13 16:02:10.000000000 +1100
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= tseng.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tseng
+SRCS.tseng= tseng_driver.c tseng_ramdac.c tseng_bank.c tseng_clock.c \
+ tseng_accel.c tseng_acl.c tseng_colexp.c tseng_cursor.c \
+ tseng_dpms.c tseng_dga.c
+
+CPPFLAGS.tseng= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tseng \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/vesa/Makefile.vesa 2004-03-13 16:02:17.000000000 +1100
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= vesa.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vesa
+SRCS.vesa= vesa.c
+
+CPPFLAGS.vesa= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vesa \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/afb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/vga/Makefile.vga 2004-03-13 16:02:25.000000000 +1100
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= vga.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vga
+SRCS.vga= generic.c
+
+CPPFLAGS.vga= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vga \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${XSERVERINCDIR}
+
+.if ${MACHINE} == "alpha"
+CPPFLAGS.vga+= -DSPECIAL_FB_BYTE_ACCESS
+.endif
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/via/Makefile.via 2004-03-13 16:02:35.000000000 +1100
@@ -0,0 +1,48 @@
+# $NetBSD: Makefile,v 1.1 2004/03/06 03:31:07 rtr Exp $
+
+MAN+= via.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/via
+SRCS.via= via_driver.c via_tuner.c via_accel.c via_bandwidth.c \
+ via_bios.c via_cursor.c via_shadow.c via_dga.c \
+ via_video.c via_i2c.c via_gpioi2c.c via_utility.c \
+ via_swov.c via_regrec.c via_hwdiff.c via_memory.c \
+ via_overlay.c
+
+CPPFLAGS.via= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/via \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/include/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${XSERVERINCDIR}
+
+.if ${X11DRI} != "no"
+SRCS.via+= via_dri.c
+
+CPPFLAGS.via+= -I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
+ -I${X11SRCDIR.xc}/lib/GL/dri \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel \
+ -I${X11SRCDIR.xc}/include
+
+CPPFLAGS.via+= ${X11FLAGS.DRI}
+.endif
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/drivers/vmware/Makefile.vmware 2004-03-13 16:02:42.000000000 +1100
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= vmware.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vmware
+SRCS.vmware= vmware.c vmwarecurs.c vmwarexaa.c bits2pixels.c offscreen_manager.c
+
+CPPFLAGS.vmware=-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vmware \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/fb \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+ -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+ -I${X11SRCDIR.xc}/programs/Xserver/render \
+ -I${X11SRCDIR.xc}/include/fonts \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/calcomp/Makefile.calcomp 2004-03-13 16:13:14.000000000 +1100
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/calcomp
+SRCS.calcomp= xf86Calcomp.c
+
+CPPFLAGS.calcomp= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/calcomp \
+ -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${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/citron/Makefile.citron 2004-03-13 16:14:36.000000000 +1100
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= citron.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/citron
+SRCS.citron= citron.c
+
+CPPFLAGS.citron=-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/citron \
+ -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}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/digitaledge/Makefile.digitaledge 2004-03-13 16:16:02.000000000 +1100
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/digitaledge
+SRCS.digitaledge= DigitalEdge.c
+
+CPPFLAGS.digitaledge= \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/digitaledge \
+ -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}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/dmc/Makefile.dmc 2004-03-13 16:17:04.000000000 +1100
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= dmc.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/dmc
+SRCS.dmc= xf86DMC.c
+
+CPPFLAGS.dmc= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/dmc \
+ -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${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/dynapro/Makefile.dynapro 2004-03-13 16:21:39.000000000 +1100
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= dynapro.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/dynapro
+SRCS.dynapro= xf86Dyna.c
+
+CPPFLAGS.dynapro= \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/dynapro \
+ -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${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/elographics/Makefile.elographics 2004-03-13 16:23:10.000000000 +1100
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= elographics.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/elographics
+SRCS.elographics= xf86Elo.c
+
+CPPFLAGS.elographics= \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/elographics \
+ -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${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/fpit/Makefile.fpit 2004-03-13 16:24:26.000000000 +1100
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
+
+MAN+= fpit.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/fpit
+SRCS.fpit= xf86Fpit.c
+
+CPPFLAGS.fpit= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/fpit \
+ -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}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/hyperpen/Makefile.hyperpen 2004-03-13 16:25:36.000000000 +1100
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/hyperpen
+SRCS.hyperpen= xf86HyperPen.c
+
+CPPFLAGS.hyperpen= \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/hyperpen \
+ -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}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/js_x/Makefile.js_x 2004-03-13 16:26:37.000000000 +1100
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
+
+MAN+= js_x.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/jamstudio
+SRCS.js_x= js_x.c
+
+CPPFLAGS.js_x= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/jamstudio \
+ -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}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/kbd/Makefile.kbd 2004-03-13 16:27:31.000000000 +1100
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:07 lukem Exp $
+
+MAN+= kbd.4 keyboard.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/keyboard
+SRCS.kbd= kbd.c
+
+CPPFLAGS.kbd= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/keyboard \
+ -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}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/magellan/Makefile.magellan 2004-03-13 16:28:40.000000000 +1100
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/magellan
+SRCS.magellan= magellan.c
+
+CPPFLAGS.magellan= \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/magellan \
+ -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${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/microtouch/Makefile.microtouch 2004-03-13 16:29:53.000000000 +1100
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
+
+MAN+= microtouch.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/microtouch
+SRCS.microtouch= microtouch.c
+
+CPPFLAGS.microtouch= \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/microtouch \
+ -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${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/mouse/Makefile.mouse 2004-03-13 16:31:10.000000000 +1100
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.5 2004/02/07 06:52:07 lukem Exp $
+
+MAN+= mouse.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/mouse
+SRCS.mouse= mouse.c pnp.c
+
+CPPFLAGS.mouse= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/mouse \
+ -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/mi \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
+
+CPPFLAGS.mouse+=-DPNP_MOUSE
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/mutouch/Makefile.mutouch 2004-03-13 16:32:17.000000000 +1100
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
+
+MAN+= mutouch.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/mutouch
+SRCS.mutouch= xf86MuTouch.c
+
+CPPFLAGS.mutouch= \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/mutouch \
+ -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}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/palmax/Makefile.palmax 2004-03-13 16:33:16.000000000 +1100
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
+
+MAN+= palmax.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/palmax
+SRCS.palmax= xf86Palmax.c
+
+CPPFLAGS.palmax=-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/palmax \
+ -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}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/penmount/Makefile.penmount 2004-03-13 16:34:29.000000000 +1100
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
+
+MAN+= penmount.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/penmount
+SRCS.penmount= xf86PM.c
+
+CPPFLAGS.penmount= \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/penmount \
+ -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${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/spaceorb/Makefile.spaceorb 2004-03-13 16:35:26.000000000 +1100
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/spaceorb
+SRCS.spaceorb= spaceorb.c
+
+CPPFLAGS.spaceorb= \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/spaceorb \
+ -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${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/summa/Makefile.summa 2004-03-13 16:36:12.000000000 +1100
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/summa
+SRCS.summa= xf86Summa.c
+
+CPPFLAGS.summa= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/summa \
+ -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}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/tek4957/Makefile.tek4957 2004-03-13 16:37:28.000000000 +1100
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
+
+MAN+= tek4957.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/tek4957
+SRCS.tek4957= xf86Tek4957.c
+
+CPPFLAGS.tek4957= \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/tek4957 \
+ -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}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/void/Makefile.void 2004-03-13 16:38:21.000000000 +1100
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
+
+MAN+= void.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/void
+SRCS.void= void.c
+
+CPPFLAGS.void= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/void \
+ -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}
--- /dev/null 2004-04-16 23:53:19.000000000 +1000
+++ Xserver/hw/xfree86/input/wacom/Makefile.wacom 2004-03-13 16:39:39.000000000 +1100
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
+
+MAN+= wacom.4
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/wacom
+SRCS.wacom= xf86Wacom.c
+
+CPPFLAGS.wacom= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/wacom \
+ -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}
Index: Xserver/Makefile.serverlib
===================================================================
RCS file: /cvsroot/src/x11/Xserver/Makefile.serverlib,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile.serverlib
--- Xserver/Makefile.serverlib 7 Feb 2004 06:52:04 -0000 1.5
+++ Xserver/Makefile.serverlib 16 Apr 2004 13:54:56 -0000
@@ -7,10 +7,18 @@ NOPROFILE= 1
.include <bsd.own.mk> # for NETBSDSRCDIR
.include <bsd.endian.mk>
+#
+# XXX left for compat. while changing over to X11LOADABLE.
+#
.if ${XMODULEDIR:U} == ""
libinstall::
.endif
+.if ${X11LOADABLE} == "no"
+libinstall::
+moduleinstall::
+.endif
+
.if ${TARGET_ENDIANNESS} == "1234"
X_BYTE_ORDER=X_LITTLE_ENDIAN
.elif ${TARGET_ENDIANNESS} == "4321"
@@ -26,6 +34,13 @@ XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/X
.MAKEOVERRIDES+=XSERVERINCDIR
.endif
+#
+# XXX kept for compat. while changing over to X11LOADABLE
+#
.if defined(XMODULEDIR)
CPPFLAGS+= ${X11FLAGS.LOADABLE}
.endif
+
+.if ${X11LOADABLE} != "no"
+CPPFLAGS+= ${X11FLAGS.LOADABLE}
+.endif
Index: Xserver/hw/xfree86/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- Xserver/hw/xfree86/Makefile 15 Apr 2004 14:54:32 -0000 1.13
+++ Xserver/hw/xfree86/Makefile 16 Apr 2004 13:55:01 -0000
@@ -2,16 +2,23 @@
.include <bsd.own.mk>
-SUBDIR= ddc doc drivers dummy etc fbdevhw i2c input int10 loader \
- pcidata rac ramdac scanpci shadowfb vbe vgahw xaa xf1bpp \
- xf24_32bpp xf4bpp xf86 xf86_os xf86config xf8_16bpp \
- xf8_32bpp xloader \
- .WAIT bin
+SUBDIR= ddc doc dummy etc fbdevhw i2c int10 loader pcidata rac \
+ ramdac scanpci shadowfb vbe vgahw xaa xf1bpp xf24_32bpp \
+ xf4bpp xf86 xf86_os xf86config xf8_16bpp xf8_32bpp xloader
+
+.if ${X11LOADABLE} != "no"
+SUBDIR+=drivers input
+.else
+SUBDIR+=driver idriver
+.endif
+# build drm if building dri
.if ${X11DRI} != "no"
SUBDIR+= drm
.endif
+SUBDIR+=.WAIT bin
+
.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86
BUILDSYMLINKS= XF86Conf.cpp XF86Config.eg.cpp \
Index: Xserver/hw/xfree86/Makefile.drivermod
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/Makefile.drivermod,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile.drivermod
--- Xserver/hw/xfree86/Makefile.drivermod 6 Mar 2004 03:31:06 -0000 1.3
+++ Xserver/hw/xfree86/Makefile.drivermod 16 Apr 2004 13:55:01 -0000
@@ -1,16 +1,59 @@
# $NetBSD: Makefile.drivermod,v 1.3 2004/03/06 03:31:06 rtr Exp $
+.include <bsd.init.mk>
-# XXX this is a really bad hack to install an archive as a .o
-LIB=${MODULE}
+# most of this file was cribbed from existing bsd.*.mk files most
+# notably bsd.kmod.mk and bsd.lib.mk
-__archivebuild: .USE
+clean: moduleclean
+realinstall: moduleinstall
+realall: ${MODULE}_drv.o
+
+MKDEP_SUFFIXES?=.o
+CPPFLAGS+= ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
+CXXFLAGS+= ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
+
+DPSRCS+= ${SRCS:M*.l:.l=.c}
+OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g}
+
+${OBJS}: ${DPSRCS}
+ ${_MKTARGET_COMPILE}
+ ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
+
+${MODULE}_drv.o: ${OBJS}
${_MKTARGET_BUILD}
rm -rf ${.TARGET}
${LD} -X -r ${OBJS} -o ${.TARGET}
-__archiveinstall: .USE
- ${_MKTARGET_INSTALL}
- ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${SYSPKGTAG} ${.ALLSRC} ${DESTDIR}${LIBDIR}/${MODULE}.o
+.if !target(moduleinstall)
+_MODULE:= ${DESTDIR}${LIBDIR}/${MODULE}_drv.o
+
+.if ${MKUPDATE} == "no"
+${_MODULE}! ${MODULE}_drv.o # install rule
+.if !defined(BUILD) && !make(all) && !make(${MODULE}_drv.o)
+${_MODULE}! .MADE # no build at install
+.endif
+.else
+${_MODULE}: ${MODULE}_drv.o # install rule
+.if !defined(BUILD) && !make(all) && !make(${MODULE}_drv.o)
+${_MODULE}: .MADE # no build at install
+.endif
+.endif
+ ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
+ ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
+
+moduleinstall:: ${_MODULE}
+.PHONY: moduleinstall
+.PRECIOUS: ${_MODULE} # keep if install fails
+
+.endif # !target(moduleinstall)
+
+moduleclean: .PHONY
+ rm -f a.out [Ee]rrs mklog core *.core \
+ ${MODULE}_drv.o ${OBJS} ${CLEANFILES}
-.include <bsd.lib.mk>
+.include <bsd.links.mk>
+.include <bsd.sys.mk>
+.include <bsd.dep.mk>
+.include <bsd.files.mk>
+.include <bsd.obj.mk>
+.include <bsd.inc.mk>
Index: Xserver/hw/xfree86/drivers/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Xserver/hw/xfree86/drivers/Makefile 14 Mar 2004 17:01:10 -0000 1.7
+++ Xserver/hw/xfree86/drivers/Makefile 16 Apr 2004 13:55:01 -0000
@@ -16,4 +16,8 @@ SUBDIR+= apm ark cirrus cyrix dummy i128
SUBDIR+= newport
.endif
+.include "../../../Makefile.serverlib"
+
+.if ${X11LOADABLE} != "no"
.include <bsd.subdir.mk>
+.endif
Index: Xserver/hw/xfree86/drivers/apm/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/apm/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/apm/Makefile 7 Feb 2004 06:52:05 -0000 1.3
+++ Xserver/hw/xfree86/drivers/apm/Makefile 16 Apr 2004 13:55:01 -0000
@@ -1,40 +1,14 @@
# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
-
.include "../../../../Makefile.serverlib"
-MODULE= apm_drv
-MAN= apm.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/apm
+MODULE= apm
-SRCS= apm_accel.c apm_cursor.c apm_dga.c apm_driver.c apm_i2c.c
+.include "Makefile.apm"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/apm \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.apm}
+CPPFLAGS+= ${CPPFLAGS.apm}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/ark/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/ark/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Xserver/hw/xfree86/drivers/ark/Makefile 7 Feb 2004 06:52:05 -0000 1.2
+++ Xserver/hw/xfree86/drivers/ark/Makefile 16 Apr 2004 13:55:01 -0000
@@ -1,38 +1,14 @@
# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
-
.include "../../../../Makefile.serverlib"
-MODULE= ark_drv
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ark
+MODULE= ark
-SRCS= ark_driver.c ark_accel.c
+.include "Makefile.ark"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ark \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.ark}
+CPPFLAGS+= ${CPPFLAGS.ark}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/ati/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/ati/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Xserver/hw/xfree86/drivers/ati/Makefile 15 Apr 2004 14:55:26 -0000 1.4
+++ Xserver/hw/xfree86/drivers/ati/Makefile 16 Apr 2004 13:55:01 -0000
@@ -1,47 +1,14 @@
# $NetBSD: Makefile,v 1.4 2004/04/15 14:55:26 drochner Exp $
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
-
.include "../../../../Makefile.serverlib"
-MODULE= ati_drv
-MAN= ati.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati
+MODULE= ati
-SRCS= ati.c atiadapter.c atibus.c atichip.c atiident.c atioption.c \
- atiprobe.c atividmem.c ativgaio.c atimodule.c radeon_probe.c \
- r128_probe.c
+.include "Makefile.ati"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.ati}
+CPPFLAGS+= ${CPPFLAGS.ati}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/atimisc/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/atimisc/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/atimisc/Makefile 11 Mar 2004 01:09:35 -0000 1.3
+++ Xserver/hw/xfree86/drivers/atimisc/Makefile 16 Apr 2004 13:55:01 -0000
@@ -1,51 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/03/11 01:09:35 rtr Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= atimisc_drv
+MODULE= atimisc
+
+.include "Makefile.atimisc"
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati
-SRCS= atiaccel.c atiadjust.c atiaudio.c aticlock.c aticonfig.c \
- aticonsole.c aticursor.c atidac.c atidecoder.c atidsp.c \
- atii2c.c atilock.c atimach64.c atimach64accel.c \
- atimach64cursor.c atimach64i2c.c atimach64io.c \
- atimach64xv.c atimode.c atipreinit.c atiprint.c \
- atirgb514.c atiscreen.c atituner.c atiutil.c ativalid.c \
- atixv.c atibank.c ativga.c atiwonder.c atiwonderio.c \
- atidga.c atiload.c atimisc.c
+SRCS+= ${SRCS.atimisc}
+CPPFLAGS+= ${CPPFLAGS.atimisc}
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
-
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/chips/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/chips/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/chips/Makefile 7 Feb 2004 06:52:05 -0000 1.3
+++ Xserver/hw/xfree86/drivers/chips/Makefile 16 Apr 2004 13:55:01 -0000
@@ -1,54 +1,14 @@
# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
-
.include "../../../../Makefile.serverlib"
-MODULE= chips_drv
-MAN= chips.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/chips
-
-SRCS= ct_driver.c ct_bank.c ct_accel.c ct_accelmm.c ct_accelhi.c \
- ct_cursor.c ct_ddc.c ct_regs.c ct_dga.c ct_shadow.c ct_video.c
-
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/chips \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf8_16bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
-
-CPPFLAGS+= -DPSZ=8
+MODULE= chips
-BUILDSYMLINKS= ct_accel.c ct_accelmm.c \
- ct_accel.c ct_accelhi.c
+.include "Makefile.chips"
-CPPFLAGS.ct_accelmm.c= -DCHIPS_MMIO
-CPPFLAGS.ct_accelhi.c= -DCHIPS_MMIO -DCHIPS_HIQV
-CPPFLAGS.ct_driver.c= -Wno-error # gcc3/macppc
+SRCS+= ${SRCS.chips}
+CPPFLAGS+= ${CPPFLAGS.chips}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/cirrus/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/cirrus/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Xserver/hw/xfree86/drivers/cirrus/Makefile 7 Feb 2004 06:52:05 -0000 1.4
+++ Xserver/hw/xfree86/drivers/cirrus/Makefile 16 Apr 2004 13:55:01 -0000
@@ -1,43 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:05 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= cirrus_drv
-MAN= cirrus.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus
-
-SRCS= cir_driver.c CirrusClk.c cir_shadow.c cir_dga.c
-
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${XSERVERINCDIR}
+MODULE= cirrus
+
+.include "Makefile.cirrus"
+
+SRCS+= ${SRCS.cirrus}
+CPPFLAGS+= ${CPPFLAGS.cirrus}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
SUBDIR= cirrus_alpine cirrus_laguna
Index: Xserver/hw/xfree86/drivers/cirrus/cirrus_alpine/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_alpine/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Xserver/hw/xfree86/drivers/cirrus/cirrus_alpine/Makefile 7 Feb 2004 06:52:05 -0000 1.2
+++ Xserver/hw/xfree86/drivers/cirrus/cirrus_alpine/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,42 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../../Makefile.serverlib"
MODULE= cirrus_alpine
-MAN= #defined
-
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus
-SRCS= alp_driver.c alp_xaa.c alp_hwcurs.c alp_i2c.c alp_xaam.c
+.include "Makefile.cirrus_alpine"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.cirrus_alpine}
+CPPFLAGS+= ${CPPFLAGS.cirrus_alpine}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/cirrus/cirrus_laguna/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_laguna/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Xserver/hw/xfree86/drivers/cirrus/cirrus_laguna/Makefile 7 Feb 2004 06:52:05 -0000 1.2
+++ Xserver/hw/xfree86/drivers/cirrus/cirrus_laguna/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,42 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../../Makefile.serverlib"
MODULE= cirrus_laguna
-MAN= #defined
-
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus
-SRCS= lg_driver.c lg_i2c.c lg_xaa.c lg_hwcurs.c
+.include "Makefile.cirrus_laguna"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cirrus \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.cirrus_laguna}
+CPPFLAGS+= ${CPPFLAGS.cirrus_laguna}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/cyrix/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/cyrix/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/cyrix/Makefile 7 Feb 2004 06:52:05 -0000 1.3
+++ Xserver/hw/xfree86/drivers/cyrix/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,37 +1,14 @@
# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
-
.include "../../../../Makefile.serverlib"
-MODULE= cyrix_drv
-MAN= cyrix.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cyrix
+MODULE= cyrix
-SRCS= cyrix_driver.c cyrix_accel.c cyrix_bank.c cyrix_helper.c cyrix_shadow.c
+.include "Makefile.cyrix"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/cyrix \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.cyrix}
+CPPFLAGS+= ${CPPFLAGS.cyrix}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/dummy/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/dummy/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Xserver/hw/xfree86/drivers/dummy/Makefile 7 Feb 2004 06:52:05 -0000 1.2
+++ Xserver/hw/xfree86/drivers/dummy/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,29 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:05 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= dummy_drv
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/dummy
+MODULE= dummy
-SRCS= dummy_driver.c dummy_cursor.c dummy_dga.c
+.include "Makefile.dummy"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/dummy \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.dummy}
+CPPFLAGS+= ${CPPFLAGS.dummy}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/fbdev/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/fbdev/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/fbdev/Makefile 7 Feb 2004 06:52:05 -0000 1.3
+++ Xserver/hw/xfree86/drivers/fbdev/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,38 +1,14 @@
# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
-
.include "../../../../Makefile.serverlib"
-MODULE= fbdev_drv
-MAN= fbdev.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/fbdev
+MODULE= fbdev
-SRCS= fbdev.c
+.include "Makefile.fbdev"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/fbdev \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/afb \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.fbdev}
+CPPFLAGS+= ${CPPFLAGS.fbdev}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/glint/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/glint/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/glint/Makefile 7 Feb 2004 06:52:05 -0000 1.3
+++ Xserver/hw/xfree86/drivers/glint/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,50 +1,14 @@
# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
-
.include "../../../../Makefile.serverlib"
-MODULE= glint_drv
-MAN= glint.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/glint
-
-SRCS= glint_driver.c pm2_dac.c pm2ramdac.c pm2_accel.c pm_dac.c \
- IBMramdac.c pm_accel.c tx_dac.c tx_accel.c pm2v_dac.c \
- pm2vramdac.c pm2_video.c pm3_dac.c pm3_accel.c pm3_video.c \
- TIramdac.c glint_shadow.c sx_accel.c glint_dga.c
+MODULE= glint
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/glint \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf8_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
+.include "Makefile.glint"
-CPPFLAGS+= -DPPC_MMIO_IS_BE -DSPARC_MMIO_IS_BE
+SRCS+= ${SRCS.glint}
+CPPFLAGS+= ${CPPFLAGS.glint}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/i128/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/i128/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/i128/Makefile 7 Feb 2004 06:52:05 -0000 1.3
+++ Xserver/hw/xfree86/drivers/i128/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,42 +1,14 @@
# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
-
.include "../../../../Makefile.serverlib"
-MODULE= i128_drv
-MAN= i128.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i128
+MODULE= i128
-SRCS= i128_driver.c i128init.c i128IBMDAC.c i128accel.c i128dga.c
+.include "Makefile.i128"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i128 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf8_32bpp \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.i128}
+CPPFLAGS+= ${CPPFLAGS.i128}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/i740/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/i740/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/i740/Makefile 7 Feb 2004 06:52:05 -0000 1.3
+++ Xserver/hw/xfree86/drivers/i740/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,39 +1,14 @@
# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
-
.include "../../../../Makefile.serverlib"
-MODULE= i740_drv
-MAN= i740.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i740
+MODULE= i740
-SRCS= i740_driver.c i740_cursor.c i740_accel.c i740_io.c i740_dga.c \
- i740_i2c.c i740_video.c
+.include "Makefile.i740"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i740 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.i740}
+CPPFLAGS+= ${CPPFLAGS.i740}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/i810/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/i810/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/i810/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/drivers/i810/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,47 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= i810_drv
-MAN= i810.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i810
-
-SRCS= i810_driver.c i810_cursor.c i810_accel.c i810_memory.c \
- i810_wmark.c i810_dga.c i810_video.c i810_io.c i830_driver.c \
- i830_memory.c i830_cursor.c i830_accel.c i830_io.c i830_dga.c \
- i830_video.c
-
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/i810 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
-
-CPPFLAGS+= -DI830_XV
+MODULE= i810
-BUILDSYMLINKS= i810_io.c i830_io.c
+.include "Makefile.i810"
-CPPFLAGS.i830_io.c= -DBUILD_FOR_I830
+SRCS+= ${SRCS.i810}
+CPPFLAGS+= ${CPPFLAGS.i810}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/imstt/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/imstt/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Xserver/hw/xfree86/drivers/imstt/Makefile 7 Feb 2004 06:52:06 -0000 1.2
+++ Xserver/hw/xfree86/drivers/imstt/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,36 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= imstt_drv
-MAN= imstt.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/imstt
+MODULE= imstt
-SRCS= imstt_driver.c imstt_accel.c
+.include "Makefile.imstt"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/imstt \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.imstt}
+CPPFLAGS+= ${CPPFLAGS.imstt}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/mga/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/mga/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Xserver/hw/xfree86/drivers/mga/Makefile 6 Mar 2004 03:31:06 -0000 1.5
+++ Xserver/hw/xfree86/drivers/mga/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,67 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2004/03/06 03:31:06 rtr Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= mga_drv
-MAN= mga.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/mga
-
-SRCS= mga_driver.c mga_hwcurs.c mga_dac3026.c mga_dacG.c \
- mga_storm8.c mga_storm16.c mga_storm24.c mga_storm32.c \
- mga_arc.c mga_dga.c mga_shadow.c mga_video.c \
- mga_g450pll.c mga_dh.c mga_esc.c mga_merge.c
-
-BUILDSYMLINKS= mga_storm.c mga_storm8.c \
- mga_storm.c mga_storm16.c \
- mga_storm.c mga_storm24.c \
- mga_storm.c mga_storm32.c
-
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/mga \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/mga/HALlib \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf8_32bpp \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/include/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc} \
- -I${XSERVERINCDIR}
-
-.if ${X11DRI} != "no"
-SRCS+= mga_dri.c
-
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
- -I${X11SRCDIR.xc}/lib/GL/dri \
- -I${X11SRCDIR.xc}/include
+MODULE= mga
-CPPFLAGS+= ${X11FLAGS.DRI}
-.endif
+.include "Makefile.mga"
-CPPFLAGS.mga_storm8.c= -DPSZ=8
-CPPFLAGS.mga_storm16.c= -DPSZ=16
-CPPFLAGS.mga_storm24.c= -DPSZ=24
-CPPFLAGS.mga_storm32.c= -DPSZ=32
+SRCS+= ${SRCS.mga}
+CPPFLAGS+= ${CPPFLAGS.mga}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/neomagic/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/neomagic/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/neomagic/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/drivers/neomagic/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,44 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= neomagic_drv
-MAN= neomagic.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/neomagic
-
-SRCS= neo_driver.c neo_bank.c neo_cursor.c neo_2097.c neo_2070.c \
- neo_2090.c neo_2200.c neo_i2c.c neo_shadow.c neo_dga.c neo_video.c
+MODULE= neomagic
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/neomagic \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgafb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
+.include "Makefile.neomagic"
-CPPFLAGS+= -DPSZ=8
+SRCS+= ${SRCS.neomagic}
+CPPFLAGS+= ${CPPFLAGS.neomagic}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/newport/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/newport/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Xserver/hw/xfree86/drivers/newport/Makefile 7 Feb 2004 06:52:06 -0000 1.4
+++ Xserver/hw/xfree86/drivers/newport/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,35 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= newport_drv
-MAN= newport.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/newport
-
-SRCS= newport_driver.c newport_regs.c newport_cmap.c newport_shadow.c \
- newport_cursor.c
+MODULE= newport
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/newport \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${XSERVERINCDIR}
+.include "Makefile.newport"
-FILES= XF86Config.indy
-FILESDIR= ${X11LIBDIR}
+SRCS+= ${SRCS.newport}
+CPPFLAGS+= ${CPPFLAGS.newport}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/nsc/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/nsc/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/nsc/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/drivers/nsc/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,57 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= nsc_drv
-MAN= nsc.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nsc
-
-SRCS= nsc_driver.c nsc_gx1_driver.c nsc_gx1_dga.c nsc_gx1_accel.c \
- nsc_gx1_cursor.c nsc_gx1_video.c nsc_gx1_shadow.c \
- nsc_gx2_driver.c nsc_gx2_accel.c nsc_gx2_cursor.c nsc_gx2_dga.c \
- nsc_gx2_video.c nsc_gx2_shadow.c durango.c panel.c
-
-.if ${MACHINE} == "i386"
-SRCS+= nsc_msr_asm.S
-.endif
+MODULE= nsc
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nsc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf8_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nsc/gfx \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nsc/panel \
- -I${XSERVERINCDIR}
+.include "Makefile.nsc"
-CPPFLAGS+= -DOPT_ACCEL
+SRCS+= ${SRCS.nsc}
+CPPFLAGS+= ${CPPFLAGS.nsc}
-CPPFLAGS.i2c_acc.c= -Wno-error # gcc3/macppc
-CPPFLAGS.durango.c= -Wno-error # gcc3/macppc
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/nv/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/nv/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Xserver/hw/xfree86/drivers/nv/Makefile 6 Mar 2004 03:31:06 -0000 1.6
+++ Xserver/hw/xfree86/drivers/nv/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,44 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2004/03/06 03:31:06 rtr Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= nv_drv
-MAN= nv.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nv
+MODULE= nv
-SRCS= nv_driver.c nv_dac.c nv_setup.c nv_cursor.c nv_xaa.c nv_dga.c \
- nv_shadow.c nv_hw.c nv_video.c
+.include "Makefile.nv"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nv \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/include/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86 \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.nv}
+CPPFLAGS+= ${CPPFLAGS.nv}
-CPPFLAGS+= -DPSZ=8
-
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/r128/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/r128/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Xserver/hw/xfree86/drivers/r128/Makefile 6 Mar 2004 03:31:07 -0000 1.4
+++ Xserver/hw/xfree86/drivers/r128/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,56 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2004/03/06 03:31:07 rtr Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= r128_drv
-MAN= r128.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati
-
-SRCS= r128_accel.c r128_cursor.c r128_dga.c r128_driver.c r128_video.c \
- r128_misc.c
-
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
+MODULE= r128
-.if ${X11DRI} != "no"
-SRCS+= r128_dri.c
+.include "Makefile.r128"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
- -I${X11SRCDIR.xc}/lib/GL/dri \
- -I${X11SRCDIR.xc}/include
+SRCS+= ${SRCS.r128}
+CPPFLAGS+= ${CPPFLAGS.r128}
-CPPFLAGS+= ${X11FLAGS.DRI}
-.endif
-
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/radeon/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/radeon/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Xserver/hw/xfree86/drivers/radeon/Makefile 6 Mar 2004 03:31:07 -0000 1.7
+++ Xserver/hw/xfree86/drivers/radeon/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,56 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2004/03/06 03:31:07 rtr Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= radeon_drv
-MAN= radeon.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati
-
-SRCS= radeon_accel.c radeon_cursor.c radeon_dga.c radeon_driver.c \
- radeon_video.c radeon_misc.c
-
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
+MODULE= radeon
-.if ${X11DRI} != "no"
-SRCS+= radeon_dri.c
+.include "Makefile.radeon"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
- -I${X11SRCDIR.xc}/lib/GL/dri \
- -I${X11SRCDIR.xc}/include
+SRCS+= ${SRCS.radeon}
+CPPFLAGS+= ${CPPFLAGS.radeon}
-CPPFLAGS+= ${X11FLAGS.DRI}
-.endif
-
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/rendition/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/rendition/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/rendition/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/drivers/rendition/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,49 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= rendition_drv
-MAN= rendition.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/rendition
-
-SRCS= rendition.c vboard.c vmodes.c vramdac.c v1krisc.c \
- hwcursor.c vloaduc.c accel.c rendition_shadow.c
-
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/rendition \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
-
-CPPFLAGS+= -DMODULEDIR=\"${X11USRLIBDIR}/modules/\"
-
-BUILDSYMLINKS= accelX.c accel.c
+MODULE= rendition
-CPPFLAGS.accel.c= -DPSZ=16
+.include "Makefile.rendition"
-FILES= v10002d.uc v20002d.uc
-FILESDIR= ${X11USRLIBDIR}/modules
+SRCS+= ${SRCS.rendition}
+CPPFLAGS+= ${CPPFLAGS.rendition}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/s3/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/s3/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Xserver/hw/xfree86/drivers/s3/Makefile 7 Feb 2004 06:52:06 -0000 1.2
+++ Xserver/hw/xfree86/drivers/s3/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,50 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= s3_drv
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/s3
-
-SRCS= s3_driver.c s3_IBMRGB.c s3_Trio64DAC.c s3_accel_newmmio.c \
- s3_accel_pio.c s3_cursor.c s3_bios.c s3_video.c s3_dga.c \
- s3_Ti.c
-
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/s3 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
+MODULE= s3
-BUILDSYMLINKS= s3_accel.c s3_accel_newmmio.c \
- s3_accel.c s3_accel_pio.c
+.include "Makefile.s3"
-CPPFLAGS.s3_accel_newmmio.c= -DS3_NEWMMIO
-CPPFLAGS.s3_accel_pio.c= -DS3_GENERIC
-CPPFLAGS.s3_video.c= -DS3_NEWMMIO
+SRCS+= ${SRCS.s3}
+CPPFLAGS+= ${CPPFLAGS.s3}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/s3virge/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/s3virge/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/s3virge/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/drivers/s3virge/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,43 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= s3virge_drv
-MAN= s3virge.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/s3virge
+MODULE= s3virge
-SRCS= s3v_driver.c s3v_accel.c s3v_dac.c s3v_hwcurs.c s3v_dga.c \
- s3v_i2c.c s3v_shadow.c s3v_xv.c
+.include "Makefile.s3virge"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/s3virge \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.s3virge}
+CPPFLAGS+= ${CPPFLAGS.s3virge}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/savage/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/savage/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/savage/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/drivers/savage/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,44 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= savage_drv
-MAN= savage.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/savage
-
-SRCS= savage_driver.c savage_accel.c savage_cursor.c savage_dga.c \
- savage_i2c.c savage_image.c savage_shadow.c savage_vbe.c \
- savage_video.c
+MODULE= savage
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/savage \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${XSERVERINCDIR}
+.include "Makefile.savage"
-CPPFLAGS+= -DPSZ=8
+SRCS+= ${SRCS.savage}
+CPPFLAGS+= ${CPPFLAGS.savage}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/siliconmotion/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/siliconmotion/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/siliconmotion/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/drivers/siliconmotion/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,43 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= siliconmotion_drv
-MAN= siliconmotion.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/siliconmotion
-
-SRCS= smi_driver.c smi_accel.c smi_dac.c smi_hwcurs.c smi_dga.c \
- smi_i2c.c smi_shadow.c smi_video.c
+MODULE= siliconmotion
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/siliconmotion \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${XSERVERINCDIR}
+.include "Makefile.siliconmotion"
-CPPFLAGS+= -DPSZ=8
+SRCS+= ${SRCS.siliconmotion}
+CPPFLAGS+= ${CPPFLAGS.siliconmotion}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/sis/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/sis/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/sis/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/drivers/sis/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,46 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= sis_drv
-MAN= sis.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/sis
-
-SRCS= sis_driver.c sis_dac.c sis_cursor.c sis_accel.c sis_setup.c \
- sis300_accel.c sis310_accel.c sis_vga.c sis_vb.c \
- sis_opt.c sis_dga.c sis_video.c init.c init301.c sis_shadow.c \
- sis6326_video.c
+MODULE= sis
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/sis \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${XSERVERINCDIR}
+.include "Makefile.sis"
-CPPFLAGS.sis_video.c= -Wno-error # gcc3/macppc
+SRCS+= ${SRCS.sis}
+CPPFLAGS+= ${CPPFLAGS.sis}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/tdfx/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/tdfx/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/tdfx/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/drivers/tdfx/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,38 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= tdfx_drv
-MAN= tdfx.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tdfx
+MODULE= tdfx
-SRCS= tdfx_driver.c tdfx_io.c tdfx_hwcurs.c tdfx_accel.c tdfx_dga.c \
- tdfx_priv.c tdfx_sli.c tdfx_video.c
+.include "Makefile.tdfx"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tdfx \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.tdfx}
+CPPFLAGS+= ${CPPFLAGS.tdfx}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/tga/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/tga/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Xserver/hw/xfree86/drivers/tga/Makefile 7 Feb 2004 06:52:06 -0000 1.2
+++ Xserver/hw/xfree86/drivers/tga/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,37 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= tga_drv
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tga
-
-SRCS= tga_driver.c tga_dac.c tga_accel.c BTramdac.c ICS1562.c \
- BT463ramdac.c tga_cursor.c tga_line.c tga_seg.c IBM561ramdac.c
-
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tga \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
+MODULE= tga
-BUILDSYMLINKS= tga_line.c tga_seg.c
+.include "Makefile.tga"
-CPPFLAGS.tga_seg.c= -DPOLYSEGMENT
+SRCS+= ${SRCS.tga}
+CPPFLAGS+= ${CPPFLAGS.tga}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/trident/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/trident/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/trident/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/drivers/trident/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,44 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= trident_drv
-MAN= trident.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/trident
+MODULE= trident
-SRCS= trident_driver.c trident_dac.c tridenthelper.c \
- trident_accel.c trident_i2c.c trident_bank.c \
- image_accel.c blade_accel.c tvga_dac.c trident_dga.c \
- trident_shadow.c trident_video.c xp_accel.c
+.include "Makefile.trident"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/trident \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.trident}
+CPPFLAGS+= ${CPPFLAGS.trident}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/tseng/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/tseng/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/tseng/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/drivers/tseng/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,41 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= tseng_drv
-MAN= tseng.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tseng
+MODULE= tseng
-SRCS= tseng_driver.c tseng_ramdac.c tseng_bank.c tseng_clock.c \
- tseng_accel.c tseng_acl.c tseng_colexp.c tseng_cursor.c \
- tseng_dpms.c tseng_dga.c
+.include "Makefile.tseng"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/tseng \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.tseng}
+CPPFLAGS+= ${CPPFLAGS.tseng}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/vesa/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/vesa/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/vesa/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/drivers/vesa/Makefile 16 Apr 2004 13:55:02 -0000
@@ -1,40 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= vesa_drv
-MAN= vesa.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vesa
+MODULE= vesa
-SRCS= vesa.c
+.include "Makefile.vesa"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vesa \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/afb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.vesa}
+CPPFLAGS+= ${CPPFLAGS.vesa}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/vga/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/vga/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/vga/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/drivers/vga/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,41 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= vga_drv
-MAN= vga.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vga
-
-SRCS= generic.c
+MODULE= vga
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vga \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${XSERVERINCDIR}
+.include "Makefile.vga"
-.if ${MACHINE} == "alpha"
-CPPFLAGS+= -DSPECIAL_FB_BYTE_ACCESS
-.endif
+SRCS+= ${SRCS.vga}
+CPPFLAGS+= ${CPPFLAGS.vga}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/via/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/via/Makefile,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 Makefile
--- Xserver/hw/xfree86/drivers/via/Makefile 6 Mar 2004 03:31:07 -0000 1.1
+++ Xserver/hw/xfree86/drivers/via/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,57 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2004/03/06 03:31:07 rtr Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= via_drv
-MAN= via.4
-
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/via
-SRCS= via_driver.c via_tuner.c via_accel.c via_bandwidth.c \
- via_bios.c via_cursor.c via_shadow.c via_dga.c \
- via_video.c via_i2c.c via_gpioi2c.c via_utility.c \
- via_swov.c via_regrec.c via_hwdiff.c via_memory.c \
- via_overlay.c
-
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/via \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/mfb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/cfb \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/include/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${XSERVERINCDIR}
-
-.if ${X11DRI} != "no"
-SRCS+= via_dri.c
+MODULE= via
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
- -I${X11SRCDIR.xc}/lib/GL/dri \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel \
- -I${X11SRCDIR.xc}/include
+.include "Makefile.via"
-CPPFLAGS+= ${X11FLAGS.DRI}
-.endif
+SRCS+= ${SRCS.via}
+CPPFLAGS+= ${CPPFLAGS.via}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/drivers/vmware/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/vmware/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/drivers/vmware/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/drivers/vmware/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,38 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/drivers
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= vmware_drv
-MAN= vmware.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vmware
+MODULE= vmware
-SRCS= vmware.c vmwarecurs.c vmwarexaa.c bits2pixels.c offscreen_manager.c
+.include "Makefile.vmware"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/vmware \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
- -I${X11SRCDIR.xc}/programs/Xserver/fb \
- -I${X11SRCDIR.xc}/programs/Xserver/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
- -I${X11SRCDIR.xc}/programs/Xserver/Xext \
- -I${X11SRCDIR.xc}/programs/Xserver/render \
- -I${X11SRCDIR.xc}/include/fonts \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.vmware}
+CPPFLAGS+= ${CPPFLAGS.vmware}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Xserver/hw/xfree86/input/Makefile 27 Dec 2003 03:14:56 -0000 1.2
+++ Xserver/hw/xfree86/input/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,7 +1,11 @@
# $NetBSD: Makefile,v 1.2 2003/12/27 03:14:56 rtr Exp $
+.include "../../../Makefile.serverlib"
+
SUBDIR= mouse calcomp citron digitaledge dmc dynapro elographics fpit \
hyperpen js_x kbd magellan microtouch mutouch palmax penmount \
spaceorb summa tek4957 void wacom
+.if ${X11LOADABLE} != "no"
.include <bsd.subdir.mk>
+.endif
Index: Xserver/hw/xfree86/input/calcomp/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/calcomp/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Xserver/hw/xfree86/input/calcomp/Makefile 7 Feb 2004 06:52:06 -0000 1.2
+++ Xserver/hw/xfree86/input/calcomp/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,23 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= calcomp_drv
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/calcomp
+MODULE= calcomp
-SRCS= xf86Calcomp.c
+.include "Makefile.calcomp"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/calcomp \
- -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${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.calcomp}
+CPPFLAGS+= ${CPPFLAGS.calcomp}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/citron/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/citron/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/input/citron/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/input/citron/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,25 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= citron_drv
-MAN= citron.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/citron
+MODULE= citron
-SRCS= citron.c
+.include "Makefile.citron"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/citron \
- -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}
+SRCS+= ${SRCS.citron}
+CPPFLAGS+= ${CPPFLAGS.citron}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/digitaledge/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/digitaledge/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Xserver/hw/xfree86/input/digitaledge/Makefile 7 Feb 2004 06:52:06 -0000 1.2
+++ Xserver/hw/xfree86/input/digitaledge/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= digitaledge_drv
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/digitaledge
+MODULE= digitaledge
-SRCS= DigitalEdge.c
+.include "Makefile.digitaledge"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/digitaledge \
- -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}
+SRCS+= ${SRCS.digitaledge}
+CPPFLAGS+= ${CPPFLAGS.digitaledge}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/dmc/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/dmc/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/input/dmc/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/input/dmc/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= dmc_drv
-MAN= dmc.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/dmc
+MODULE= dmc
-SRCS= xf86DMC.c
+.include "Makefile.dmc"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/dmc \
- -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${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.dmc}
+CPPFLAGS+= ${CPPFLAGS.dmc}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/dynapro/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/dynapro/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/input/dynapro/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/input/dynapro/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= dynapro_drv
-MAN= dynapro.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/dynapro
+MODULE= dynapro
-SRCS= xf86Dyna.c
+.include "Makefile.dynapro"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/dynapro \
- -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${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.dynapro}
+CPPFLAGS+= ${CPPFLAGS.dynapro}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/elographics/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/elographics/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/input/elographics/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/input/elographics/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= elographics_drv
-MAN= elographics.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/elographics
+MODULE= elographics
-SRCS= xf86Elo.c
+.include "Makefile.elographics"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/elographics \
- -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${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.elographics}
+CPPFLAGS+= ${CPPFLAGS.elographics}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/fpit/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/fpit/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/input/fpit/Makefile 7 Feb 2004 06:52:06 -0000 1.3
+++ Xserver/hw/xfree86/input/fpit/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,25 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= fpit_drv
-MAN= fpit.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/fpit
+MODULE= fpit
-SRCS= xf86Fpit.c
+.include "Makefile.fpit"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/fpit \
- -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}
+SRCS+= ${SRCS.fpit}
+CPPFLAGS+= ${CPPFLAGS.fpit}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/hyperpen/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/hyperpen/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Xserver/hw/xfree86/input/hyperpen/Makefile 7 Feb 2004 06:52:06 -0000 1.2
+++ Xserver/hw/xfree86/input/hyperpen/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:06 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= hyperpen_drv
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/hyperpen
+MODULE= hyperpen
-SRCS= xf86HyperPen.c
+.include "Makefile.hyperpen"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/hyperpen \
- -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}
+SRCS+= ${SRCS.hyperpen}
+CPPFLAGS+= ${CPPFLAGS.hyperpen}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/js_x/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/js_x/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/input/js_x/Makefile 7 Feb 2004 06:52:07 -0000 1.3
+++ Xserver/hw/xfree86/input/js_x/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,25 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= js_x_drv
-MAN= js_x.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/jamstudio
+MODULE= js_x
-SRCS= js_x.c
+.include "Makefile.js_x"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/jamstudio \
- -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}
+SRCS+= ${SRCS.js_x}
+CPPFLAGS+= ${CPPFLAGS.js_x}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/kbd/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/kbd/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Xserver/hw/xfree86/input/kbd/Makefile 7 Feb 2004 06:52:07 -0000 1.4
+++ Xserver/hw/xfree86/input/kbd/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,25 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2004/02/07 06:52:07 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= kbd_drv
-MAN= kbd.4 keyboard.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/keyboard
+MODULE= kbd
-SRCS= kbd.c
+.include "Makefile.kbd"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/keyboard \
- -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}
+SRCS+= ${SRCS.kbd}
+CPPFLAGS+= ${CPPFLAGS.kbd}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/magellan/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/magellan/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Xserver/hw/xfree86/input/magellan/Makefile 7 Feb 2004 06:52:07 -0000 1.2
+++ Xserver/hw/xfree86/input/magellan/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,23 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= magellan_drv
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/magellan
+MODULE= magellan
-SRCS= magellan.c
+.include "Makefile.magellan"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/magellan \
- -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${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.magellan}
+CPPFLAGS+= ${CPPFLAGS.magellan}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/microtouch/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/microtouch/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/input/microtouch/Makefile 7 Feb 2004 06:52:07 -0000 1.3
+++ Xserver/hw/xfree86/input/microtouch/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= microtouch_drv
-MAN= microtouch.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/microtouch
+MODULE= microtouch
-SRCS= microtouch.c
+.include "Makefile.microtouch"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/microtouch \
- -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${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.microtouch}
+CPPFLAGS+= ${CPPFLAGS.microtouch}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/mouse/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/mouse/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Xserver/hw/xfree86/input/mouse/Makefile 7 Feb 2004 06:52:07 -0000 1.5
+++ Xserver/hw/xfree86/input/mouse/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,27 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2004/02/07 06:52:07 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= mouse_drv
-MAN= mouse.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/mouse
-
-SRCS= mouse.c pnp.c
+MODULE= mouse
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/mouse \
- -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/mi \
- -I${X11SRCDIR.xc}/programs/Xserver/include \
- -I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
+.include "Makefile.mouse"
-CPPFLAGS+= -DPNP_MOUSE
+SRCS+= ${SRCS.mouse}
+CPPFLAGS+= ${CPPFLAGS.mouse}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/mutouch/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/mutouch/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/input/mutouch/Makefile 7 Feb 2004 06:52:07 -0000 1.3
+++ Xserver/hw/xfree86/input/mutouch/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,25 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= mutouch_drv
-MAN= mutouch.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/mutouch
+MODULE= mutouch
-SRCS= xf86MuTouch.c
+.include "Makefile.mutouch"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/mutouch \
- -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}
+SRCS+= ${SRCS.mutouch}
+CPPFLAGS+= ${CPPFLAGS.mutouch}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/palmax/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/palmax/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/input/palmax/Makefile 7 Feb 2004 06:52:07 -0000 1.3
+++ Xserver/hw/xfree86/input/palmax/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,25 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= palmax_drv
-MAN= palmax.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/palmax
+MODULE= palmax
-SRCS= xf86Palmax.c
+.include "Makefile.palmax"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/palmax \
- -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}
+SRCS+= ${SRCS.palmax}
+CPPFLAGS+= ${CPPFLAGS.palmax}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/penmount/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/penmount/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/input/penmount/Makefile 7 Feb 2004 06:52:07 -0000 1.3
+++ Xserver/hw/xfree86/input/penmount/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= penmount_drv
-MAN= penmount.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/penmount
+MODULE= penmount
-SRCS= xf86PM.c
+.include "Makefile.penmount"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/penmount \
- -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${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.penmount}
+CPPFLAGS+= ${CPPFLAGS.penmount}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/spaceorb/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/spaceorb/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Xserver/hw/xfree86/input/spaceorb/Makefile 7 Feb 2004 06:52:07 -0000 1.2
+++ Xserver/hw/xfree86/input/spaceorb/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,23 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= spaceorb_drv
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/spaceorb
+MODULE= spaceorb
-SRCS= spaceorb.c
+.include "Makefile.spaceorb"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/spaceorb \
- -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${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${XSERVERINCDIR}
+SRCS+= ${SRCS.spaceorb}
+CPPFLAGS+= ${CPPFLAGS.spaceorb}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/summa/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/summa/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Xserver/hw/xfree86/input/summa/Makefile 7 Feb 2004 06:52:07 -0000 1.2
+++ Xserver/hw/xfree86/input/summa/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,24 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2004/02/07 06:52:07 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= summa_drv
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/summa
+MODULE= summa
-SRCS= xf86Summa.c
+.include "Makefile.summa"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/summa \
- -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}
+SRCS+= ${SRCS.summa}
+CPPFLAGS+= ${CPPFLAGS.summa}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/tek4957/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/tek4957/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/input/tek4957/Makefile 7 Feb 2004 06:52:07 -0000 1.3
+++ Xserver/hw/xfree86/input/tek4957/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,25 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= tek4957_drv
-MAN= tek4957.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/tek4957
+MODULE= tek4957
-SRCS= xf86Tek4957.c
+.include "Makefile.tek4957"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/tek4957 \
- -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}
+SRCS+= ${SRCS.tek4957}
+CPPFLAGS+= ${CPPFLAGS.tek4957}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/void/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/void/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/input/void/Makefile 7 Feb 2004 06:52:07 -0000 1.3
+++ Xserver/hw/xfree86/input/void/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,25 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= void_drv
-MAN= void.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/void
+MODULE= void
-SRCS= void.c
+.include "Makefile.void"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/void \
- -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}
+SRCS+= ${SRCS.void}
+CPPFLAGS+= ${CPPFLAGS.void}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
Index: Xserver/hw/xfree86/input/wacom/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/input/wacom/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Xserver/hw/xfree86/input/wacom/Makefile 7 Feb 2004 06:52:07 -0000 1.3
+++ Xserver/hw/xfree86/input/wacom/Makefile 16 Apr 2004 13:55:03 -0000
@@ -1,25 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:07 lukem Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/input
+# $NetBSD: Makefile,v 1.3 2004/02/07 06:52:05 lukem Exp $
.include "../../../../Makefile.serverlib"
-MODULE= wacom_drv
-MAN= wacom.4
-.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/wacom
+MODULE= wacom
-SRCS= xf86Wacom.c
+.include "Makefile.wacom"
-CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/wacom \
- -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}
+SRCS+= ${SRCS.wacom}
+CPPFLAGS+= ${CPPFLAGS.wacom}
.include <bsd.x11.mk>
-LIBDIR= ${XMODULEDIR}
+LIBDIR= ${X11USRLIBDIR}/modules/drivers
.include "../../Makefile.drivermod"
--Boundary-00=_Jq9fASWXFfjtb4G--