1 --- xc/programs/Xserver/hw/xfree86/drivers/Imakefile~ Mon Jul 2 12:46:04 2001
2 +++ xc/programs/Xserver/hw/xfree86/drivers/Imakefile Tue Apr 30 21:07:40 2002
4 cyrix/?*_drv.o glint/?*_drv.o i128/?*_drv.o i740/?*_drv.o \
5 i810/?*_drv.o imstt/?*_drv.o mga/?*_drv.o neomagic/?*_drv.o \
6 nv/?*_drv.o rendition/?*_drv.o s3/?*_drv.o s3virge/?*_drv.o \
7 - sis/?*_drv.o tdfx/?*_drv.o tga/?*_drv.o trident/?*_drv.o tseng/?*_drv.o \
8 + sis/?*_drv.o tga/?*_drv.o trident/?*_drv.o tseng/?*_drv.o \
9 vesa/?*_drv.o vga/?*_drv.o siliconmotion/?*.drv.o vmware/?*_drv.o
12 --- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel~ Thu Oct 4 20:28:22 2001
13 +++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel Tue Apr 30 21:17:02 2002
15 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
18 -list-multi := gamma.o tdfx.o r128.o mga.o i810.o i830.o ffb.o radeon.o
19 +list-multi := gamma.o r128.o mga.o i810.o i830.o ffb.o radeon.o
21 gamma-objs := gamma_drv.o gamma_dma.o
22 -tdfx-objs := tdfx_drv.o
23 r128-objs := r128_drv.o r128_cce.o r128_state.o
24 mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o
25 i810-objs := i810_drv.o i810_dma.o
27 ffb-objs := ffb_drv.o ffb_context.o
29 obj-$(CONFIG_DRM_GAMMA) += gamma.o
30 -obj-$(CONFIG_DRM_TDFX) += tdfx.o
31 obj-$(CONFIG_DRM_R128) += r128.o
32 obj-$(CONFIG_DRM_RADEON)+= radeon.o
33 obj-$(CONFIG_DRM_MGA) += mga.o
35 gamma.o: $(gamma-objs) $(lib)
36 $(LD) -r -o $@ $(gamma-objs) $(lib)
38 -tdfx.o: $(tdfx-objs) $(lib)
39 - $(LD) -r -o $@ $(tdfx-objs) $(lib)
41 mga.o: $(mga-objs) $(lib)
42 $(LD) -r -o $@ $(mga-objs) $(lib)
44 --- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux~ Wed Jan 16 16:36:43 2002
45 +++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux Tue Apr 30 21:19:44 2002
48 # **** End of SMP/MODVERSIONS detection
50 -MODS = gamma.o tdfx.o r128.o radeon.o
51 +MODS = gamma.o r128.o radeon.o
54 DRMTEMPLATES = drm_auth.h drm_bufs.h drm_context.h drm_dma.h drm_drawable.h \
56 GAMMAOBJS = gamma_drv.o gamma_dma.o
57 GAMMAHEADERS = gamma_drv.h $(DRMHEADERS) $(DRMTEMPLATES)
59 -TDFXOBJS = tdfx_drv.o
60 -TDFXHEADERS = tdfx.h $(DRMHEADERS) $(DRMTEMPLATES)
62 R128OBJS = r128_drv.o r128_cce.o r128_state.o
63 R128HEADERS = r128.h r128_drv.h r128_drm.h $(DRMHEADERS) $(DRMTEMPLATES)
69 -tdfx_drv.o: tdfx_drv.c
70 - $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
71 -tdfx.o: $(TDFXOBJS) $(LIBS)
74 sis.o: $(SISOBJS) $(LIBS)
78 $(CC) $(MODCFLAGS) -I$(TREE) -c $< -o $@
80 $(GAMMAOBJS): $(GAMMAHEADERS)
81 -$(TDFXOBJS): $(TDFXHEADERS)
83 $(MGAOBJS): $(MGAHEADERS)
84 $(I810OBJS): $(I810HEADERS)
85 --- ./xc/config/cf/xfree86.cf~ Tue Apr 30 21:46:25 2002
86 +++ ./xc/config/cf/xfree86.cf Tue Apr 30 21:52:58 2002
88 /* Pure PCI drivers should go first */
89 # ifndef XF86CardDrivers
90 # define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \
91 - neomagic i740 tdfx savage \
92 + neomagic i740 savage \
93 cirrus vmware tseng trident chips apm \
94 GlideDriver fbdev i128 \
95 ati AgpGartDrivers DevelDrivers ark cyrix \
97 # define TdfxDriDriver /**/
100 -# define DriDrivers gamma TdfxDriDriver mga i810 i830 r128 radeon sis
101 +# define DriDrivers gamma mga i810 i830 r128 radeon sis
107 # ifndef XF86CardDrivers
108 # define XF86CardDrivers mga glint nv s3 s3virge sis savage \
109 - trident chips tdfx fbdev ati \
110 + trident chips fbdev ati \
111 DevelDrivers newport \
112 XF86OSCardDrivers XF86ExtraCardDrivers
116 /* Pure PCI drivers should go first */
117 # ifndef XF86CardDrivers
118 -# define XF86CardDrivers mga tdfx glint s3 s3virge rendition tga ati \
119 +# define XF86CardDrivers mga glint s3 s3virge rendition tga ati \
120 savage nv DevelDrivers siliconmotion vga \
121 XF86OSCardDrivers XF86ExtraCardDrivers
124 # define TdfxDriDriver /**/
127 -# define DriDrivers gamma TdfxDriDriver mga r128 radeon sis
128 +# define DriDrivers gamma mga r128 radeon sis
133 /* Pure PCI drivers should go first */
134 # ifndef XF86CardDrivers
135 # define XF86CardDrivers ati mga glint s3 s3virge sis savage\
136 - trident chips fbdev \
137 + trident chips fbdev nv \
139 XF86OSCardDrivers XF86ExtraCardDrivers
142 # define TdfxDriDriver /**/
145 -# define DriDrivers gamma TdfxDriDriver mga r128 radeon
146 +# define DriDrivers gamma mga r128 radeon