Attachment 2457 Details for Bug 3052 – [PATCH][2/2] - Xserver Autoconfiguration Merge - Autotoolize Xserver

[patch] [PATCH][2/2] - Xserver Autoconfiguration Merge - Autotoolize Xserver

2-Xserver-autotoolized.diff (text/plain), 35.99 KB, created by Shawn Starr on 2005-04-18 20:45:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shawn Starr

Created: 2005-04-18 20:45:03 UTC

Size: 35.99 KB

patch

obsolete

>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/dmx/config/Makefile.am	2005-04-15 23:58:37.000000000 -0400
>@@ -0,0 +1,11 @@
>+noinst_LIBRARIES = libdmxconfig.a
>+libdmxconfig_a_SOURCES = parser.c scanner.c dmxparse.c dmxprint.c dmxcompat.c dmxconfig.c lex.yy.c
>+
>+parser.c: parser.y
>+	yacc -d $< -o $@
>+	
>+scanner.c: scanner.l
>+	flex $< > $@
>+	
>+DISTCLEANFILES = parser.c scanner.c lex.yy.c parser.h
>+AM_CFLAGS = -I..
>\ No newline at end of file
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/dmx/glxProxy/Makefile.am	2005-04-15 23:58:31.000000000 -0400
>@@ -0,0 +1,7 @@
>+noinst_LIBRARIES = libglxproxy.a
>+libglxproxy_a_SOURCES =  g_disptab.c glxcmds.c glxext.c glxutil.c g_renderswap.c \
>+                render2swap.c renderpixswap.c global.c glxcmdsswap.c \
>+		compsize.c glxscreens.c glxvisuals.c \
>+                glxsingle.c glxvendor.c glxfbconfig.c glxswap.c
>+
>+AM_CFLAGS = -I.. -I$(top_srcdir)/include @GL_CFLAGS@ -UXFree86LOADER 
>\ No newline at end of file
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/dmx/input/Makefile.am	2005-04-15 23:58:07.000000000 -0400
>@@ -0,0 +1,11 @@
>+noinst_LIBRARIES = libdmxinput.a
>+
>+RAWSRCS = lnx-keyboard.c lnx-ms.c lnx-ps2.c
>+USBSRCS = usb-keyboard.c usb-mouse.c usb-other.c usb-common.c
>+DRVSRCS = dmxdummy.c dmxbackend.c dmxconsole.c dmxcommon.c
>+DMXSRCS = dmxinputinit.c dmxarg.c dmxsigio.c dmxevents.c \
>+	  dmxxinput.c dmxmotion.c dmxeq.c dmxmap.c
>+
>+
>+libdmxinput_a_SOURCES = ChkNotMaskEv.c $(RAWSRCS) $(USBSRCS) $(DRVSRCS) $(DMXSRCS) $(LIBSRCS)
>+AM_CFLAGS = -I..
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/Makefile.am	2005-04-15 23:43:33.000000000 -0400
>@@ -0,0 +1,32 @@
>+SUBDIRS = common ddc dummylib i2c int10 fbdevhw os-support parser rac \
>+          ramdac shadowfb vbe vgahw xaa xf1bpp xf24_32bpp xf4bpp xf8_16bpp \
>+	  xf8_32bpp xf8_32wid loader scanpci include
>+
>+bin_PROGRAMS = debrix
>+
>+debrix_SOURCES = dummy.c
>+
>+DISTCLEANFILES = dummy.c
>+dummy.c:
>+	touch $@
>+
>+OS_LIBS = os-support/bus/libbus.a \
>+          os-support/@XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.a os-support/misc/libmisc.o
>+
>+XORG_LIBS = \
>+            @XORG_CORE_LIBS@ \
>+            common/libinit.a \
>+            loader/libloader.a \
>+            common/libcommon.a \
>+            parser/libparser.a \
>+            $(OS_LIBS) \
>+            dummylib/libdummy.a \
>+            @XORG_LIBS@
>+
>+INCLUDES = -I$(srcdir)/loader -I$(srcdir)/ddc -I$(srcdir)/i2c
>+
>+debrix_LDADD = $(XORG_LIBS) \
>+               @XSERVER_LIBS@ \
>+               -ldl \
>+               @DRM_LIBS@
>+debrix_LDFLAGS = -rdynamic $(DRM_LDFLAGS)
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/common/Makefile.am	2005-04-15 23:43:50.000000000 -0400
>@@ -0,0 +1,69 @@
>+lib_LIBRARIES = libcommon.a libinit.a
>+
>+if XORG_BUS_SBUS
>+SBUSSOURCES = xf86sbusBus.c
>+endif
>+
>+#if DEBUG
>+#DEBUGSOURCES = xf86Debug.c
>+#endif
>+
>+#if BUILDXV
>+XVSOURCES = xf86xv.c xf86xvmc.c
>+XVSDKINCS = xf86xv.h xf86xvmc.h
>+#endif
>+
>+#if XKB
>+XKBSOURCES = xf86XKB.c
>+#endif
>+
>+#if XINPUT
>+XISOURCES = xf86Xinput.c xisb.c
>+XISDKINCS = xf86Xinput.h xisb.h
>+XI_INCLUDES = -I$(top_srcdir)/Xi
>+#endif
>+
>+RANDRSOURCES = xf86RandR.c
>+
>+BUSSOURCES = xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUSSOURCES)
>+
>+#if LINUX
>+KBDSOURCES = xf86KbdLnx.c
>+# XXX psuedocodeish
>+#else if BSD
>+#KBDSOURCES = xf86KbdBSD.c
>+#else if Mach && !GNU/Mach
>+#KBDSOURCES = xf86KbdMach.c
>+#else
>+#KBDSOURCES = xf86Kbd.c
>+#endif
>+
>+EXTSOURCES = xf86dga.c xf86dga2.c xf86vmode.c xf86misc.c xf86bigfont.c
>+
>+# shouldn't isaBus and pciBus only be built on the relevant architectures? -ds
>+# ditto DoScanPci
>+AM_LDFLAGS = -r
>+libcommon_a_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
>+                      xf86Cursor.c xf86DGA.c xf86DPMS.c xf86DefModes.c \
>+                      xf86DoProbe.c xf86DoScanPci.c xf86Events.c \
>+                      xf86Globals.c xf86Io.c xf86PM.c \
>+                      xf86MiscExt.c xf86Option.c \
>+                      xf86VidMode.c xf86fbman.c xf86cmap.c \
>+                      ../scanpci/xf86ScanPci.c xf86Helper.c \
>+                      xf86Mode.c \
>+                      $(XVSOURCES) $(BUSSOURCES) $(XKBSOURCES) \
>+                      $(DEBUGSOURCES) $(XISOURCES) $(RANDRSOURCES) \
>+                      $(KBDSOURCES) $(EXTSOURCES)
>+libinit_a_SOURCES = xf86Init.c
>+
>+INCLUDES = -I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../loader \
>+           -I$(srcdir)/../rac -I$(srcdir)/../parser -I$(srcdir)/../scanpci \
>+           -I$(srcdir)/../vbe -I$(srcdir)/../int10 -I$(srcdir)/../vgahw \
>+	   $(XI_INCLUDES)
>+
>+AM_CFLAGS = -DHAVE_PM
>+
>+sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
>+               xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
>+               xf86cmap.h xf86fbman.h xf86str.h $(XISDKINCS) \
>+               $(XVSDKINCS) atKeynames.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/ddc/Makefile.am	2005-04-15 23:43:57.000000000 -0400
>@@ -0,0 +1,7 @@
>+sdk_HEADERS = edid.h vdif.h xf86DDC.h
>+
>+driver_LTLIBRARIES = libddc.la
>+libddc_la_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \
>+                   interpret_vdif.c print_vdif.c ddcProperty.c
>+
>+INCLUDES = -I$(srcdir)/../i2c
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/dummylib/Makefile.am	2005-04-15 23:44:04.000000000 -0400
>@@ -0,0 +1,10 @@
>+noinst_LIBRARIES = libdummy.a
>+libdummy_a_SOURCES = getvalidbios.c \
>+                     pcitestmulti.c xf86allocscripi.c \
>+                     xf86addrestolist.c xf86drvmsg.c xf86drvmsgverb.c \
>+                     xf86getverb.c \
>+                     xf86opt.c xf86screens.c xf86servisinit.c xf86verbose.c \
>+                     strlcat.c strlcpy.c
>+                     #xf86errorf.c xf86errorfverb.c xf86msg.c xf86msgverb.c \
>+                     #logvwrite.c verrorf.c xf86info.c xalloc.c fatalerror.c \
>+                     #$(srcdir)/../os-support/shared/sigiostubs.c
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/fbdevhw/Makefile.am	2005-04-15 23:44:17.000000000 -0400
>@@ -0,0 +1,11 @@
>+driver_LTLIBRARIES = libfbdevhw.la
>+
>+#if FBDEVHW
>+libfbdevhw_la_SOURCES = fbdevhw.c
>+#else
>+#libxorgfbdevhw_la_SOURCES = fbdevhwstub.c
>+#endif
>+
>+INCLUDES = -I$(srcdir)/../i2c
>+
>+sdk_HEADERS = fbdevhw.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/i2c/Makefile.am	2005-04-15 23:44:24.000000000 -0400
>@@ -0,0 +1,4 @@
>+driver_LTLIBRARIES = libi2c.la
>+libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c
>+
>+sdk_HEADERS = xf86i2c.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/int10/Makefile.am	2005-04-15 23:53:30.000000000 -0400
>@@ -0,0 +1,27 @@
>+noinst_LTLIBRARIES = libint10.la
>+
>+sdk_HEADERS = xf86int10.h
>+
>+if INT10_VM86
>+AM_CFLAGS = -D_PC -D_VM86_LINUX
>+libint10_la_SOURCES = \
>+	helper_exec.c \
>+	xf86int10.c \
>+	pci.c \
>+	xf86int10module.c \
>+	helper_mem.c \
>+	../os-support/linux/int10/vm86/linux_vm86.c \
>+	../os-support/linux/int10/linux.c
>+endif
>+
>+if INT10_X86EMU
>+AM_CFLAGS = -D_X86EMU
>+libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
>+	xf86int10.c xf86x86emu.c generic.c x86emu.c
>+endif
>+
>+if INT10_STUB
>+AM_CFLAGS = -D_PC -D_VM86_LINUX
>+libint10_la_SOURCES = stub.c xf86int10module.c
>+endif
>+
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/loader/Makefile.am	2005-04-15 23:53:36.000000000 -0400
>@@ -0,0 +1,14 @@
>+noinst_LIBRARIES = libloader.a
>+INCLUDES = -I$(srcdir)/../parser -I$(srcdir)/../vbe \
>+           -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
>+           -I$(srcdir)/../fbdevhw -I$(srcdir)/../scanpci -I$(srcdir)/../xaa \
>+           -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac -I$(srcdir)/../shadowfb
>+
>+#AM_LDFLAGS = -r -Wl,-whole-archive
>+
>+libloader_a_SOURCES = \
>+	loader.c \
>+	loaderProcs.h \
>+	loadext.c \
>+	os.c \
>+	stubs.c
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/os-support/Makefile.am	2005-04-15 23:53:55.000000000 -0400
>@@ -0,0 +1,4 @@
>+SUBDIRS = bus @XORG_OS_SUBDIR@ misc
>+
>+sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h \
>+              xf86drmCompat.h assyntax.h xf86OSmouse.h xf86OSKbd.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/os-support/bus/Makefile.am	2005-04-15 23:54:01.000000000 -0400
>@@ -0,0 +1,8 @@
>+noinst_LIBRARIES = libbus.a
>+sdk_HEADERS = xf86Pci.h
>+
>+PCI_SOURCES = @XORG_OS@Pci.c ix86Pci.c
>+libbus_a_SOURCES = Pci.c $(PCI_SOURCES)
>+if XORG_BUS_SBUS
>+	libbus_a_SOURCES += Sbus.c
>+endif
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/os-support/linux/Makefile.am	2005-04-15 23:54:21.000000000 -0400
>@@ -0,0 +1,11 @@
>+noinst_LIBRARIES = liblinux.a
>+liblinux_a_SOURCES = lnx_init.c lnx_video.c lnx_io.c \
>+                     lnx_pci.c lnx_agp.c lnx_kmod.c lnx_apm.c \
>+                     ../shared/bios_mmap.c ../shared/VTsw_usl.c \
>+                     ../shared/std_kbdEv.c ../shared/posix_tty.c \
>+                     ../shared/vidmem.c ../shared/sigio.c \
>+                     ../shared/stdResource.c ../shared/libc_wrapper.c
>+#libxorglinux_a_LIBADD = int10/libxorglinuxint10.a
>+
>+sdk_HEADERS = agpgart.h
>+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DRM_CFLAGS)
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/os-support/linux/drm/Makefile.am	2005-04-15 23:54:28.000000000 -0400
>@@ -0,0 +1,8 @@
>+INCLUDES = -I$(srcdir)/../../shared/drm/kernel
>+
>+lib_LIBRARIES = libxorglinuxdrm.a
>+libxorglinuxdrm_a_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c \
>+                              xf86drmSL.c drmmodule.c
>+
>+sdk_LIBDIR = $(libdir)/xorg
>+sdk_LIBS = libxorglinuxdrm.a
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/os-support/linux/int10/Makefile.am	2005-04-15 23:54:37.000000000 -0400
>@@ -0,0 +1,6 @@
>+INCLUDES = -I$(srcdir)/../../../int10
>+
>+lib_LIBRARIES = libxorglinuxint10.a
>+libxorglinuxint10_a_SOURCES = linux.c ../../../int10/helper_mem.c \
>+                                ../../../int10/pci.c \
>+                                ../../../int10/xf86int10module.c
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/os-support/misc/Makefile.am	2005-04-15 23:54:06.000000000 -0400
>@@ -0,0 +1,3 @@
>+noinst_PROGRAMS = libmisc.o
>+libmisc_o_SOURCES = Delay.c IODelay.c BUSmemcpy.c SlowBcopy.c 
>+AM_LDFLAGS = -r
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/parser/Makefile.am	2005-04-15 23:55:00.000000000 -0400
>@@ -0,0 +1,4 @@
>+noinst_LIBRARIES = libparser.a
>+libparser_a_SOURCES = Device.c Files.c Flags.c Input.c Keyboard.c Layout.c \
>+                      Module.c Video.c Monitor.c Pointer.c Screen.c \
>+                      Vendor.c read.c scan.c write.c DRI.c Extensions.c
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/rac/Makefile.am	2005-04-15 23:55:09.000000000 -0400
>@@ -0,0 +1,4 @@
>+driver_LTLIBRARIES = librac.la
>+librac_la_SOURCES = xf86RACmodule.c xf86RAC.c
>+
>+sdk_HEADERS = xf86RAC.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/ramdac/Makefile.am	2005-04-15 23:55:15.000000000 -0400
>@@ -0,0 +1,15 @@
>+AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE
>+
>+driver_LTLIBRARIES = libramdac.la
>+libramdac_la_SOURCES = xf86RamDacMod.c xf86RamDac.c xf86RamDacCmap.c \
>+                      xf86Cursor.c xf86HWCurs.c IBM.c BT.c TI.c \
>+		      xf86BitOrder.c
>+#                     $(srcdir)/../xaa/xaaBitOrder.c
>+
>+sdk_HEADERS = BT.h IBM.h TI.h xf86Cursor.h xf86RamDac.h
>+
>+DISTCLEANFILES = xf86BitOrder.c
>+
>+xf86BitOrder.c:
>+	echo "#define XAAReverseBitOrder xf86ReverseBitOrder" > $@
>+	echo "#include \"../xaa/xaaBitOrder.c\"" >> $@
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/scanpci/Makefile.am	2005-04-15 23:55:25.000000000 -0400
>@@ -0,0 +1,8 @@
>+driver_LTLIBRARIES = libscanpci.la libpcidata.la
>+libpcidata_la_SOURCES = xf86PciData.c
>+libscanpci_la_SOURCES = xf86ScanPci.c
>+
>+xf86PciData.c:
>+	echo "#define PCIDATA" > $@
>+	echo "#include \"$(srcdir)/xf86ScanPci.c\"" >> $@
>+DISTCLEANFILES = xf86PciData.c
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/shadowfb/Makefile.am	2005-04-15 23:55:47.000000000 -0400
>@@ -0,0 +1,4 @@
>+driver_LTLIBRARIES = libshadowfb.la
>+libshadowfb_la_SOURCES = sfbmodule.c shadow.c
>+
>+sdk_HEADERS = shadowfb.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/vbe/Makefile.am	2005-04-15 23:56:04.000000000 -0400
>@@ -0,0 +1,6 @@
>+driver_LTLIBRARIES = libvbe.la
>+libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c
>+libvbe_la_LIBADD = ../int10/libint10.la ../ddc/libddc.la
>+INCLUDES = -I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../int10
>+
>+sdk_HEADERS = vbe.h vbeModes.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/vgahw/Makefile.am	2005-04-15 23:56:16.000000000 -0400
>@@ -0,0 +1,5 @@
>+driver_LTLIBRARIES = libvgahw.la
>+libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c
>+INCLUDES = -I$(srcdir)/../ddc -I$(srcdir)/../i2c
>+
>+sdk_HEADERS = vgaHW.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/xaa/Makefile.am	2005-04-15 23:56:23.000000000 -0400
>@@ -0,0 +1,59 @@
>+LSB_FIRST = l-xaaBitmap.c l3-xaaBitmap.c l-xaaStipple.c l3-xaaStipple.c \
>+            l-xaaTEGlyph.c
>+MSB_FIRST = m-xaaBitmap.c m3-xaaBitmap.c m-xaaStipple.c m3-xaaStipple.c \
>+            m-xaaTEGlyph.c
>+LSB_FIXED = lf-xaaBitmap.c lf3-xaaBitmap.c lf-xaaStipple.c lf3-xaaStipple.c \
>+            lf-xaaTEGlyph.c
>+MSB_FIXED = mf-xaaBitmap.c mf3-xaaBitmap.c mf-xaaStipple.c mf3-xaaStipple.c \
>+            mf-xaaTEGlyph.c
>+POLYSEG = s-xaaLine.c s-xaaDashLine.c
>+
>+driver_LTLIBRARIES = libxaa.la
>+libxaa_la_SOURCES = xaaInit.c xaaGC.c xaaInitAccel.c xaaFallback.c \
>+                   xaaBitBlt.c xaaCpyArea.c xaaGCmisc.c xaaCpyWin.c \
>+                   xaaCpyPlane.c xaaFillRect.c xaaTEText.c xaaNonTEText.c \
>+                   xaaPCache.c xaaSpans.c xaaROP.c xaaImage.c xaaWrapper.c \
>+                   xaaPaintWin.c xaaRect.c xaaLineMisc.c xaaBitOrder.c \
>+                   xaaFillPoly.c xaaWideLine.c xaaTables.c xaaFillArc.c \
>+                   xaaLine.c xaaDashLine.c xaaOverlay.c xaaOffscreen.c \
>+                   xaaOverlayDF.c xaaStateChange.c xaaPict.c $(POLYSEG) \
>+                   $(LSB_FIRST) $(MSB_FIRST) $(LSB_FIXED) $(MSB_FIXED)
>+s-%.c:
>+	echo "#define POLYSEGMENT" > $@
>+	echo '#include "$(srcdir)/$*.c"' >> $@
>+l-%.c:
>+	echo "#define LSBFIRST" > $@
>+	echo '#include "$(srcdir)/$*.c"' >> $@
>+l3-%.c:
>+	echo "#define LSBFIRST" > $@
>+	echo "#define TRIPLE_BITS" >> $@
>+	echo '#include "$(srcdir)/$*.c"' >> $@
>+lf-%.c:
>+	echo "#define LSBFIRST" > $@
>+	echo "#define FIXEDBASE" >> $@
>+	echo '#include "$(srcdir)/$*.c"' >> $@
>+lf3-%.c:
>+	echo "#define LSBFIRST" > $@
>+	echo "#define TRIPLE_BITS" >> $@
>+	echo "#define FIXEDBASE" >> $@
>+	echo '#include "$(srcdir)/$*.c"' >> $@
>+m-%.c:
>+	echo "#define MSBFIRST" > $@
>+	echo '#include "$(srcdir)/$*.c"' >> $@
>+m3-%.c:
>+	echo "#define MSBFIRST" > $@
>+	echo "#define TRIPLE_BITS" >> $@
>+	echo '#include "$(srcdir)/$*.c"' >> $@
>+mf-%.c:
>+	echo "#define MSBFIRST" > $@
>+	echo "#define FIXEDBASE" >> $@
>+	echo '#include "$(srcdir)/$*.c"' >> $@
>+mf3-%.c:
>+	echo "#define MSBFIRST" > $@
>+	echo "#define TRIPLE_BITS" >> $@
>+	echo "#define FIXEDBASE" >> $@
>+	echo '#include "$(srcdir)/$*.c"' >> $@
>+
>+DISTCLEANFILES = $(POLYSEG) $(LSB_FIRST) $(LSB_FIXED) $(MSB_FIRST) $(MSB_FIXED)
>+
>+sdk_HEADERS = xaa.h xaalocal.h xaarop.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/xf1bpp/Makefile.am	2005-04-15 23:56:40.000000000 -0400
>@@ -0,0 +1,147 @@
>+driver_LTLIBRARIES = libxf1bpp.la
>+
>+sdk_HEADERS = xf1bpp.h mfbmap.h mfbunmap.h
>+
>+libxf1bppgen_a_SOURCES = \
>+        mfbseg.c \
>+        mfbpgbwht.c \
>+        mfbpgbblak.c \
>+        mfbpgbinv.c \
>+        mfbigbwht.c \
>+        mfbigbblak.c \
>+        mfbpawhite.c \
>+        mfbpablack.c \
>+        mfbpainv.c \
>+        mfbtewhite.c \
>+        mfbteblack.c \
>+        mfbplywhite.c \
>+        mfbplyblack.c \
>+        mfbplyinv.c \
>+        mfbbltC.c \
>+        mfbbltX.c \
>+        mfbbltCI.c \
>+        mfbbltO.c \
>+        mfbbltG.c \
>+        mfbtileC.c \
>+        mfbtileG.c
>+DISTCLEANFILES = $(libxf1bppgen_a_SOURCES)
>+libxf1bppmfb_a_SOURCES = \
>+        $(top_srcdir)/mfb/maskbits.c \
>+        $(top_srcdir)/mfb/mfbbitblt.c \
>+        $(top_srcdir)/mfb/mfbbres.c \
>+        $(top_srcdir)/mfb/mfbbresd.c \
>+        $(top_srcdir)/mfb/mfbbstore.c \
>+        $(top_srcdir)/mfb/mfbclip.c \
>+        $(top_srcdir)/mfb/mfbcmap.c \
>+        $(top_srcdir)/mfb/mfbfillarc.c \
>+        $(top_srcdir)/mfb/mfbfillrct.c \
>+        $(top_srcdir)/mfb/mfbfillsp.c \
>+        $(top_srcdir)/mfb/mfbfont.c \
>+        $(top_srcdir)/mfb/mfbgc.c \
>+        $(top_srcdir)/mfb/mfbgetsp.c \
>+        $(top_srcdir)/mfb/mfbhrzvert.c \
>+        $(top_srcdir)/mfb/mfbimage.c \
>+        $(top_srcdir)/mfb/mfbline.c \
>+        $(top_srcdir)/mfb/mfbmisc.c \
>+        $(top_srcdir)/mfb/mfbpixmap.c \
>+        $(top_srcdir)/mfb/mfbpntwin.c \
>+        $(top_srcdir)/mfb/mfbpolypnt.c \
>+        $(top_srcdir)/mfb/mfbpushpxl.c \
>+        $(top_srcdir)/mfb/mfbscrclse.c \
>+        $(top_srcdir)/mfb/mfbscrinit.c \
>+        $(top_srcdir)/mfb/mfbsetsp.c \
>+        $(top_srcdir)/mfb/mfbwindow.c \
>+        $(top_srcdir)/mfb/mfbzerarc.c \
>+        mfbmodule.c
>+
>+libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES)
>+
>+AM_CFLAGS = -DXF86MONO -include mfbmap.h
>+
>+mfbseg.c:
>+	echo "#define POLYSEGMENT" > $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbline.c\"" >> $@
>+mfbpgbwht.c:
>+	echo "#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltWhite" > $@
>+	echo "#define OPEQ |=" >> $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbplygblt.c\"" >> $@
>+mfbpgbblak.c:
>+	echo "#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltBlack" > $@
>+	echo "#define OPEQ &=~" >> $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbplygblt.c\"" >> $@
>+mfbpgbinv.c:
>+	echo "#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltInvert" > $@
>+	echo "#define OPEQ ^=" >> $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbplygblt.c\"" >> $@
>+mfbigbwht.c:
>+	echo "#define MFBIMAGEGLYPHBLT xf1bppImageGlyphBltWhite" > $@
>+	echo "#define OPEQ |=" >> $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbimggblt.c\"" >> $@
>+mfbigbblak.c:
>+	echo "#define MFBIMAGEGLYPHBLT xf1bppImageGlyphBltBlack" > $@
>+	echo "#define OPEQ &=~" >> $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbimggblt.c\"" >> $@
>+mfbpawhite.c:
>+	echo "#define MFBSOLIDFILLAREA xf1bppSolidWhiteArea" > $@
>+	echo "#define MFBSTIPPLEFILLAREA xf1bppStippleWhiteArea" >> $@
>+	echo "#define OPEQ |=" >> $@
>+	echo "#define EQWHOLEWORD =~0" >> $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbpntarea.c\"" >> $@
>+mfbpablack.c:
>+	echo "#define MFBSOLIDFILLAREA xf1bppSolidBlackArea" > $@
>+	echo "#define MFBSTIPPLEFILLAREA xf1bppStippleBlackArea" >> $@
>+	echo "#define OPEQ &=~" >> $@
>+	echo "#define EQWHOLEWORD =0" >> $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbpntarea.c\"" >> $@
>+mfbpainv.c:
>+	echo "#define MFBSOLIDFILLAREA xf1bppSolidInvertArea" > $@
>+	echo "#define MFBSTIPPLEFILLAREA xf1bppStippleInvertArea" >> $@
>+	echo "#define OPEQ ^=" >> $@
>+	echo "#define EQWHOLEWORD ^=~0" >> $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbpntarea.c\"" >> $@
>+mfbtewhite.c:
>+	echo "#define OP" > $@
>+	echo "#define CLIPTETEXT xf1bppImageGlyphBltWhite" >> $@
>+	echo "#define MFBTEGLYPHBLT xf1bppTEGlyphBltWhite" >> $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbtegblt.c\"" >> $@
>+mfbteblack.c:
>+	echo "#define OP ~" > $@
>+	echo "#define CLIPTETEXT xf1bppImageGlyphBltBlack" >> $@
>+	echo "#define MFBTEGLYPHBLT xf1bppTEGlyphBltBlack" >> $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbtegblt.c\"" >> $@
>+mfbplywhite.c:
>+	echo "#define MFBFILLPOLY1RECT xf1bppFillPolyWhite" > $@
>+	echo "#define OPEQ |=" >> $@
>+	echo "#define EQWHOLEWORD =~0" >> $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbply1rct.c\"" >> $@
>+mfbplyblack.c:
>+	echo "#define MFBFILLPOLY1RECT xf1bppFillPolyBlack" > $@
>+	echo "#define OPEQ &=~" >> $@
>+	echo "#define EQWHOLEWORD =0" >> $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbply1rct.c\"" >> $@
>+mfbplyinv.c:
>+	echo "#define MFBFILLPOLY1RECT xf1bppFillPolyInvert" > $@
>+	echo "#define OPEQ ^=" >> $@
>+	echo "#define EQWHOLEWORD ^=~0" >> $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbply1rct.c\"" >> $@
>+mfbbltC.c:
>+	echo "#define MROP Mcopy" > $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
>+mfbbltX.c:
>+	echo "#define MROP Mxor" > $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
>+mfbbltCI.c:
>+	echo "#define MROP McopyInverted" > $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
>+mfbbltO.c:
>+	echo "#define MROP Mor" > $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
>+mfbbltG.c:
>+	echo "#define MROP M0" > $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
>+mfbtileC.c:
>+	echo "#define MROP Mcopy" > $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbtile.c\"" >> $@
>+mfbtileG.c:
>+	echo "#define MRop M0" > $@
>+	echo "#include \"$(top_srcdir)/mfb/mfbtile.c\"" >> $@
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/xf24_32bpp/Makefile.am	2005-04-15 23:56:49.000000000 -0400
>@@ -0,0 +1,28 @@
>+driver_LTLIBRARIES = libxf24_32bpp.la
>+
>+sdk_HEADERS = cfb24_32.h
>+
>+INCLUDES = -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
>+
>+# note, cfbbstore.c doesn't build.  Old Imakefile doesn't even use it, hrm...
>+libxf24_32bpp_la_SOURCES = \
>+	cfb24_32module.c \
>+	cfbcpyarea.c \
>+	cfbgc24.c \
>+	cfbgc32.c \
>+	cfbgcmisc.c \
>+	cfbimage.c \
>+	cfbpixmap.c \
>+	cfbscrinit.c \
>+	cfbwindow.c
>+	
>+libxf24_32bpp_la_LIBADD = $(top_builddir)/cfb24/libcfb24.la $(top_builddir)/cfb32/libcfb32.la
>+cfbgc24.c: cfbgc.c
>+	echo '#define PSZ 24' > $@
>+	echo '#include "cfbgc.c"' >> $@
>+
>+cfbgc32.c: cfbgc.c
>+	echo '#define PSZ 32' > $@
>+	echo '#include "cfbgc.c"' >> $@
>+
>+DISTCLEANFILES = cfbgc24.c cfbgc32.c
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/xf4bpp/Makefile.am	2005-04-15 23:57:00.000000000 -0400
>@@ -0,0 +1,54 @@
>+driver_LTLIBRARIES = libxf4bpp.la
>+
>+sdk_HEADERS = xf4bpp.h
>+
>+libxf4bpp_la_SOURCES = \
>+        ppcArea.c \
>+        ppcBStore.c \
>+        ppcClip.c \
>+        ppcCpArea.c \
>+        ppcCReduce.c \
>+        ppcDepth.c \
>+        ppcFillRct.c \
>+        ppcWinFS.c \
>+        ppcPixFS.c \
>+        ppcGC.c \
>+        ppcGetSp.c \
>+        ppcImg.c \
>+        ppcPixmap.c \
>+        ppcPntWin.c \
>+        ppcPolyPnt.c \
>+        ppcPolyRec.c \
>+        ppcQuery.c \
>+        ppcRslvC.c \
>+        ppcSetSp.c \
>+        ppcWindow.c \
>+        ppcIO.c \
>+        emulOpStip.c \
>+        emulRepAre.c \
>+        emulTile.c \
>+        vgaGC.c \
>+        vgaBitBlt.c \
>+        vgaImages.c \
>+        vgaStipple.c \
>+        vgaSolid.c \
>+        offscreen.c \
>+        wm3.c \
>+        mfbimggblt.c \
>+        mfbline.c \
>+        mfbseg.c \
>+        mfbhrzvert.c \
>+        mfbbres.c \
>+        mfbbresd.c \
>+        mfbfillarc.c \
>+        mfbzerarc.c \
>+        vgamodule.c
>+	
>+libxf4bpp_la_LIBADD=../xf1bpp/libxf1bpp.la
>+
>+DISTCLEANFILES = mfbseg.c
>+mfbseg.c:
>+	echo "#define POLYSEGMENT" > $@
>+	echo "#include \"mfbline.c\"" >> $@
>+
>+INCLUDES = -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/xf8_16bpp/Makefile.am	2005-04-15 23:57:14.000000000 -0400
>@@ -0,0 +1,12 @@
>+driver_LTLIBRARIES = libxf8_16bpp.la
>+
>+sdk_HEADERS = cfb8_16.h
>+
>+INCLUDES = -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
>+
>+libxf8_16bpp_la_SOURCES = \
>+	cfb8_16module.c \
>+	cfbscrinit.c \
>+	cfbwindow.c
>+
>+libxf8_16bpp_la_LIBADD = $(top_builddir)/cfb16/libcfb16.la
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/xf8_32bpp/Makefile.am	2005-04-15 23:57:33.000000000 -0400
>@@ -0,0 +1,31 @@
>+driver_LTLIBRARIES = libxf8_32bpp.la
>+
>+sdk_HEADERS = cfb8_32.h
>+
>+INCLUDES = -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
>+
>+libxf8_32bpp_la_SOURCES = \
>+	cfbbstore.c \
>+	cfbcpyarea.c \
>+	cfbcpyplane.c \
>+	cfbgcmisc.c \
>+	cfbimage.c \
>+	cfbpntwin.c \
>+	cfbscrinit.c \
>+	cfbwindow.c \
>+	xf86overlay.c \
>+	cfb8_32module.c \
>+	cfbgc8.c \
>+	cfbgc32.c \
>+	cfbgcunder.c
>+
>+libxf8_32bpp_la_LIBADD = $(top_builddir)/cfb32/libcfb32.la
>+cfbgc8.c: cfbgc.c
>+	echo '#define PSZ 8' > $@
>+	echo '#include "cfbgc.c"' >> $@
>+
>+cfbgc32.c: cfbgc.c
>+	echo '#define PSZ 32' > $@
>+	echo '#include "cfbgc.c"' >> $@
>+
>+DISTCLEANFILES = cfbgc8.c cfbgc32.c
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/xf8_32wid/Makefile.am	2005-04-15 23:57:46.000000000 -0400
>@@ -0,0 +1,13 @@
>+driver_LTLIBRARIES = libxf8_32wid.la
>+
>+sdk_HEADERS = cfb8_32wid.h
>+
>+INCLUDES = -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
>+
>+libxf8_32wid_la_SOURCES = \
>+	cfb8_32widmodule.c \
>+	cfbscrinit.c \
>+	cfbwindow.c \
>+	cfbwid.c
>+	
>+libxf8_32wid_la_LIBADD = $(top_builddir)/cfb16/libcfb16.la $(top_builddir)/cfb24/libcfb24.la $(top_builddir)/cfb32/libcfb32.la
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/include/Makefile.am	2005-04-15 23:49:16.000000000 -0400
>@@ -0,0 +1,2 @@
>+SUBDIRS = X11
>+sdk_HEADERS = xf86Date.h xf86Version.h xorgVersion.h modularDefs.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/include/X11/Makefile.am	2005-04-15 23:49:39.000000000 -0400
>@@ -0,0 +1 @@
>+SUBDIRS = extensions
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/hw/xorg/include/X11/extensions/Makefile.am	2005-04-15 23:49:55.000000000 -0400
>@@ -0,0 +1,3 @@
>+ext_HEADERS = xf86bigfont.h xf86bigfstr.h xf86dga.h xf86dga1.h \
>+              xf86dga1str.h xf86dgastr.h xf86misc.h xf86mscstr.h \
>+              xf86rush.h xf86rushstr.h xf86vmode.h xf86vmstr.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/include/Makefile.am	2005-04-16 00:37:19.000000000 -0400
>@@ -0,0 +1,50 @@
>+sdk_HEADERS =		\
>+	XIstubs.h	\
>+	bstore.h	\
>+	bstorestr.h	\
>+	closestr.h	\
>+	closure.h	\
>+	colormap.h	\
>+	colormapst.h	\
>+	cursor.h	\
>+	cursorstr.h	\
>+	xorg.h		\
>+	dix.h		\
>+	dixevents.h	\
>+	dixfont.h	\
>+	dixfontstr.h	\
>+	dixgrabs.h	\
>+	dixstruct.h	\
>+	exevents.h	\
>+	extension.h	\
>+	extinit.h	\
>+	extnsionst.h	\
>+	gc.h		\
>+	gcstruct.h	\
>+	globals.h	\
>+	input.h		\
>+	inputstr.h	\
>+	misc.h		\
>+	miscstruct.h	\
>+	opaque.h	\
>+	os.h		\
>+	pixmap.h	\
>+	pixmapstr.h	\
>+	property.h	\
>+	propertyst.h	\
>+	region.h	\
>+	regionstr.h	\
>+	resource.h	\
>+	rgb.h		\
>+	screenint.h	\
>+	scrnintstr.h	\
>+	selection.h	\
>+	servermd.h	\
>+	site.h		\
>+	swaprep.h	\
>+	swapreq.h	\
>+	validate.h	\
>+	window.h	\
>+	windowstr.h
>+
>+EXTRA_DIST = $(sdk_HEADERS) config.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/mfb/Makefile.am	2005-04-15 23:34:31.000000000 -0400
>@@ -0,0 +1,127 @@
>+driver_LTLIBRARIES = libmfb.la
>+
>+libmfb_gen_sources = mfbseg.c mfbpgbwht.c mfbpgbblak.c mfbpgbinv.c mfbigbwht.c \
>+	 mfbigbblak.c mfbpawhite.c mfbpablack.c mfbpainv.c mfbtewhite.c \
>+	 mfbteblack.c mfbbltC.c mfbbltX.c mfbbltCI.c mfbbltO.c mfbbltG.c \
>+	 mfbtileC.c mfbtileG.c mfbplywhite.c mfbplyblack.c mfbplyinv.c
>+
>+DISTCLEANFILES = $(libmfb_gen_sources)
>+
>+libmfb_la_SOURCES = mfbgc.c mfbwindow.c mfbfont.c \
>+	 mfbfillrct.c mfbpntwin.c maskbits.c mfbpixmap.c \
>+	 mfbimage.c mfbline.c mfbbres.c mfbhrzvert.c mfbbresd.c \
>+	 mfbpushpxl.c mfbzerarc.c mfbfillarc.c \
>+         mfbfillsp.c mfbsetsp.c mfbscrinit.c mfbscrclse.c mfbclip.c \
>+         mfbbitblt.c mfbgetsp.c mfbpolypnt.c \
>+	 mfbcmap.c mfbmisc.c mfbbstore.c mfbmodule.c $(libmfb_gen_sources)
>+
>+sdk_HEADERS = mfb.h
>+
>+mfbseg.c:
>+	echo "#define POLYSEGMENT" > $@
>+	echo "#include \"mfbline.c\"" >> $@
>+
>+mfbbltC.c:
>+	echo "#define MROP Mcopy" > $@
>+	echo "#include \"mfbblt.c\"" >> $@
>+
>+mfbbltX.c:
>+	echo "#define MROP Mxor" > $@
>+	echo "#include \"mfbblt.c\"" >> $@
>+
>+mfbbltCI.c:
>+	echo "#define MROP McopyInverted" > $@
>+	echo "#include \"mfbblt.c\"" >> $@
>+
>+mfbbltO.c:
>+	echo "#define MROP Mor" > $@
>+	echo "#include \"mfbblt.c\"" >> $@
>+
>+mfbbltG.c:
>+	echo "#define MROP 0" > $@
>+	echo "#include \"mfbblt.c\"" >> $@
>+
>+mfbtileC.c:
>+	echo "#define MROP Mcopy" > $@
>+	echo "#include \"mfbtile.c\"" >> $@
>+
>+mfbtileG.c:
>+	echo "#define MROP 0" > $@
>+	echo "#include \"mfbtile.c\"" >> $@
>+
>+mfbpgbwht.c:
>+	echo "#define OPEQ MFB_OPEQ_WHITE" > $@
>+	echo "#define MFBPOLYGLYPHBLT mfbPolyGlyphBltWhite" >> $@
>+	echo "#include \"mfbplygblt.c\"" >> $@
>+
>+mfbpgbblak.c:
>+	echo "#define OPEQ MFB_OPEQ_BLACK" > $@
>+	echo "#define MFBPOLYGLYPHBLT mfbPolyGlyphBltBlack" >> $@
>+	echo "#include \"mfbplygblt.c\"" >> $@
>+
>+mfbpgbinv.c:
>+	echo "#define OPEQ MFB_OPEQ_INVERT" > $@
>+	echo "#define MFBPOLYGLYPHBLT mfbPolyGlyphBltInvert" >> $@
>+	echo "#include \"mfbplygblt.c\"" >> $@
>+
>+mfbigbwht.c:
>+	echo "#define OPEQ MFB_OPEQ_WHITE" > $@
>+	echo "#define MFBIMAGEGLYPHBLT mfbImageGlyphBltWhite" >> $@
>+	echo "#include \"mfbimggblt.c\"" >> $@
>+
>+mfbigbblak.c:
>+	echo "#define OPEQ MFB_OPEQ_BLACK" > $@
>+	echo "#define MFBIMAGEGLYPHBLT mfbImageGlyphBltBlack" >> $@
>+	echo "#include \"mfbimggblt.c\"" >> $@
>+
>+mfbpawhite.c:
>+	echo "#define OPEQ MFB_OPEQ_WHITE" > $@
>+	echo "#define MFBSOLIDFILLAREA mfbSolidWhiteArea" >> $@
>+	echo "#define EQWHOLEWORD MFB_EQWHOLEWORD_WHITE" >> $@
>+	echo "#define MFBSTIPPLEFILLAREA mfbStippleWhiteArea" >> $@
>+	echo "#include \"mfbpntarea.c\"" >> $@
>+
>+mfbpablack.c:
>+	echo "#define OPEQ MFB_OPEQ_BLACK" > $@
>+	echo "#define MFBSOLIDFILLAREA mfbSolidBlackArea" >> $@
>+	echo "#define EQWHOLEWORD MFB_EQWHOLEWORD_BLACK" >> $@
>+	echo "#define MFBSTIPPLEFILLAREA mfbStippleBlackArea" >> $@
>+	echo "#include \"mfbpntarea.c\"" >> $@
>+
>+mfbpainv.c:
>+	echo "#define OPEQ MFB_OPEQ_INVERT" > $@
>+	echo "#define MFBSOLIDFILLAREA mfbSolidInvertArea" >> $@
>+	echo "#define EQWHOLEWORD MFB_EQWHOLEWORD_INVERT" >> $@
>+	echo "#define MFBSTIPPLEFILLAREA mfbStippleInvertArea" >> $@
>+	echo "#include \"mfbpntarea.c\"" >> $@
>+
>+mfbtewhite.c:
>+	echo "#define OP MFB_OP_WHITE" > $@
>+	echo "#define MFBTEGLYPHBLT mfbTEGlyphBltWhite" >> $@
>+	echo "#define CLIPTETEXT mfbImageGlyphBltWhite" >> $@
>+	echo "#include \"mfbtegblt.c\"" >> $@
>+
>+mfbteblack.c:
>+	echo "#define OP MFB_OP_BLACK" > $@
>+	echo "#define MFBTEGLYPHBLT mfbTEGlyphBltBlack" >> $@
>+	echo "#define CLIPTETEXT mfbImageGlyphBltBlack" >> $@
>+	echo "#include \"mfbtegblt.c\"" >> $@
>+
>+mfbplywhite.c:
>+	echo "#define OPEQ MFB_OPEQ_WHITE" > $@
>+	echo "#define MFBFILLPOLY1RECT mfbFillPolyWhite" >> $@
>+	echo "#define EQWHOLEWORD MFB_EQWHOLEWORD_WHITE" >> $@
>+	echo "#include \"mfbply1rct.c\"" >> $@
>+
>+mfbplyblack.c:
>+	echo "#define OPEQ MFB_OPEQ_BLACK" > $@
>+	echo "#define MFBFILLPOLY1RECT mfbFillPolyBlack" >> $@
>+	echo "#define EQWHOLEWORD MFB_EQWHOLEWORD_BLACK" >> $@
>+	echo "#include \"mfbply1rct.c\"" >> $@
>+
>+mfbplyinv.c:
>+	echo "#define OPEQ MFB_OPEQ_INVERT" > $@
>+	echo "#define MFBFILLPOLY1RECT mfbFillPolyInvert" >> $@
>+	echo "#define EQWHOLEWORD MFB_EQWHOLEWORD_INVERT" >> $@
>+	echo "#include \"mfbply1rct.c\"" >> $@
>+
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/mi/Makefile.am	2005-04-15 23:32:04.000000000 -0400
>@@ -0,0 +1,75 @@
>+noinst_PROGRAMS = libminimi.o libmi.o
>+
>+AM_LDFLAGS = -r
>+
>+sdk_HEADERS = mibank.h micmap.h miline.h mipointer.h mi.h mibstore.h \
>+              migc.h mipointrst.h mizerarc.h micoord.h
>+
>+INCLUDES = -I$(top_srcdir)/hw/xorg/loader
>+
>+# libminimi is for dmx - it has different defines for miinitext.c
>+
>+libminimi_o_SOURCES = 	\
>+	cbrt.c		\
>+	mi.h		\
>+	miarc.c		\
>+	mibank.c	\
>+	mibank.h	\
>+	mibitblt.c	\
>+	mibstore.c	\
>+	mibstore.h	\
>+	mibstorest.h	\
>+	miclipn.c	\
>+	micmap.c	\
>+	micmap.h	\
>+	micoord.h	\
>+	micursor.c	\
>+	midash.c	\
>+	midispcur.c	\
>+	mieq.c		\
>+	miexpose.c	\
>+	mifillarc.c	\
>+	mifillarc.h	\
>+	mifillrct.c	\
>+	mifpolycon.c	\
>+	mifpoly.h	\
>+	migc.c		\
>+	migc.h		\
>+	miglblt.c	\
>+	miline.h	\
>+	mioverlay.c	\
>+	mioverlay.h	\
>+	mipointer.c	\
>+	mipointer.h	\
>+	mipointrst.h	\
>+	mipoly.c	\
>+	mipoly.h	\
>+	mipolycon.c	\
>+	mipolygen.c	\
>+	mipolypnt.c	\
>+	mipolyrect.c	\
>+	mipolyseg.c	\
>+	mipolytext.c	\
>+	mipolyutil.c	\
>+	mipushpxl.c	\
>+	miregion.c	\
>+	miscanfill.h	\
>+	miscrinit.c	\
>+	mispans.c	\
>+	mispans.h	\
>+	misprite.c	\
>+	misprite.h	\
>+	mispritest.h	\
>+	mistruct.h	\
>+	mivaltree.c	\
>+	mivalidate.h	\
>+	miwideline.c	\
>+	miwideline.h	\
>+	miwindow.c	\
>+	mizerarc.c	\
>+	mizerarc.h	\
>+	mizerclip.c	\
>+	mizerline.c
>+
>+libmi_o_SOURCES = miinitext.c
>+libmi_o_LDADD = libminimi.o
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/miext/Makefile.am	2005-04-15 23:32:10.000000000 -0400
>@@ -0,0 +1,4 @@
>+SUBDIRS = damage shadow
>+if COMPOSITE
>+SUBDIRS += cw
>+endif
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/miext/cw/Makefile.am	2005-04-15 23:35:04.000000000 -0400
>@@ -0,0 +1,6 @@
>+noinst_LIBRARIES = libcw.a
>+
>+libcw_a_SOURCES = 	\
>+	cw.c		\
>+	cw_ops.c		\
>+	cw_render.c		
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/miext/damage/Makefile.am	2005-04-15 23:34:47.000000000 -0400
>@@ -0,0 +1,6 @@
>+noinst_LIBRARIES = libdamage.a
>+
>+libdamage_a_SOURCES =	\
>+	damage.c	\
>+	damage.h	\
>+	damagestr.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/miext/shadow/Makefile.am	2005-04-15 23:34:55.000000000 -0400
>@@ -0,0 +1,26 @@
>+driver_LTLIBRARIES = libshadow.la
>+
>+sdk_HEADERS = shadow.h
>+
>+libshadow_la_SOURCES =		\
>+	shadow.c		\
>+	shadow.h		\
>+	shalloc.c		\
>+	shmodule.c		\
>+	shpacked.c		\
>+	shplanar8.c		\
>+	shplanar.c		\
>+	shrot16pack_180.c	\
>+	shrot16pack_270.c	\
>+	shrot16pack_90.c	\
>+	shrot16pack.c		\
>+	shrot32pack_180.c	\
>+	shrot32pack_270.c	\
>+	shrot32pack_90.c	\
>+	shrot32pack.c		\
>+	shrot8pack_180.c	\
>+	shrot8pack_270.c	\
>+	shrot8pack_90.c		\
>+	shrot8pack.c		\
>+	shrotate.c		\
>+	shrotpack.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/os/Makefile.am	2005-04-15 23:37:17.000000000 -0400
>@@ -0,0 +1,41 @@
>+noinst_LIBRARIES = libos.a
>+
>+#ifdef HAVE_CONFIG_H
>+#include <config.h>
>+#endif
>+#	k5auth.c	\
>+#	lbxio.c		\
>+#	rpcauth.c	\
>+#	genalloca.c	\
>+#	hpsocket.c	\
>+#	secauth.c
>+#	xalloc.c
>+
>+if XCSECURITY
>+XCSECURITY_SOURCES = secauth.c
>+endif
>+
>+if XDMCP
>+XDMCP_SOURCES = xdmcp.c
>+endif
>+
>+XORG_SOURCES = log.c
>+
>+AM_CFLAGS = -DXSERV_t -DTRANS_SERVER
>+
>+libos_a_SOURCES = 	\
>+	WaitFor.c	\
>+	access.c	\
>+	auth.c		\
>+	connection.c	\
>+	io.c		\
>+	mitauth.c	\
>+	oscolor.c	\
>+	osdep.h		\
>+	osinit.c	\
>+	utils.c		\
>+	xdmauth.c	\
>+	xstrans.c	\
>+	$(XCSECURITY_SOURCES) \
>+	$(XDMCP_SOURCES) \
>+	$(XORG_SOURCES)
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/randr/Makefile.am	2005-04-15 23:32:17.000000000 -0400
>@@ -0,0 +1,6 @@
>+noinst_LIBRARIES = librandr.a
>+
>+librandr_a_SOURCES =	\
>+	mirandr.c	\
>+	randr.c		\
>+	randrstr.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/record/Makefile.am	2005-04-15 23:32:22.000000000 -0400
>@@ -0,0 +1,3 @@
>+driver_LTLIBRARIES = librecord.la
>+
>+librecord_la_SOURCES = record.c recordmod.c set.c
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/render/Makefile.am	2005-04-15 23:32:29.000000000 -0400
>@@ -0,0 +1,19 @@
>+noinst_PROGRAMS = librender.o
>+
>+AM_LDFLAGS = -r
>+
>+librender_o_SOURCES =	\
>+	animcur.c	\
>+	filter.c	\
>+	glyph.c		\
>+	miglyph.c	\
>+	miindex.c	\
>+	mipict.c	\
>+	mirect.c	\
>+	mitrap.c	\
>+	mitri.c		\
>+	picture.c	\
>+	render.c	\
>+	renderedge.c
>+
>+sdk_HEADERS = picture.h mipict.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/xfixes/Makefile.am	2005-04-15 23:32:36.000000000 -0400
>@@ -0,0 +1,10 @@
>+noinst_LIBRARIES = libxfixes.a
>+
>+libxfixes_a_SOURCES = 	\
>+	cursor.c	\
>+	region.c	\
>+	saveset.c	\
>+	select.c	\
>+	xfixes.c	\
>+	xfixes.h	\
>+	xfixesint.h
>--- /dev/null	2005-04-15 15:36:38.393160952 -0400
>+++ xorg/Xserver/xkb/Makefile.am	2005-04-15 23:32:42.000000000 -0400
>@@ -0,0 +1,50 @@
>+lib_LIBRARIES = libxkb.a
>+DDX_SRCS = \
>+        ddxBeep.c \
>+        ddxCtrls.c \
>+        ddxFakeBtn.c \
>+        ddxFakeMtn.c \
>+        ddxInit.c \
>+        ddxKeyClick.c \
>+        ddxKillSrv.c \
>+        ddxLEDs.c \
>+        ddxVT.c \
>+        ddxLoad.c \
>+        ddxList.c \
>+        ddxConfig.c \
>+        ddxDevBtn.c \
>+        ddxPrivate.c \
>+        xf86KillSrv.c \
>+        xf86VT.c \
>+        xf86Private.c
>+DIX_SRCS = \
>+        xkb.c \
>+        xkbUtils.c \
>+        xkbEvents.c \
>+        xkbAccessX.c \
>+        xkbSwap.c \
>+        xkbLEDs.c \
>+        xkbInit.c \
>+        xkbActions.c \
>+        xkbPrKeyEv.c
>+# this should be replaced by a common library or something, ideally -d
>+XKBFILE_SRCS = \
>+        maprules.c \
>+        xkmread.c \
>+        xkbtext.c \
>+        xkbfmisc.c \
>+        xkberrs.c \
>+        xkbconfig.c \
>+        xkbout.c
>+X11_SRCS = \
>+        XKBMisc.c \
>+        XKBAlloc.c \
>+        XKBGAlloc.c \
>+        XKBMAlloc.c
>+XI_SRCS = xkbPrOtherEv.c
>+libxkb_a_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) $(XKBFILE_SRCS) \
>+                   $(X11_SRCS)
>+
>+xf86%.c:
>+	echo "#define XF86DDXACTIONS" > $@
>+	echo "#include \"$(srcdir)/ddx$*.c\"" >> $@

Actions: View | Splinter Review

Attachments on bug 3052: 2456 | 2457 | 2458 | 2459

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.