On Sat, May 24, 2003 at 12:43:46AM +1000, Daniel Stone wrote:
> On Fri, May 23, 2003 at 04:14:27PM +0200, Sven Luther wrote:
> > On Sat, May 24, 2003 at 12:04:22AM +1000, Daniel Stone wrote:
> > > If you want to backport the fixes to xf-4.3-branch, I'll look at it
> > > then.
> >
> > Yes, do you want me to commit it to the 4.3.0 bugfix branch, or would
> > you also accept a plain patch for now ?
>
> Either is fine.
Ok, here is a patch against upstream 4.3.0, it should apply cleanly,
unless you modified the Imakefiles in an incompatible way in a preview
patch, but i don't think so.
All of these changes will only take effect if the install.sdk makefile
target is called, so they should be transparent and not have any
influence on other stuff.
I will commit this to the xfree86 4.3.0 bugfix branch this weekend
anyway.
With this, i managed to build the drivers from the SDK and install them
over the normal drivers with :
cd /usr/X11R6/lib/Server; ./mkmf; make; make install
My aim is to arrange things so i can move them to another place and
build from there, particularly as non root, so that the drivers can be
built without problems by the autobuilders. Once that is done, the rest
of the work will be with the trunk CVS, and does not concern you
anymore, and we will be able to provide our users with fresh out of CVS
X drivers which are compatible with the 4.3.0 debian packages.
Friendly,
Sven Luther
Index: include/extensions/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/include/extensions/Imakefile,v
retrieving revision 3.54
diff -u -u -r3.54 Imakefile
--- include/extensions/Imakefile 2003/04/14 20:37:07 3.54
+++ include/extensions/Imakefile 2003/04/21 12:22:11
@@ -99,6 +99,8 @@
InstallDriverSDKNonExecFile(xf86dgastr.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(xf86rush.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(xf86rushstr.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(renderproto.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(XvMC.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(Xvlib.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/X11/extensions)
Index: programs/Xserver/hw/xfree86/common/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/common/Imakefile,v
retrieving revision 3.148
diff -u -u -r3.148 Imakefile
--- programs/Xserver/hw/xfree86/common/Imakefile 2003/02/17 17:06:41
3.148
+++ programs/Xserver/hw/xfree86/common/Imakefile 2003/04/21 12:22:24
@@ -288,3 +288,5 @@
InstallDriverSDKNonExecFile(xf86str.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(xf86xv.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(xf86xvmc.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(xf86Bus.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(xf86pciBus.h,$(DRIVERSDKINCLUDEDIR))
Index: programs/Xserver/hw/xfree86/drivers/ati/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile,v
retrieving revision 1.45
diff -u -u -r1.45 Imakefile
--- programs/Xserver/hw/xfree86/drivers/ati/Imakefile 2003/02/17 17:06:41
1.45
+++ programs/Xserver/hw/xfree86/drivers/ati/Imakefile 2003/04/21 12:22:26
@@ -207,6 +207,7 @@
InstallObjectModule(r128,$(MODULEDIR),drivers)
InstallObjectModule(radeon,$(MODULEDIR),drivers)
+#if !defined(XF86DriverSDK)
#if 0
InstallModuleManPage(ati)
#endif
@@ -214,6 +215,7 @@
InstallModuleManPage(r128)
InstallModuleManPage(radeon)
+#endif
DependTarget()
@@ -332,6 +334,7 @@
InstallDriverSDKNonExecFile(radeon_version.h,$(DRIVERSDKDIR)/drivers/ati)
InstallDriverSDKNonExecFile(radeon_video.c,$(DRIVERSDKDIR)/drivers/ati)
InstallDriverSDKNonExecFile(radeon_common.h,$(DRIVERSDKDIR)/drivers/ati)
+InstallDriverSDKNonExecFile(radeon_accelfuncs.c,$(DRIVERSDKDIR)/drivers/ati)
InstallDriverSDKObjectModule(ati,$(DRIVERSDKMODULEDIR),drivers)
InstallDriverSDKObjectModule(atimisc,$(DRIVERSDKMODULEDIR),drivers)
Index: programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile,v
retrieving revision 1.8
diff -u -u -r1.8 Imakefile
--- programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile 2003/02/17 17:06:42
1.8
+++ programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile 2003/04/21 12:22:26
@@ -43,6 +43,7 @@
InstallDriverSDKNonExecFile(cyrix_bank.c,$(DRIVERSDKDIR)/drivers/cyrix)
InstallDriverSDKNonExecFile(cyrix_driver.c,$(DRIVERSDKDIR)/drivers/cyrix)
InstallDriverSDKNonExecFile(cyrix_helper.c,$(DRIVERSDKDIR)/drivers/cyrix)
+InstallDriverSDKNonExecFile(cyrix_shadow.c,$(DRIVERSDKDIR)/drivers/cyrix)
InstallDriverSDKObjectModule(cyrix,$(DRIVERSDKMODULEDIR),drivers)
Index: programs/Xserver/hw/xfree86/drivers/i740/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/i740/Imakefile,v
retrieving revision 1.10
diff -u -u -r1.10 Imakefile
--- programs/Xserver/hw/xfree86/drivers/i740/Imakefile 2003/02/17 17:06:42
1.10
+++ programs/Xserver/hw/xfree86/drivers/i740/Imakefile 2003/04/21 12:22:27
@@ -47,6 +47,10 @@
InstallDriverSDKNonExecFile(i740_io.c,$(DRIVERSDKDIR)/drivers/i740)
InstallDriverSDKNonExecFile(i740_macros.h,$(DRIVERSDKDIR)/drivers/i740)
InstallDriverSDKNonExecFile(i740_reg.h,$(DRIVERSDKDIR)/drivers/i740)
+InstallDriverSDKNonExecFile(i740_dga.h,$(DRIVERSDKDIR)/drivers/i740)
+InstallDriverSDKNonExecFile(i740_dga.c,$(DRIVERSDKDIR)/drivers/i740)
+InstallDriverSDKNonExecFile(i740_i2c.c,$(DRIVERSDKDIR)/drivers/i740)
+InstallDriverSDKNonExecFile(i740_video.c,$(DRIVERSDKDIR)/drivers/i740)
InstallDriverSDKObjectModule(i740,$(DRIVERSDKMODULEDIR),drivers)
Index: programs/Xserver/hw/xfree86/drivers/mga/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile,v
retrieving revision 1.46
diff -u -u -r1.46 Imakefile
--- programs/Xserver/hw/xfree86/drivers/mga/Imakefile 2003/02/17 17:06:42
1.46
+++ programs/Xserver/hw/xfree86/drivers/mga/Imakefile 2003/04/21 12:22:27
@@ -68,7 +68,7 @@
OBJS = $(MGAOBJS) $(MGAHALOBJS)
#if defined(XF86DriverSDK)
-INCLUDES = -I. -I../../include
+INCLUDES = -I. -I../../include $(MGAHALINCLUDES)
#else
INCLUDES = -I. $(MGAHALINCLUDES) -I$(XF86COMSRC) -I$(XF86OSSRC) \
-I$(SERVERSRC)/fb \
@@ -133,6 +133,20 @@
InstallDriverSDKNonExecFile(mga_video.c,$(DRIVERSDKDIR)/drivers/mga)
InstallDriverSDKNonExecFile(mga_halmod.c,$(DRIVERSDKDIR)/drivers/mga)
InstallDriverSDKNonExecFile(mga_common.h,$(DRIVERSDKDIR)/drivers/mga)
+InstallDriverSDKNonExecFile(mga_dripriv.h,$(DRIVERSDKDIR)/drivers/mga)
+InstallDriverSDKNonExecFile(mga_dri.h,$(DRIVERSDKDIR)/drivers/mga)
+InstallDriverSDKNonExecFile(mga_merge.h,$(DRIVERSDKDIR)/drivers/mga)
+InstallDriverSDKNonExecFile(mga_merge.c,$(DRIVERSDKDIR)/drivers/mga)
+InstallDriverSDKNonExecFile(mga_g450pll.c,$(DRIVERSDKDIR)/drivers/mga)
+InstallDriverSDKNonExecFile(mga_dh.c,$(DRIVERSDKDIR)/drivers/mga)
+InstallDriverSDKNonExecFile(mga_esc.c,$(DRIVERSDKDIR)/drivers/mga)
+InstallDriverSDKNonExecFile(mga_dri.c,$(DRIVERSDKDIR)/drivers/mga)
+InstallDriverSDKNonExecFile(mgareg_flags.h,$(DRIVERSDKDIR)/drivers/mga)
+InstallDriverSDKNonExecFile(mga_sarea.h,$(DRIVERSDKDIR)/drivers/mga)
+InstallDriverSDKNonExecFile(mga_ucode.h,$(DRIVERSDKDIR)/drivers/mga)
+InstallDriverSDKNonExecFile(client.h,$(DRIVERSDKDIR)/drivers/mga)
+InstallDriverSDKNonExecFile(clientlx.c,$(DRIVERSDKDIR)/drivers/mga)
+InstallDriverSDKNonExecFile(HALlib/binding.h,$(DRIVERSDKDIR)/drivers/mga/HALlib)
InstallDriverSDKObjectModule(mga,$(DRIVERSDKMODULEDIR),drivers)
#if BuildMatroxHal
Index: programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile
===================================================================
RCS file:
/home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile,v
retrieving revision 1.13
diff -u -u -r1.13 Imakefile
--- programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile 2003/02/17
17:06:43 1.13
+++ programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile 2003/04/21
12:22:28
@@ -56,5 +56,7 @@
InstallDriverSDKNonExecFile(neo_shadow.c,$(DRIVERSDKDIR)/drivers/neomagic)
InstallDriverSDKNonExecFile(neo_macros.h,$(DRIVERSDKDIR)/drivers/neomagic)
InstallDriverSDKNonExecFile(neo_reg.h,$(DRIVERSDKDIR)/drivers/neomagic)
+InstallDriverSDKNonExecFile(neo_video.c,$(DRIVERSDKDIR)/drivers/neomagic)
+InstallDriverSDKNonExecFile(neo_video.h,$(DRIVERSDKDIR)/drivers/neomagic)
InstallDriverSDKObjectModule(neomagic,$(DRIVERSDKMODULEDIR),drivers)
Index: programs/Xserver/hw/xfree86/drivers/newport/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/newport/Imakefile,v
retrieving revision 1.5
diff -u -u -r1.5 Imakefile
--- programs/Xserver/hw/xfree86/drivers/newport/Imakefile 2002/12/10
04:03:00 1.5
+++ programs/Xserver/hw/xfree86/drivers/newport/Imakefile 2003/04/21
12:22:28
@@ -43,6 +43,7 @@
InstallDriverSDKNonExecFile(newport_regs.c,$(DRIVERSDKDIR)/drivers/newport)
InstallDriverSDKNonExecFile(newport_cmap.c,$(DRIVERSDKDIR)/drivers/newport)
InstallDriverSDKNonExecFile(newport_shadow.c,$(DRIVERSDKDIR)/drivers/newport)
+InstallDriverSDKNonExecFile(newport_cursor.c,$(DRIVERSDKDIR)/drivers/newport)
InstallDriverSDKNonExecFile(newport_regs.h,$(DRIVERSDKDIR)/drivers/newport)
InstallDriverSDKNonExecFile(newport.h,$(DRIVERSDKDIR)/drivers/newport)
Index: programs/Xserver/hw/xfree86/drivers/nsc/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/nsc/Imakefile,v
retrieving revision 1.6
diff -u -u -r1.6 Imakefile
--- programs/Xserver/hw/xfree86/drivers/nsc/Imakefile 2003/02/19 10:10:49
1.6
+++ programs/Xserver/hw/xfree86/drivers/nsc/Imakefile 2003/04/21 12:22:28
@@ -61,7 +61,7 @@
nsc_gx2_shadow.o $(I86OBJ) $(STBOBJS) $(DURANGOOBJS)
#if defined(XF86DriverSDK)
-INCLUDES = -I. -I../../include
+INCLUDES = -I. -I../../include $(EXTINCLUDES)
#else
INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/Xext \
-I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
@@ -138,6 +138,7 @@
InstallDriverSDKNonExecFile(gfx/gfx_rndr.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
InstallDriverSDKNonExecFile(gfx/gfx_rtns.h,$(DRIVERSDKDIR)/drivers/nsc/gfx)
InstallDriverSDKNonExecFile(gfx/gfx_tv.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+InstallDriverSDKNonExecFile(gfx/gfx_tv.h,$(DRIVERSDKDIR)/drivers/nsc/gfx)
InstallDriverSDKNonExecFile(gfx/gfx_type.h,$(DRIVERSDKDIR)/drivers/nsc/gfx)
InstallDriverSDKNonExecFile(gfx/gfx_vga.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
InstallDriverSDKNonExecFile(gfx/gfx_vid.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
@@ -155,11 +156,15 @@
InstallDriverSDKNonExecFile(gfx/tv_1200.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
InstallDriverSDKNonExecFile(gfx/tv_fs450.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
InstallDriverSDKNonExecFile(gfx/tv_fs450.h,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+InstallDriverSDKNonExecFile(gfx/tv_fs451.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+InstallDriverSDKNonExecFile(gfx/tv_geode.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
InstallDriverSDKNonExecFile(gfx/vga_gu1.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
InstallDriverSDKNonExecFile(gfx/vid_1200.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+InstallDriverSDKNonExecFile(gfx/vid_1400.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
InstallDriverSDKNonExecFile(gfx/vid_5530.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
InstallDriverSDKNonExecFile(gfx/vid_rdcl.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
InstallDriverSDKNonExecFile(gfx/vip_1200.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
+InstallDriverSDKNonExecFile(gfx/vip_1400.c,$(DRIVERSDKDIR)/drivers/nsc/gfx)
InstallDriverSDKNonExecFile(panel/92xx.h,$(DRIVERSDKDIR)/drivers/nsc/panel)
InstallDriverSDKNonExecFile(panel/cen9211.c,$(DRIVERSDKDIR)/drivers/nsc/panel)
InstallDriverSDKNonExecFile(panel/cen9211.h,$(DRIVERSDKDIR)/drivers/nsc/panel)
@@ -167,6 +172,8 @@
InstallDriverSDKNonExecFile(panel/dora9211.h,$(DRIVERSDKDIR)/drivers/nsc/panel)
InstallDriverSDKNonExecFile(panel/drac9210.c,$(DRIVERSDKDIR)/drivers/nsc/panel)
InstallDriverSDKNonExecFile(panel/drac9210.h,$(DRIVERSDKDIR)/drivers/nsc/panel)
+InstallDriverSDKNonExecFile(panel/gx2_9211.c,$(DRIVERSDKDIR)/drivers/nsc/panel)
+InstallDriverSDKNonExecFile(panel/gx2_9211.h,$(DRIVERSDKDIR)/drivers/nsc/panel)
InstallDriverSDKNonExecFile(panel/panel.c,$(DRIVERSDKDIR)/drivers/nsc/panel)
InstallDriverSDKNonExecFile(panel/panel.h,$(DRIVERSDKDIR)/drivers/nsc/panel)
InstallDriverSDKNonExecFile(panel/platform.c,$(DRIVERSDKDIR)/drivers/nsc/panel)
Index: programs/Xserver/hw/xfree86/drivers/s3/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/s3/Imakefile,v
retrieving revision 1.10
diff -u -u -r1.10 Imakefile
--- programs/Xserver/hw/xfree86/drivers/s3/Imakefile 2003/02/17 17:06:43
1.10
+++ programs/Xserver/hw/xfree86/drivers/s3/Imakefile 2003/04/21 12:22:29
@@ -46,6 +46,7 @@
SpecialCObjectRule(s3_video,$(_NOOP_), -DS3_NEWMMIO)
InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/s3)
+InstallDriverSDKNonExecFile(newmmio.h,$(DRIVERSDKDIR)/drivers/s3)
InstallDriverSDKNonExecFile(s3.h,$(DRIVERSDKDIR)/drivers/s3)
InstallDriverSDKNonExecFile(s3_reg.h,$(DRIVERSDKDIR)/drivers/s3)
InstallDriverSDKNonExecFile(s3_driver.c,$(DRIVERSDKDIR)/drivers/s3)
@@ -57,4 +58,3 @@
InstallDriverSDKNonExecFile(s3_Trio64DAC.c,$(DRIVERSDKDIR)/drivers/s3)
InstallDriverSDKNonExecFile(s3_IBMRGB.c,$(DRIVERSDKDIR)/drivers/s3)
InstallDriverSDKNonExecFile(s3_Ti.c,$(DRIVERSDKDIR)/drivers/s3)
-
Index: programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile,v
retrieving revision 1.21
diff -u -u -r1.21 Imakefile
--- programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile 2003/02/17
17:06:43 1.21
+++ programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile 2003/04/21
12:22:29
@@ -63,5 +63,6 @@
InstallDriverSDKNonExecFile(s3v_macros.h,$(DRIVERSDKDIR)/drivers/s3virge)
InstallDriverSDKNonExecFile(s3v_rop.h,$(DRIVERSDKDIR)/drivers/s3virge)
InstallDriverSDKNonExecFile(s3v_shadow.c,$(DRIVERSDKDIR)/drivers/s3virge)
+InstallDriverSDKNonExecFile(s3v_xv.c,$(DRIVERSDKDIR)/drivers/s3virge)
InstallDriverSDKObjectModule(s3virge,$(DRIVERSDKMODULEDIR),drivers)
Index: programs/Xserver/hw/xfree86/drivers/sis/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile,v
retrieving revision 1.31
diff -u -u -r1.31 Imakefile
--- programs/Xserver/hw/xfree86/drivers/sis/Imakefile 2003/02/17 17:06:44
1.31
+++ programs/Xserver/hw/xfree86/drivers/sis/Imakefile 2003/04/21 12:22:30
@@ -73,6 +73,7 @@
InstallDriverSDKNonExecFile(sis300_accel.h,$(DRIVERSDKDIR)/drivers/sis)
InstallDriverSDKNonExecFile(sis310_accel.c,$(DRIVERSDKDIR)/drivers/sis)
InstallDriverSDKNonExecFile(sis310_accel.h,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_accel.h,$(DRIVERSDKDIR)/drivers/sis)
InstallDriverSDKNonExecFile(sis_accel.c,$(DRIVERSDKDIR)/drivers/sis)
InstallDriverSDKNonExecFile(init.c,$(DRIVERSDKDIR)/drivers/sis)
InstallDriverSDKNonExecFile(init.h,$(DRIVERSDKDIR)/drivers/sis)
@@ -103,5 +104,8 @@
InstallDriverSDKNonExecFile(sis_vga.c,$(DRIVERSDKDIR)/drivers/sis)
InstallDriverSDKNonExecFile(sis_video.c,$(DRIVERSDKDIR)/drivers/sis)
InstallDriverSDKNonExecFile(sis6326_video.c,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(sis_accel.c,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(vgatypes.h,$(DRIVERSDKDIR)/drivers/sis)
+InstallDriverSDKNonExecFile(vstruct.h,$(DRIVERSDKDIR)/drivers/sis)
InstallDriverSDKObjectModule(sis,$(DRIVERSDKMODULEDIR),drivers)
Index: programs/Xserver/hw/xfree86/drivers/trident/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/trident/Imakefile,v
retrieving revision 1.32
diff -u -u -r1.32 Imakefile
--- programs/Xserver/hw/xfree86/drivers/trident/Imakefile 2003/04/15
22:13:43 1.32
+++ programs/Xserver/hw/xfree86/drivers/trident/Imakefile 2003/04/21
12:22:30
@@ -62,5 +62,6 @@
InstallDriverSDKNonExecFile(tridentramdac.c,$(DRIVERSDKDIR)/drivers/trident)
InstallDriverSDKNonExecFile(trident_video.c,$(DRIVERSDKDIR)/drivers/trident)
InstallDriverSDKNonExecFile(tvga_dac.c,$(DRIVERSDKDIR)/drivers/trident)
+InstallDriverSDKNonExecFile(xp_accel.c,$(DRIVERSDKDIR)/drivers/trident)
InstallDriverSDKObjectModule(trident,$(DRIVERSDKMODULEDIR),drivers)
Index: programs/Xserver/hw/xfree86/drivers/vesa/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/vesa/Imakefile,v
retrieving revision 1.6
diff -u -u -r1.6 Imakefile
--- programs/Xserver/hw/xfree86/drivers/vesa/Imakefile 2003/02/17 17:06:44
1.6
+++ programs/Xserver/hw/xfree86/drivers/vesa/Imakefile 2003/04/21 12:22:31
@@ -40,6 +40,7 @@
InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/vesa)
InstallDriverSDKNonExecFile(vesa.c,$(DRIVERSDKDIR)/drivers/vesa)
+InstallDriverSDKNonExecFile(vesa.h,$(DRIVERSDKDIR)/drivers/vesa)
InstallDriverSDKObjectModule(vesa,$(DRIVERSDKMODULEDIR),drivers)
Index: programs/Xserver/hw/xfree86/drivers/vmware/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/vmware/Imakefile,v
retrieving revision 1.6
diff -u -u -r1.6 Imakefile
--- programs/Xserver/hw/xfree86/drivers/vmware/Imakefile 2003/02/17
17:06:45 1.6
+++ programs/Xserver/hw/xfree86/drivers/vmware/Imakefile 2003/04/21
12:22:31
@@ -43,5 +43,20 @@
DependTarget()
InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(vmware.c,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(vmwarecurs.c,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(vmwarexaa.c,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(guest_os.h,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(includeCheck.h,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(svga_limits.h,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(svga_reg.h,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(svga_struct.h,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(vm_basic_types.h,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(vm_device_version.h,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(vmware.h,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(bits2pixels.c,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(bits2pixels.h,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(offscreen_manager.c,$(DRIVERSDKDIR)/drivers/vmware)
+InstallDriverSDKNonExecFile(offscreen_manager.h,$(DRIVERSDKDIR)/drivers/vmware)
InstallDriverSDKObjectModule(vmware,$(DRIVERSDKMODULEDIR),drivers)
Index: programs/Xserver/hw/xfree86/os-support/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/os-support/Imakefile,v
retrieving revision 3.56
diff -u -u -r3.56 Imakefile
--- programs/Xserver/hw/xfree86/os-support/Imakefile 2003/02/17 17:06:45
3.56
+++ programs/Xserver/hw/xfree86/os-support/Imakefile 2003/04/21 12:22:33
@@ -119,3 +119,5 @@
InstallDriverSDKNonExecFile(xf86_ansic.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(xf86_libc.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(xf86drm.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(xf86drmCompat.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(assyntax.h,$(DRIVERSDKINCLUDEDIR))
Index: programs/Xserver/hw/xfree86/vbe/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/vbe/Imakefile,v
retrieving revision 1.1
diff -u -u -r1.1 Imakefile
--- programs/Xserver/hw/xfree86/vbe/Imakefile 2003/02/17 17:06:45 1.1
+++ programs/Xserver/hw/xfree86/vbe/Imakefile 2003/04/21 12:22:35
@@ -33,4 +33,5 @@
InstallDriverSDKLibraryModule(vbe,$(DRIVERSDKMODULEDIR),.)
InstallDriverSDKNonExecFile(vbe.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(vbeModes.h,$(DRIVERSDKINCLUDEDIR))
Index: programs/Xserver/mi/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/mi/Imakefile,v
retrieving revision 3.34
diff -u -u -r3.34 Imakefile
--- programs/Xserver/mi/Imakefile 2002/05/22 21:38:31 3.34
+++ programs/Xserver/mi/Imakefile 2003/04/21 12:22:38
@@ -85,3 +85,4 @@
InstallDriverSDKNonExecFile(mipointer.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(mipointrst.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(mizerarc.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(micoord.h,$(DRIVERSDKINCLUDEDIR))
Index: programs/Xserver/render/Imakefile
===================================================================
RCS file: /home/x-cvs/xc/programs/Xserver/render/Imakefile,v
retrieving revision 1.10
diff -u -u -r1.10 Imakefile
--- programs/Xserver/render/Imakefile 2002/11/23 02:38:15 1.10
+++ programs/Xserver/render/Imakefile 2003/04/21 12:22:39
@@ -36,3 +36,9 @@
NormalLintTarget($(SRCS))
DependTarget()
+
+InstallDriverSDKNonExecFile(glyphstr.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(mipict.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(picture.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(picturestr.h,$(DRIVERSDKINCLUDEDIR))
+
--- lib/GL/mesa/src/drv/i830/Imakefile.orig 2003-05-23 17:50:02.000000000
+0200
+++ lib/GL/mesa/src/drv/i830/Imakefile 2003-05-23 17:51:57.000000000 +0200
@@ -75,3 +75,15 @@
DependTarget()
+InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
+InstallDriverSDKNonExecFile(i830_3d_reg.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
+InstallDriverSDKNonExecFile(i830_context.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
+InstallDriverSDKNonExecFile(i830_debug.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
+InstallDriverSDKNonExecFile(i830_ioctl.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
+InstallDriverSDKNonExecFile(i830_screen.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
+InstallDriverSDKNonExecFile(i830_span.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
+InstallDriverSDKNonExecFile(i830_state.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
+InstallDriverSDKNonExecFile(i830_tex.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
+InstallDriverSDKNonExecFile(i830_tris.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
+InstallDriverSDKNonExecFile(i830_vb.h,$(DRIVERSDKDIR)/lib/GL/mesa/src/drv/i830)
+
--- programs/Xserver/Xext/Imakefile.orig 2003-05-23 23:38:15.000000000
+0200
+++ programs/Xserver/Xext/Imakefile 2003-05-23 23:38:42.000000000 +0200
@@ -170,3 +170,4 @@
InstallDriverSDKNonExecFile(dgaproc.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(xvdix.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(xvmcext.h,$(DRIVERSDKINCLUDEDIR))
