--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/Makefile.am	2005-04-15 23:20:44.000000000 -0400
@@ -0,0 +1,37 @@
+AUTOMAKE_OPTIONS=dist-bzip2 foreign
+
+if COMPOSITE
+COMPOSITE_DIR=composite
+endif
+if XTRAP
+XTRAP_DIR=XTrap
+endif
+
+SUBDIRS=	\
+	include	\
+	dix 	\
+	fb	\
+	mi	\
+	Xext	\
+	miext	\
+	os	\
+	randr	\
+	render  \
+        Xi	\
+        mfb	\
+        xkb	\
+	afb	\
+	cfb	\
+	cfb16   \
+	cfb24   \
+	cfb32   \
+	record	\
+	xfixes	\
+	damageext \
+	$(XTRAP_DIR) \
+        $(COMPOSITE_DIR) \
+	hw
+
+pkgconfigdir=$(libdir)/pkgconfig
+pkgconfig_DATA = xorg.pc
+EXTRA_DIST = xorg.pc.in
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/configure.ac	2005-04-16 00:35:21.000000000 -0400
@@ -0,0 +1,614 @@
+dnl
+dnl $Id: configure.ac,v 1.7 2004/07/06 23:53:56 daniel Exp $
+dnl
+dnl Copyright © 2003-2004 Keith Packard, Daniel Stone
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation, and that the names of Keith Packard and Daniel Stone not be
+dnl used in advertising or publicity pertaining to distribution of the software
+dnl without specific, written prior permission.  Keith Packard and Daniel Stone
+dnl make no representations about the suitability of this software for any
+dnl purpose.  It is provided "as is" without express or implied warranty.
+dnl
+dnl KEITH PACKARD AND DANIEL STONE DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+dnl SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+dnl IN NO EVENT SHALL KEITH PACKARD OR DANIEL STONE BE LIABLE FOR ANY SPECIAL,
+dnl INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+dnl LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+dnl OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+dnl PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ(2.53)
+AC_INIT([xorg], 6.9.99.1, [xorg@freedesktop.org], xorg)
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_INIT_AUTOMAKE([dist-bzip2])
+AM_MAINTAINER_MODE
+AM_CONFIG_HEADER(include/config.h)
+AM_CONFIG_HEADER(include/xorg.h)
+
+AC_PROG_CC
+AM_PROG_AS
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+AC_PROG_MAKE_SET
+PKG_PROG_PKG_CONFIG([0.15])  
+dnl do we want pkg-config?
+
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_BIGENDIAN
+AC_TYPE_PID_T
+
+# Checks for library functions.
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long])
+AC_FUNC_ALLOCA
+
+# Find the math libary
+AC_CHECK_LIB(m,sqrt)
+
+AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
+
+# VM86 headers
+AC_CHECK_HEADERS([sys/vm86.h sys/io.h])
+
+
+
+# AGPGART headers
+AC_CHECK_HEADERS([linux/agpgart.h sys/agpio.h])
+
+# APM header
+AC_CHECK_HEADERS([linux/apm_bios.h])
+
+# fbdev header
+AC_CHECK_HEADERS([linux/fb.h])
+
+# MTRR header
+AC_CHECK_HEADERS([asm/mtrr.h])
+
+# Handhelds.org touchscreen driver
+AC_CHECK_HEADERS([linux/h3600_ts.h])
+
+# tslib touchscreen driver
+AC_CHECK_HEADERS([tslib.h])
+
+AC_CACHE_CHECK([for SYSV IPC],
+		ac_cv_sysv_ipc,
+		[AC_TRY_RUN([
+#include <sys/shm.h>
+int main () { 
+    int id;
+    id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R);
+    if (id < 0) return -1;
+    return shmctl(id, IPC_RMID, 0);
+}],
+	[ac_cv_sysv_ipc=yes],
+	[ac_cv_sysv_ipc=no])])
+if test "$ac_cv_sysv_ipc" = yes; then
+	AC_DEFINE(HAVE_SYSV_IPC,1, [Define to 1 if SYSV IPC is available])
+fi
+
+case $host_cpu in
+  sparc*)
+  	xorg_bus_sbus="yes"
+        DEFAULT_INT10=x86emu
+	;;
+  i*86)
+        DEFAULT_INT10=vm86
+        ;;
+  *)
+        DEFAULT_INT10=x86emu
+        ;;
+esac
+
+REQUIRED_MODULES="xrandr render xfixes damageext xextensions \
+                  xfont xproto xtrans xau xkbfile"
+
+DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
+DEFAULT_VENDOR_STRING="freedesktop.org"
+# TODO: ensure these two are kept in sync :\
+DEFAULT_VENDOR_RELEASE="6.9.99.1"
+VERSION_STRING="6,9,99,1,0"
+DEFAULT_VENDOR_WEB="http://wiki.x.org"
+EXTENSION_LIBS='$(top_builddir)/Xext/libXext.a'
+DMX_EXTENSIONS='$(top_builddir)/Xext/libXext.a'" "'$(top_builddir)/render/librender.o'
+EXTENSION_INCS='-I$(top_srcdir)/Xext'
+AC_DEFINE(XORG, 1, [Build Xorg server])
+
+AC_ARG_ENABLE(werror,        [  --enable-werror ],[WERROR=$enableval],[WERROR=no])
+AC_ARG_ENABLE(xv,            [  --disable-xv ],[XV=$enableval],[XV=yes])
+AC_ARG_ENABLE(composite,     [  --enable-composite ],[COMPOSITE=$enableval],[COMPOSITE=no])
+AC_ARG_ENABLE(mitshm,        [  --disable-shm ],[MITSHM=$enableval],[MITSHM=yes])
+AC_ARG_ENABLE(xres,          [  --disable-xres ],[RES=$enableval],[RES=yes])
+AC_ARG_ENABLE(xtrap,         [  --enable-xtrap ],[XTRAP=$enableval],[XTRAP=no])
+AC_ARG_ENABLE(record,        [  --enable-record ],[RECORD=$enableval],[RECORD=no])
+AC_ARG_ENABLE(builtinrgb,    [  --disable-builtinrgb ],[USE_RGB_BUILTIN=$enableval],[USE_RGB_BUILTIN=yes])
+AC_ARG_ENABLE(screensaver,   [  --disable-screensaver ],
+			     [SCREENSAVER=$enableval],
+			     [SCREENSAVER=yes])
+AC_ARG_ENABLE(xdmcp,         [  --disable-xdmcp ],[XDMCP=$enableval],[XDMCP=auto])
+AC_ARG_ENABLE(xdm-auth-1,    [  --disable-xdm-auth-1 ],[XDMAUTH=$enableval],[XDMAUTH=auto])
+AC_ARG_ENABLE(glx,           [  --enable-glx ],[GLX=$enableval],[GLX=no])
+AC_ARG_ENABLE(dri,           [  --enable-dri ],[DRI=$enableval],[DRI=no])
+AC_ARG_ENABLE(xinerama,	     [  --disable-xinerama ],[XINERAMA=$enableval],[XINERAMA=yes])
+AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--enable-xcsecurity],[Build Security extension (default: disabled)]),[XCSECURITY=$enableval],[XCSECURITY=no])
+AC_ARG_ENABLE(dmx,    	      AS_HELP_STRING([--enable-dmx],[Build DMX server (default: disabled)]),[DMX=$enableval],[DMX=no])
+
+# Transport selection
+AC_ARG_ENABLE(unix-transport,[  --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes])
+AC_ARG_ENABLE(tcp-transport, [  --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes])
+AC_ARG_ENABLE(ipv6,          [  --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes])
+
+AC_ARG_WITH(mesa-source,        [  --with-mesa-source=PATH ],
+				[MESA_SOURCE="$withval"],
+				[MESA_SOURCE="\$(top_srcdir)/../Mesa"])
+AC_ARG_WITH(fontpath,        [  --with-fontpath=PATH ],
+				[FONTPATH="$withval"],
+				[FONTPATH="$DEFAULT_FONT_PATH"])
+AC_ARG_WITH(int10,           [  --with-int10=BACKEND    int10 backend: vm86, x86emu or stub ],
+				[INT10="$withval"],
+				[INT10="$DEFAULT_INT10"])
+AC_ARG_WITH(vendor-string,   [  --with-vendor-string=VENDOR ],
+			     	[ VENDOR_STRING="$withval" ],
+			     	[ VENDOR_STRING="$DEFAULT_VENDOR_STRING" ])
+AC_ARG_WITH(vendor-release,  [  --with-vendor-release=RELEASE ],
+				[ VENDOR_RELEASE="$withval" ],
+				[ VENDOR_RELEASE="$DEFAULT_VENDOR_RELEASE" ])
+AC_ARG_WITH(vendor-web,      [  --with-vendor-web=URL ],
+				[ VENDOR_WEB="$withval" ],
+				[ VENDOR_WEB="$DEFAULT_VENDOR_WEB" ])
+AC_ARG_WITH(driver-dir,      [  --with-driver-dir=DIR ],
+				[ driverdir="$withval" ],
+				[ driverdir="$libdir/xorg/modules" ])
+AC_ARG_WITH(builder-addr,    [  --with-builder-addr=ADDRESS ],
+				[ BUILDERADDR="$withval" ],
+				[ BUILDERADDR="xorg@lists.freedesktop.org" ])
+
+AM_CONDITIONAL(INT10_VM86, [test x$INT10 = xvm86])
+AM_CONDITIONAL(INT10_X86EMU, [test x$INT10 = xx86emu])
+AM_CONDITIONAL(INT10_STUB, [test x$INT10 = xstub])
+
+AC_SUBST([driverdir])
+sdkdir="$includedir/xorg"
+extdir="$includedir/X11/extensions"
+AC_SUBST([sdkdir])
+AC_SUBST([extdir])
+
+AC_DEFINE(SHAPE,1,[Support SHAPE extension])
+
+AM_CONDITIONAL(XV, [test x$XV = xyes])
+if test "$XV" = yes; then
+	AC_DEFINE(XV,1,[Support Xv Extension])
+fi
+
+AM_CONDITIONAL(DMX, [test x$DMX = xyes])
+if test "$DMX" = yes; then
+	PKG_CHECK_MODULES(DMXMODULES, dmxext xmuu xextensions x11 xrender xfont)
+fi
+
+AM_CONDITIONAL(GLX, [test x$GLX = xyes])
+if test "$GLX" = yes; then
+    PKG_CHECK_MODULES(GL,gl)
+fi
+
+AM_CONDITIONAL(COMPOSITE, [test x$COMPOSITE = xyes])
+if test "$COMPOSITE" = yes; then
+	AC_DEFINE(COMPOSITE,1,[Support Composite Extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES compositeext"
+fi
+
+AM_CONDITIONAL(MITSHM, [test x$MITSHM = xyes])
+if test "$MITSHM" = yes; then
+	AC_DEFINE(MITSHM,1,[Support MIT-SHM Extension])
+	AC_DEFINE(HAS_SHM,1,[Support SHM])
+fi
+
+if test "$UNIXCONN" = "yes"; then
+	AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
+fi
+if test "$TCPCONN" = "yes"; then
+	AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
+fi
+if test "$IPV6CONN" = "yes"; then
+	AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections])
+fi
+
+AC_DEFINE(XORGSERVER,,[Build Xorg server])
+AC_DEFINE(XKB,1,[Build XKB])
+AC_DEFINE(XKB_IN_SERVER,1,[Build XKB server])
+AC_DEFINE(XKB_DFLT_DISABLED,0,[Enable XKB per default])
+AC_DEFINE(XINPUT,,[Build XInput])
+REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
+
+AC_SUBST([XKB])
+
+AM_CONDITIONAL(XTRAP, [test x$XTRAP = xyes])
+if test "$XTRAP" = yes; then
+	AC_DEFINE(XTRAP,1,[Support XTrap extension])
+	DMX_EXTENSIONS="$DMX_EXTENSIONS "'$(top_builddir)/XTrap/.libs/libxtrap.a'
+fi
+AM_CONDITIONAL(RECORD, [test x$RECORD = xyes])
+if test "$RECORD" = yes; then
+	AC_DEFINE(RECORD,1,[Support Record extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES recordext"
+fi
+
+AM_CONDITIONAL(SCREENSAVER, [test x$SCREENSAVER = xyes])
+if test "$SCREENSAVER" = yes; then
+	AC_DEFINE(SCREENSAVER,1,[Support MIT-SCREEN-SAVER extension])
+fi
+AM_CONDITIONAL(RES, [test x$RES = xyes])
+if test "$RES" = yes; then
+	AC_DEFINE(RES,1,[Support X resource extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES resourceext"
+fi
+AM_CONDITIONAL(XCSECURITY, [test x$XCSECURITY = xyes])
+if test "$XCSECURITY" = yes; then
+	AC_DEFINE(XCSECURITY,1,[Build Security extension])
+fi
+
+AM_CONDITIONAL(GLX, test x$GLX = xyes)
+if test "$GLX" = yes; then
+	AC_DEFINE(GLXEXT,1,[Build GLX extension])
+#	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/GL/glx/libglx.a $(top_builddir)/GL/mesa/libglcore.a'
+	dnl EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/glx'
+fi
+AC_SUBST([MESA_SOURCE])
+
+AM_CONDITIONAL(DRI, test x$DRI = xyes)
+if test "$DRI" = yes; then
+	AC_DEFINE(XORGDRI,1,[Build DRI extension])
+	AC_DEFINE(_XORGDRI_SERVER_,1,[XORGDRI internal define])
+	PKG_CHECK_MODULES(DRM, libdrm)
+fi
+
+AC_DEFINE(XINPUT,1,[Support X Input extension])
+EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/Xi/libXi.a'
+
+AM_CONDITIONAL(XINERAMA, [test x$XINERAMA = xyes])
+if test "$XINERAMA" = yes; then
+	AC_DEFINE(XINERAMA,1,[Support Xinerama extension])
+	AC_DEFINE(PANORAMIX,1,[Internal define for Xinerama])
+	REQUIRED_MODULES="$REQUIRED_MODULES panoramixext"
+fi
+AM_CONDITIONAL(XCSECURITY, [test x$XCSECURITY = xyes])
+if test "$XCSECURITY" = yes; then
+	AC_DEFINE(XCSECURITY,1,[Build Security extension])
+fi
+
+AM_CONDITIONAL(XLOADABLE, [test x$XLOADABLE = xyes])
+if test "$XLOADABLE" = yes; then
+	AC_DEFINE(XLOADABLE,1,[Support loadable input and output drivers])
+fi
+
+PKG_CHECK_MODULES(XDMCP, xdmcp, [have_libxdmcp="yes"], [have_libxdmcp="no"])
+
+if test "$have_libxdmcp" = yes; then
+	AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS])
+fi
+
+if test x$XDMCP = xauto; then
+	if test $have_libxdmcp = yes; then
+		XDMCP=yes
+	else
+		XDMCP=no
+	fi
+fi
+if test x$XDMAUTH = xauto; then
+	if test $have_libxdmcp = yes -a x$have_xdmcpwrap = xyes; then
+		XDMAUTH=yes
+	else
+		XDMAUTH=no
+	fi
+fi
+
+AM_CONDITIONAL(XDMCP, [test x$XDMCP = xyes])
+if test "$XDMCP" = yes; then
+	AC_DEFINE(XDMCP,1,[Support Xdmcp])
+	REQUIRED_MODULES="$REQUIRED_MODULES xdmcp"
+fi
+
+AM_CONDITIONAL(XDMAUTH, [test x$XDMAUTH = xyes])
+if test "$XDMAUTH" = yes; then
+	AC_DEFINE(HASXDMAUTH,1,[Support XDM-AUTH*-1])
+	if test "x$XDMCP" != yes; then
+		REQUIRED_MODULES="$REQUIRED_MODULES xdmcp"
+	fi
+fi
+
+if test "$ac_cv_header_tslib_h" = yes; then
+	AC_DEFINE(TSLIB, 1, [Include tslib touchscreen driver])
+	TSLIB=yes
+else
+	TSLIB=no
+fi
+
+AM_CONDITIONAL(TSLIB, [test x$TSLIB = xyes])
+if test "$TSLIB" = yes; then
+	AC_DEFINE(TSLIB,1,[Support tslib touchscreen abstraction library])
+else
+
+dnl Make sure tslib and ipaq ts dont *both* get enabled.  
+
+	if test "$ac_cv_header_linux_h3600_ts_h" = yes; then
+	   AC_DEFINE(H3600_TS, 1, [Include handhelds.org h3600 touchscreen driver])
+	   H3600_TS=yes
+	else
+	   H3600_TS=no
+fi
+
+fi
+
+AM_CONDITIONAL(H3600_TS, [test "$H3600_TS" = yes])
+if test "$TSLIB" = yes -o "$H3600_TS" = yes; then
+	AC_DEFINE(TOUCHSCREEN,1,[Enable touchscreen support])
+fi
+
+AM_CONDITIONAL(USE_RGB_BUILTIN, [test x$USE_RGB_BUILTIN = xyes])
+if test "$USE_RGB_BUILTIN" = yes; then
+	AC_DEFINE(USE_RGB_BUILTIN,1,[Use builtin rgb color database])
+fi
+
+AC_DEFINE_UNQUOTED(COMPILEDDEFAULTFONTPATH, ["$FONTPATH"], [Default font path])
+AC_DEFINE_UNQUOTED(XVENDORNAME,["$VENDOR_STRING"], [Vendor name])
+AC_DEFINE_UNQUOTED(XORG_RELEASE, ["$VENDOR_RELEASE"], [Vendor release])
+AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address])
+AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
+
+dnl
+dnl A bunch of configuration values which shouldn't be optional
+dnl
+AC_DEFINE(RENDER,1,[Support RENDER extension])
+EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/render/librender.o'
+EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/render'
+
+AC_DEFINE(RANDR,1,[Support RANDR extension])
+EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/randr/librandr.a'
+EXTENSION_INCS="$EXTENSION_INCS "-I'$(top_srcdir)/randr'
+
+AC_DEFINE(DDXOSINIT,1,[Use OsVendorInit])
+AC_DEFINE(SERVER_LOCK,1,[Use a lock to prevent multiple servers on a display])
+AC_DEFINE(SMART_SCHEDULE,1,[Include time-based scheduler])
+AC_DEFINE(NDEBUG,1,[Disable some debugging code])
+AC_DEFINE(USE_RGB_TXT,1,[Use rgb.txt directly])
+AC_DEFINE(MITMISC,1,[Support MIT Misc extension])
+AC_DEFINE(XTEST,1,[Support XTest extension])
+AC_DEFINE(XSYNC,1,[Support XSync extension])
+AC_DEFINE(XCMISC,1,[Support XCMisc extension])
+AC_DEFINE(BIGREQS,1,[Support BigRequests extension])
+AC_DEFINE(PIXPRIV,1,[Support pixmap privates])
+AC_DEFINE(XFIXES,1,[Support XFixes extension])
+AC_DEFINE(XF86VIDMODE,1,[Support XFree86 Video Mode extension])
+AC_DEFINE(XF86MISC,1,[Support XFree86 miscellaneous extensions])
+# must come first as it uses stuff in Shape -d
+EXTENSION_LIBS='$(top_builddir)/xfixes/libxfixes.a'" $EXTENSION_LIBS"
+EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/xfixes'
+
+AC_DEFINE(DAMAGE,1,[Support Damage extension])
+EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/damageext/libdamageext.a'
+EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/damageext'
+
+if test "$COMPOSITE" = yes; then
+	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/composite/libcomposite.a'" "'$(top_builddir)/miext/cw/libcw.a'
+	EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/composite'
+fi
+
+DIX_LIB='$(top_builddir)/dix/libdix.a'
+OS_LIB='$(top_builddir)/os/libos.a'
+MI_LIB='$(top_builddir)/mi/libmi.o'
+MINIMI_LIB='$(top_builddir)/mi/libminimi.o'
+MI_EXT_LIB='$(top_builddir)/mi/libmiext.a'
+MI_INC='-I$(top_srcdir)/mi'
+FB_INC='-I$(top_srcdir)/fb'
+DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.a'
+DAMAGE_INC='-I$(top_srcdir)/miext/damage'
+SHADOW_INC='-I$(top_srcdir)/miext/shadow'
+XPSTUBS_LIB='$(top_builddir)/dix/libxpstubs.a'
+XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"
+XKB_LIB='$(top_builddir)/xkb/libxkb.a'
+XI_LIB='$(top_builddir)/Xi/libXi.a'
+XI_INC='-I$(top_builddir)/Xi'
+
+PKG_CHECK_MODULES(XSERVER, $REQUIRED_MODULES)
+
+XORG_CORE_LIBS="$DIX_LIB"
+XORG_LIBS="$FB_LIB $MI_LIB $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $EXTENSION_LIBS $XPSTUBS_LIB $OS_LIB $SHADOW_LIB"
+XDMX_LIBS="$OS_LIB $DAMAGE_LIB $MINIMI_LIB $XKB_LIB $XI_LIB $DMX_EXTENSIONS"
+XORG_DDXINCS='-I$(top_srcdir)/hw/xorg/include -I$(top_srcdir)/hw/xorg/common'
+XORG_OSINCS='-I$(top_srcdir)/hw/xorg/os-support -I$(top_srcdir)/hw/xorg/os-support/bus -I$(top_srcdir)/os'
+XORG_CORE_INCS='-I$(top_srcdir)/include -I$(top_srcdir)/dix -I$(top_srcdir)/mi'
+XORG_INCS="$EXTENSION_INCS $MI_INC $DAMAGE_INC $SHADOW_INC $FB_INC $XI_INC $XORG_DDXINCS $XORG_OSINCS $XORG_CORE_INCS"
+if test "$WORDS_BIGENDIAN" = yes; then
+	ENDIAN="X_BIG_ENDIAN"
+else
+	ENDIAN="X_LITTLE_ENDIAN"
+fi
+AC_DEFINE_UNQUOTED(X_BYTE_ORDER,[$ENDIAN],[Endian order])
+XORG_CFLAGS="$XORGSERVER_CFLAGS $XORG_INCS"
+case $host_os in
+  linux-gnu*)
+  	# support: yea
+  	XORG_OS="linux"
+	XORG_OS_SUBDIR="linux"
+	;;
+  freebsd*)
+  	# support: nay
+	# daniel has an account on an fbsd box, working on this
+	# jaymz too
+  	XORG_OS="freebsd"
+	XORG_OS_SUBDIR="bsd"
+	;;
+  netbsd*)
+  	# support: nay
+  	# volunteers?
+  	XORG_OS="netbsd"
+	XORG_OS_SUBDIR="bsd"
+	;;
+  openbsd*)
+ 	# support: nay
+  	# volunteers?
+  	XORG_OS="openbsd"
+	XORG_OS_SUBDIR="bsd"
+	;;
+  solaris*)
+  	# support: nay
+  	XORG_OS="solaris"
+	XORG_OS_SUBDIR="solaris"
+	;;
+  *)
+  	XORG_OS="unknown"
+	XORG_OS_SUBDIR="unknown"
+	AC_MSG_ERROR([Your OS is unknown. Xorg currently only supports Linux, \
+	Free/Open/NetBSD, and Solaris. If you are interested in porting Xorg \
+	to your platform, please email xorg@freedesktop.org.])
+	;;
+esac
+AC_SUBST([XORG_CORE_LIBS])
+AC_SUBST([XORG_LIBS])
+AC_SUBST([EXTENSION_LIBS])
+AC_SUBST([XDMX_LIBS])
+AC_SUBST([XORG_INCS])
+AC_SUBST([XORG_OS])
+AC_SUBST([XORG_OS_SUBDIR])
+AM_CONDITIONAL([XORG_BUS_SBUS], [test "x$xorg_bus_sbus" = xyes])
+
+AC_DEFINE_UNQUOTED(__XCONFIGFILE__,[XF86CONFIGFILE],[Location of configuration file])
+AC_DEFINE(__XSERVERNAME__,"Xorg",[Name of X server])
+AC_DEFINE(__XKBDEFRULES__,"xorg",[XKB default rules])
+AC_DEFINE(XFree86XDGA,1,[Build XDGA support])
+AC_DEFINE(XFree86Server,1,[Building XFree86 server])
+AC_DEFINE(XFree86LOADER,1,[Building XFree86 loader])
+AC_DEFINE(DLOPEN_SUPPORT,1,[Building with libdl])
+AC_DEFINE(XF86BIGFONT,1,[Build XFree86 BigFont extension])
+AC_DEFINE(XResExtension,1,[Build XRes extension])
+AC_DEFINE(DPMSExtension,1,[Build DPMS extension])
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT,[XF86_VERSION_NUMERIC($VERSION_STRING)],[Current Xorg version])
+AC_DEFINE(NEED_XF86_TYPES,1,[Need XFree86 typedefs])
+AC_DEFINE(NEED_XF86_PROTOTYPES,1,[Need XFree86 helper functions])
+AC_DEFINE(_POSIX_SOURCE,500,[POSIX-compliant source])
+AC_DEFINE(_XOPEN_SOURCE,1,[X/Open-compliant source])
+AC_DEFINE(_BSD_SOURCE,1,[BSD-compliant source])
+AC_DEFINE(DRIVERS,{},[Built-in output drivers])
+AC_DEFINE(IDRIVERS,{},[Built-in input drivers])
+
+if test "x$GCC" = "xyes"; then
+	GCC_WARNINGS1="-Wall -Wpointer-arith -Wstrict-prototypes"
+	GCC_WARNINGS2="-Wmissing-prototypes -Wmissing-declarations"
+	GCC_WARNINGS3="-Wnested-externs -fno-strict-aliasing"
+	GCC_WARNINGS="$GCC_WARNINGS1 $GCC_WARNINGS2 $GCC_WARNINGS3"
+	if test "x$WERROR" = "xyes"; then
+		GCC_WARNINGS="${GCC_WARNINGS} -Werror"
+	fi
+	XSERVER_CFLAGS="$GCC_WARNINGS $XSERVER_CFLAGS"
+fi
+
+dnl These can't be in AC_DEFINE_UNQUOTED as they expand to strings with stuff
+dnl like ${prefix} in them.
+CONFIGFILE="$sysconfdir/xorg.conf"
+XORG_MODPATH="-DDEFAULT_MODULE_PATH=\\\"$driverdir\\\""
+XORG_LOGPATH="-DDEFAULT_LOGPREFIX=\\\"$localstatedir/log/Xorg.\\\""
+XORG_CONFPATH="-DXF86CONFIGFILE=\\\"$CONFIGFILE\\\"" 
+XORG_XKBBASE="-DXKB_BASE_DIRECTORY=\\\"$sysconfdir/xkb\\\""
+XORG_CFLAGS="$XORG_CFLAGS $XSERVER_CFLAGS $XORG_MODPATH $XORG_LOGPATH $XORG_CONFPATH $XORG_XKBBASE $XORG_INCS"
+AC_SUBST([XORG_CFLAGS])
+
+CFLAGS="$XORG_CFLAGS $CFLAGS"
+AC_SUBST([CFLAGS])
+
+AC_MSG_CHECKING(if unaligned word accesses behave as expected)
+AC_TRY_RUN([
+#include <stdio.h>
+
+int main()
+{
+        char j[8]={1,2,3,4,5,6,7,8};
+        int k= *(int *)(j+1);
+        if(k==0x02030405 || k==0x05040302)
+                return 0;
+        return 1;
+}
+],
+ [AC_DEFINE(WORKING_UNALIGNED_INT, 1, [unaligned word accesses behave as expected])
+  AC_MSG_RESULT(yes)], 
+ AC_MSG_RESULT(no),
+ AC_MSG_RESULT(assuming not on target machine))
+
+AC_SUBST([libdir exec_prefix prefix])
+
+AC_OUTPUT([
+Makefile
+include/Makefile
+afb/Makefile
+composite/Makefile
+damageext/Makefile
+dix/Makefile
+fb/Makefile
+record/Makefile
+XTrap/Makefile
+mfb/Makefile
+cfb/Makefile
+cfb16/Makefile
+cfb24/Makefile
+cfb32/Makefile
+mi/Makefile
+miext/Makefile
+miext/damage/Makefile
+miext/shadow/Makefile
+miext/cw/Makefile
+os/Makefile
+randr/Makefile
+render/Makefile
+xkb/Makefile
+Xext/Makefile
+Xext/extmod/Makefile
+Xi/Makefile
+xfixes/Makefile
+hw/Makefile
+hw/xorg/Makefile
+hw/xorg/common/Makefile
+hw/xorg/ddc/Makefile
+hw/xorg/dummylib/Makefile
+hw/xorg/fbdevhw/Makefile
+hw/xorg/i2c/Makefile
+hw/xorg/include/Makefile
+hw/xorg/include/X11/Makefile
+hw/xorg/include/X11/extensions/Makefile
+hw/xorg/int10/Makefile
+hw/xorg/loader/Makefile
+hw/xorg/os-support/Makefile
+hw/xorg/os-support/bus/Makefile
+hw/xorg/os-support/misc/Makefile
+hw/xorg/os-support/linux/Makefile
+hw/xorg/os-support/linux/drm/Makefile
+hw/xorg/os-support/linux/int10/Makefile
+hw/xorg/parser/Makefile
+hw/xorg/rac/Makefile
+hw/xorg/ramdac/Makefile
+hw/xorg/scanpci/Makefile
+hw/xorg/shadowfb/Makefile
+hw/xorg/vbe/Makefile
+hw/xorg/vgahw/Makefile
+hw/xorg/xaa/Makefile
+hw/xorg/xf1bpp/Makefile
+hw/xorg/xf24_32bpp/Makefile
+hw/xorg/xf4bpp/Makefile
+hw/xorg/xf8_16bpp/Makefile
+hw/xorg/xf8_32bpp/Makefile
+hw/xorg/xf8_32wid/Makefile
+hw/dmx/input/Makefile
+hw/dmx/glxProxy/Makefile
+hw/dmx/config/Makefile
+hw/dmx/Makefile
+xorg.pc
+])
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/autogen.sh	2005-04-15 23:19:39.000000000 -0400
@@ -0,0 +1,3 @@
+#! /bin/sh
+autoreconf -v --install || exit 1
+./configure --enable-maintainer-mode "$@"
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/xorg.pc.in	2005-04-15 23:20:17.000000000 -0400
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+driverdir=@driverdir@
+sdkdir=@sdkdir@
+
+Name: Xorg
+Description: Modular X.Org X Server
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir}
+Cflags: -I${sdkdir} -DIN_MODULE -DXFree86Module
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/XTrap/Makefile.am	2005-04-15 23:25:39.000000000 -0400
@@ -0,0 +1,3 @@
+driver_LTLIBRARIES = libxtrap.la
+
+libxtrap_la_SOURCES = xf86XTrapModule.c xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/Xext/Makefile.am	2005-04-15 23:27:01.000000000 -0400
@@ -0,0 +1,56 @@
+noinst_LIBRARIES = libXext.a
+
+SUBDIRS = extmod
+
+sdk_HEADERS = dgaproc.h xvdix.h xvmcext.h
+
+if MITSHM
+MITSHM_SRCS = shm.c shmint.h
+endif
+
+if XV
+XV_SRCS = xvmain.c xvdisp.c xvmc.c xvdix.h xvmcext.h
+endif
+
+if RES
+RES_SRCS = xres.c
+endif
+
+if SCREENSAVER
+SCREENSAVER_SRCS = saver.c
+endif
+
+if XCSECURITY   
+XCSECURITY_SRCS = security.c
+endif
+
+if XINERAMA
+PANORAMIX_SRCS = panoramiX.c panoramiX.h panoramiXsrv.h panoramiXprocs.c panoramiXSwap.c 
+endif
+
+libXext_a_SOURCES =		\
+	bigreq.c		\
+	mitmisc.c		\
+	shape.c			\
+	shapeint.h		\
+	sleepuntil.c		\
+	sleepuntil.h		\
+	sync.c			\
+	syncint.h		\
+	xext.h			\
+	xtest.c			\
+	xtest1di.c		\
+	xtest1dd.c		\
+	xtest1dd.h		\
+	xcmisc.c		\
+	xevie.c			\
+	dpms.c			\
+	xf86bigfont.c		\
+	dmx.c			\
+	$(MITSHM_SRCS)		\
+	$(XV_SRCS)		\
+	$(RES_SRCS)		\
+	$(SCREENSAVER_SRCS)	\
+	$(PANORAMIX_SRCS)	\
+	$(XCSECURITY_SRCS)	\
+        extmod/modinit.c
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/Xext/extmod/Makefile.am	2005-04-15 23:35:30.000000000 -0400
@@ -0,0 +1,55 @@
+moduledir = $(libdir)/xorg/modules
+
+if MITSHM
+MITSHM_SRCS = ../shm.c ../shmint.h
+endif
+
+if XV
+XV_SRCS = ../xvmod.c ../xvmain.c ../xvdisp.c ../xvmc.c ../xvdix.h ../xvmcext.h
+endif
+
+if RES
+RES_SRCS = ../xres.c
+endif
+
+if SCREENSAVER
+SCREENSAVER_SRCS = ../saver.c
+endif
+
+if XINERAMA
+PANORAMIX_SRCS = ../panoramiX.c ../panoramiX.h ../panoramiXsrv.h \
+		 ../panoramiXprocs.c ../panoramiXSwap.c
+endif
+
+XF86EXT_SRCS = \
+	       ../xf86dga2.c \
+	       ../xf86misc.c \
+	       ../xf86vmode.c \
+               ../xf86dga.c \
+               ../xf86bigfont.c
+
+
+driver_LTLIBRARIES = libextmod.la
+libextmod_la_SOURCES = \
+	../bigreq.c \
+	../dpms.c \
+	../mitmisc.c \
+	../shape.c \
+	../shapeint.h \
+	../sleepuntil.c \
+	../sleepuntil.h \
+	../sync.c \
+	../syncint.h \
+	../xext.h \
+	../xtest.c \
+	../xtest1di.c \
+	../xtest1dd.c \
+	../xtest1dd.h \
+	../xcmisc.c \
+	$(XF86EXT_SRCS) \
+	$(MITSHM_SRCS) \
+	$(XV_SRCS) \
+	$(RES_SRCS) \
+	$(SCREENSAVER_SRCS) \
+	$(PANORAMIX_SRCS) \
+	modinit.c
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/Xi/Makefile.am	2005-04-15 23:27:19.000000000 -0400
@@ -0,0 +1,77 @@
+noinst_LIBRARIES = libXi.a
+
+libXi_a_SOURCES =	\
+	allowev.c \
+	allowev.h \
+	chgdctl.c \
+	chgdctl.h \
+	chgfctl.c \
+	chgfctl.h \
+	chgkbd.c \
+	chgkbd.h \
+	chgkmap.c \
+	chgkmap.h \
+	chgprop.c \
+	chgprop.h \
+	chgptr.c \
+	chgptr.h \
+	closedev.c \
+	closedev.h \
+	devbell.c \
+	devbell.h \
+	exevents.c \
+	exglobals.h \
+	extinit.c \
+	getbmap.c \
+	getbmap.h \
+	getdctl.c \
+	getdctl.h \
+	getfctl.c \
+	getfctl.h \
+	getfocus.c \
+	getfocus.h \
+	getkmap.c \
+	getkmap.h \
+	getmmap.c \
+	getmmap.h \
+	getprop.c \
+	getprop.h \
+	getselev.c \
+	getselev.h \
+	getvers.c \
+	getvers.h \
+	grabdev.c \
+	grabdev.h \
+	grabdevb.c \
+	grabdevb.h \
+	grabdevk.c \
+	grabdevk.h \
+	gtmotion.c \
+	gtmotion.h \
+	listdev.c \
+	listdev.h \
+	opendev.c \
+	opendev.h \
+	queryst.c \
+	queryst.h \
+	selectev.c \
+	selectev.h \
+	sendexev.c \
+	sendexev.h \
+	setbmap.c \
+	setbmap.h \
+	setdval.c \
+	setdval.h \
+	setfocus.c \
+	setfocus.h \
+	setmmap.c \
+	setmmap.h \
+	setmode.c \
+	setmode.h \
+	stubs.c \
+	ungrdev.c \
+	ungrdev.h \
+	ungrdevb.c \
+	ungrdevb.h \
+	ungrdevk.c \
+	ungrdevk.h
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/afb/Makefile.am	2005-04-15 23:28:04.000000000 -0400
@@ -0,0 +1,47 @@
+driver_LTLIBRARIES = libafb.la
+
+libafb_gen_sources = afbbltC.c afbbltX.c afbbltCI.c afbbltO.c afbbltG.c afbtileC.c afbtileG.c afbseg.c
+
+DISTCLEANFILES = $(libafb_gen_sources)
+
+libafb_la_SOURCES = afbgc.c afbwindow.c afbfont.c afbfillrct.c afbpntwin.c afbpixmap.c \
+	 afbimage.c afbline.c afbbres.c afbhrzvert.c afbbresd.c afbpushpxl.c afbply1rct.c \
+	 afbzerarc.c afbfillarc.c afbfillsp.c afbsetsp.c afbscrinit.c afbmodule.c afbplygblt.c \
+	 afbclip.c afbgetsp.c afbpolypnt.c afbbitblt.c afbcmap.c afbimggblt.c afbpntarea.c \
+	 afbmisc.c afbbstore.c afbtegblt.c $(libafb_gen_sources)
+	 
+INCLUDES = -I$(top_srcdir)/mfb 
+
+afbseg.c:
+	echo "#define POLYSEGMENT" > $@
+	echo "#include \"afbline.c\"" >> $@
+
+afbbltC.c:
+	echo "#define MROP Mcopy" > $@
+	echo "#include \"afbblt.c\"" >> $@
+
+afbbltX.c:
+	echo "#define MROP Mxor" > $@
+	echo "#include \"afbblt.c\"" >> $@
+
+afbbltCI.c:
+	echo "#define MROP McopyInverted" > $@
+	echo "#include \"afbblt.c\"" >> $@
+
+afbbltO.c:
+	echo "#define MROP Mor" > $@
+	echo "#include \"afbblt.c\"" >> $@
+
+afbbltG.c:
+	echo "#define MROP 0" > $@
+	echo "#include \"afbblt.c\"" >> $@
+
+afbtileC.c:
+	echo "#define MROP Mcopy" > $@
+	echo "#include \"afbtile.c\"" >> $@
+
+afbtileG.c:
+	echo "#define MROP 0" > $@
+	echo "#include \"afbtile.c\"" >> $@
+
+sdk_HEADERS = afb.h
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/cfb/Makefile.am	2005-04-15 23:29:26.000000000 -0400
@@ -0,0 +1,12 @@
+driver_LTLIBRARIES = libcfb.la
+
+include Makefile.am.inc
+
+DISTCLEANFILES += cfbglrop8.c
+libcfb_la_SOURCES =  cfb8bit.c cfbcmap.c cfbteblt8.c cfbglrop8.c cfbpush8.c \
+	cfbrctstp8.c cfbmodule.c $(libcfb_gen_sources) $(libcfb_common_sources)
+libcfb_la_LIBADD = ../mfb/libmfb.la
+AM_CFLAGS = -DPSZ=8
+
+sdk_HEADERS = cfb.h
+
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/cfb/Makefile.am.inc	2005-04-15 23:29:29.000000000 -0400
@@ -0,0 +1,139 @@
+libcfb_gen_sources = cfbseg.c cfbfillarcC.c cfbfillarcG.c cfbzerarcC.c cfbzerarcX.c cfbzerarcG.c \
+	cfbbltC.c cfbbltX.c cfbbltO.c cfbbltG.c cfbsolidC.c cfbsolidX.c cfbsolidG.c cfbtileoddC.c \
+	cfbtileoddG.c cfbtile32C.c cfbtile32G.c cfb8lineCO.c cfb8lineCP.c cfb8lineX.c cfb8lineG.c \
+	cfb8segCS.c cfb8segC.c cfb8segX.c cfb8setG.c cfbply1rctC.c cfbply1rctG.c 
+
+DISTCLEANFILES = $(libcfb_gen_sources)
+
+INCLUDES = -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
+
+libcfb_common_sources =  $(top_srcdir)/cfb/cfbgc.c $(top_srcdir)/cfb/cfbrrop.c \
+	$(top_srcdir)/cfb/cfbwindow.c $(top_srcdir)/cfb/cfbpntwin.c \
+	$(top_srcdir)/cfb/cfbmskbits.c $(top_srcdir)/cfb/cfbpixmap.c \
+	$(top_srcdir)/cfb/cfbbitblt.c $(top_srcdir)/cfb/cfbfillsp.c \
+	$(top_srcdir)/cfb/cfbsetsp.c $(top_srcdir)/cfb/cfbscrinit.c \
+	$(top_srcdir)/cfb/cfballpriv.c $(top_srcdir)/cfb/cfbgetsp.c \
+	$(top_srcdir)/cfb/cfbfillrct.c $(top_srcdir)/cfb/cfbigblt8.c \
+	$(top_srcdir)/cfb/cfbglblt8.c $(top_srcdir)/cfb/cfbtegblt.c \
+	$(top_srcdir)/cfb/cfbbstore.c $(top_srcdir)/cfb/cfbpolypnt.c \
+	$(top_srcdir)/cfb/cfbbres.c $(top_srcdir)/cfb/cfbline.c \
+	$(top_srcdir)/cfb/cfbhrzvert.c $(top_srcdir)/cfb/cfbbresd.c \
+	$(top_srcdir)/cfb/cfbimage.c $(top_srcdir)/cfb/cfbcppl.c
+
+cfbseg.c:
+	echo "#define POLYSEGMENT" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbline.c\"" >> $@
+
+cfbfillarcC.c:
+	echo "#define RROP GXcopy" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbfillarc.c\"" >> $@
+
+cfbfillarcG.c:
+	echo "#define RROP GXset" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbfillarc.c\"" >> $@
+
+cfbzerarcC.c:
+	echo "#define RROP GXcopy" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbzerarc.c\"" >> $@
+
+cfbzerarcX.c:
+	echo "#define RROP GXxor" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbzerarc.c\"" >> $@
+
+cfbzerarcG.c:
+	echo "#define RROP GXset" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbzerarc.c\"" >> $@
+
+cfbbltC.c:
+	echo "#define MROP Mcopy" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbblt.c\"" >> $@
+
+cfbbltX.c:
+	echo "#define MROP Mxor" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbblt.c\"" >> $@
+
+cfbbltO.c:
+	echo "#define MROP Mor" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbblt.c\"" >> $@
+
+cfbbltG.c:
+	echo "#define MROP 0" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbblt.c\"" >> $@
+
+cfbsolidC.c:
+	echo "#define RROP GXcopy" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbsolid.c\"" >> $@
+
+cfbsolidX.c:
+	echo "#define RROP GXxor" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbsolid.c\"" >> $@
+
+cfbsolidG.c:
+	echo "#define RROP GXset" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbsolid.c\"" >> $@
+
+cfbtileoddC.c:
+	echo "#define MROP Mcopy" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbtileodd.c\"" >> $@
+
+cfbtileoddG.c:
+	echo "#define MROP 0" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbtileodd.c\"" >> $@
+
+cfbtile32C.c:
+	echo "#define MROP Mcopy" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbtile32.c\"" >> $@
+
+cfbtile32G.c:
+	echo "#define MROP 0" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbtile32.c\"" >> $@
+
+cfb8lineCO.c:
+	echo "#define RROP GXcopy" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@
+
+cfb8lineCP.c:
+	echo "#define RROP GXcopy" > $@
+	echo "#define PREVIOUS" >> $@
+	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@
+
+cfb8lineX.c:
+	echo "#define RROP GXxor" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@
+
+cfb8lineG.c:
+	echo "#define RROP GXset" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@
+
+cfb8segCS.c:
+	echo "#define RROP GXcopy" > $@
+	echo "#define POLYSEGMENT" >> $@
+	echo "#define WIDTH_SHIFT" >> $@
+	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@
+
+cfb8segC.c:
+	echo "#define RROP GXcopy" > $@
+	echo "#define POLYSEGMENT" >> $@
+	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@
+
+cfb8segX.c:
+	echo "#define RROP GXxor" > $@
+	echo "#define POLYSEGMENT" >> $@
+	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@
+
+cfb8setG.c:
+	echo "#define RROP GXset" > $@
+	echo "#define POLYSEGMENT" >> $@
+	echo "#include \"$(top_srcdir)/cfb/cfb8line.c\"" >> $@
+
+cfbply1rctC.c:
+	echo "#define RROP GXcopy" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbply1rct.c\"" >> $@
+
+cfbply1rctG.c:
+	echo "#define RROP GXset" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbply1rct.c\"" >> $@
+
+cfbglrop8.c:
+	echo "#define GLYPHROP" > $@
+	echo "#include \"$(top_srcdir)/cfb/cfbglblt8.c\"" >> $@
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/cfb16/Makefile.am	2005-04-15 23:29:37.000000000 -0400
@@ -0,0 +1,9 @@
+driver_LTLIBRARIES = libcfb16.la
+
+include $(top_srcdir)/cfb/Makefile.am.inc
+
+libcfb16_la_SOURCES =   cfbmodule.c $(libcfb_common_sources) $(libcfb_gen_sources)
+libcfb16_la_LIBADD = ../cfb/libcfb.la
+	
+AM_CFLAGS = -DPSZ=16
+
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/cfb24/Makefile.am	2005-04-15 23:29:46.000000000 -0400
@@ -0,0 +1,9 @@
+driver_LTLIBRARIES = libcfb24.la
+
+include $(top_srcdir)/cfb/Makefile.am.inc
+
+libcfb24_la_SOURCES =   cfbmodule.c $(libcfb_common_sources) $(libcfb_gen_sources)
+libcfb24_la_LIBADD = ../cfb/libcfb.la
+	
+AM_CFLAGS = -DPSZ=24
+
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/cfb32/Makefile.am	2005-04-15 23:30:03.000000000 -0400
@@ -0,0 +1,9 @@
+driver_LTLIBRARIES = libcfb32.la
+
+include $(top_srcdir)/cfb/Makefile.am.inc
+
+libcfb32_la_SOURCES =   cfbmodule.c $(libcfb_common_sources) $(libcfb_gen_sources)
+libcfb32_la_LIBADD = ../cfb/libcfb.la
+	
+AM_CFLAGS = -DPSZ=32
+
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/composite/Makefile.am	2005-04-15 23:30:15.000000000 -0400
@@ -0,0 +1,8 @@
+noinst_LIBRARIES = libcomposite.a
+
+libcomposite_a_SOURCES = 	\
+	compalloc.c		\
+	compext.c		\
+	compint.h		\
+	compinit.c		\
+	compwindow.c		
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/damageext/Makefile.am	2005-04-15 23:30:26.000000000 -0400
@@ -0,0 +1,6 @@
+noinst_LIBRARIES = libdamageext.a
+
+libdamageext_a_SOURCES = 	\
+	damageext.c		\
+	damageext.h		\
+	damageextint.h
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/dix/Makefile.am	2005-04-15 23:34:21.000000000 -0400
@@ -0,0 +1,31 @@
+noinst_LIBRARIES = libdix.a libxpstubs.a
+
+libdix_a_SOURCES = 	\
+	atom.c		\
+	colormap.c	\
+	cursor.c	\
+	devices.c	\
+	dispatch.c	\
+	dispatch.h	\
+	dixfonts.c	\
+	dixutils.c	\
+	events.c	\
+	extension.c	\
+	ffs.c		\
+	gc.c		\
+	globals.c	\
+	glyphcurs.c	\
+	grabs.c		\
+	initatoms.c	\
+	main.c		\
+	pixmap.c	\
+	privates.c	\
+	property.c	\
+	resource.c	\
+	swaprep.c	\
+	swapreq.c	\
+	tables.c	\
+	window.c
+
+libxpstubs_a_SOURCES =	\
+	xpstubs.c
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/fb/Makefile.am	2005-04-15 23:31:43.000000000 -0400
@@ -0,0 +1,46 @@
+driver_LTLIBRARIES = libfb.la
+
+sdk_HEADERS = fb.h fbrop.h
+
+libfb_la_SOURCES = 	\
+	fb.h		\
+	fb24_32.c	\
+	fballpriv.c	\
+	fbarc.c		\
+	fbbits.c	\
+	fbbits.h	\
+	fbblt.c		\
+	fbbltone.c	\
+	fbbstore.c	\
+	fbcmap.c	\
+	fbcompose.c	\
+	fbcopy.c	\
+	fbfill.c	\
+	fbfillrect.c	\
+	fbfillsp.c	\
+	fbgc.c		\
+	fbgetsp.c	\
+	fbglyph.c	\
+	fbimage.c	\
+	fbline.c	\
+	fbmodule.c	\
+	fboverlay.c	\
+	fboverlay.h	\
+	fbpict.c	\
+	fbpict.h	\
+	fbpixmap.c	\
+	fbpoint.c	\
+	fbpush.c	\
+	fbrop.h		\
+	fbscreen.c	\
+	fbseg.c		\
+	fbsetsp.c	\
+	fbsolid.c	\
+	fbstipple.c	\
+	fbtile.c	\
+	fbtrap.c	\
+	fbutil.c	\
+	fbwindow.c	\
+	fbpseudocolor.c \
+	fbedge.c	\
+	fbmmx.c
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/hw/Makefile.am	2005-04-15 23:39:50.000000000 -0400
@@ -0,0 +1,9 @@
+if DMX
+DMX_SUBDIRS = dmx
+endif
+
+XORG_SUBDIRS = xorg 
+
+SUBDIRS =			\
+	$(XORG_SUBDIRS)		\
+	$(DMX_SUBDIRS)
--- /dev/null	2005-04-15 15:36:38.393160952 -0400
+++ xorg/Xserver/hw/dmx/Makefile.am	2005-04-15 23:58:18.000000000 -0400
@@ -0,0 +1,84 @@
+SUBDIRS = input config
+bin_PROGRAMS = Xdmx
+
+if XINERAMA
+PANORAMIX_SRCS = $(top_srcdir)/Xext/panoramiX.c
+endif
+
+if GLX
+SUBDIRS += glxProxy
+GLX_LIBS = glxProxy/libglxproxy.a
+GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c
+endif
+
+Xdmx_SOURCES = dmxinit.c \
+	dmxscrinit.c \
+	dmxshadow.c \
+	dmxcursor.c \
+	dmxinput.c \
+	dmxdpms.c \
+	dmxgc.c \
+	dmxgcops.c \
+	dmxwindow.c \
+	dmxpixmap.c \
+	dmxfont.c \
+	dmxcmap.c \
+	dmxvisual.c \
+	dmxlog.c \
+	dmxcb.c \
+	dmxprop.c \
+	dmxstat.c \
+	dmxsync.c \
+	dmxextension.c \
+	miinitext.c \
+	dmxpict.c \
+	libc_wrapper.c \
+	$(GLX_SRCS) 
+
+
+
+if COMPOSITE
+Xdmx_SOURCES += fakecw.c
+endif
+
+miinitext.c: 
+	echo "#include <config.h>" > $@
+	echo "#undef HAVE_CONFIG_H" >> $@
+	echo "#define DMXEXT" >> $@
+	echo "#undef BEZIER " >> $@
+	echo "#undef PEXEXT " >> $@ 
+	echo "#undef MULTIBUFFER  " >> $@
+	echo "#undef XV  " >> $@
+	echo "#undef XIE " >> $@ 
+	echo "#undef DBE " >> $@ 
+	echo "#undef XF86VIDMODE  " >> $@
+	echo "#undef XF86MISC  " >> $@
+	echo "#undef XFreeXDGA " >> $@ 
+	echo "#undef XF86DRI  " >> $@
+	echo "#undef MITSHM  " >> $@
+	echo "#undef TOGCUP  " >> $@
+	echo "#undef DPSEXT  " >> $@
+	echo "#undef MITMISC " >> $@ 
+	echo "#undef SCREENSAVER  " >> $@
+	echo "#undef RANDR  " >> $@
+	echo "#undef XFIXES " >> $@ 
+	echo "#undef DAMAGE " >> $@
+	echo "#undef COMPOSITE " >> $@
+	echo "#undef FONTCACHE " >> $@
+	echo "#undef XFree86LOADER " >> $@
+	echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
+
+DISTCLEANFILES = miinitext.c libc_wrapper.c
+
+libc_wrapper.c:
+	echo "#define SELF_CONTAINED_WRAPPER" > $@
+	echo "#include \"$(top_srcdir)/hw/xorg/os-support/shared/libc_wrapper.c\"" >> $@
+	
+
+Xdmx_LDFLAGS = -rdynamic
+Xdmx_LDADD = $(XORG_CORE_LIBS) $(top_srcdir)/hw/xorg/os-support/@XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.a  \
+	$(XDMX_LIBS) $(GLX_LIBS) $(top_srcdir)/miext/shadow/.libs/libshadow.a $(top_srcdir)/fb/.libs/libfb.a  \
+       $(top_srcdir)/hw/xorg/dummylib/libdummy.a  input/libdmxinput.a \
+       config/libdmxconfig.a -lfl $(XDMCP_LIBS) @DMXMODULES_LIBS@  -lXi
+
+Xdmx_CFLAGS = @DMXMODULES_CFLAGS@