Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

53 files changed, 1609 insertions, 0 deletions

diff --git a/xorg-server/hw/xfree86/xf1bpp/Makefile.am b/xorg-server/hw/xfree86/xf1bpp/Makefile.am
new file mode 100644
index 000000000..c724f760f
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/Makefile.am
@@ -0,0 +1,178 @@
+module_LTLIBRARIES = libxf1bpp.la
+
+sdk_HEADERS = xf1bpp.h mfbmap.h mfbunmap.h
+
+libxf1bpp_la_LDFLAGS = -avoid-version
+
+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
+
+libxf1bppmfb_a_SOURCES = \
+        maskbits.c \
+        mfbbitblt.c \
+        mfbbres.c \
+        mfbbresd.c \
+        mfbclip.c \
+        mfbcmap.c \
+        mfbfillarc.c \
+        mfbfillrct.c \
+        mfbfillsp.c \
+        mfbfont.c \
+        mfbgc.c \
+        mfbgetsp.c \
+        mfbhrzvert.c \
+        mfbimage.c \
+        mfbline.c \
+        mfbmisc.c \
+        mfbpixmap.c \
+        mfbpolypnt.c \
+        mfbpushpxl.c \
+        mfbscrclse.c \
+        mfbscrinit.c \
+        mfbsetsp.c \
+        mfbwindow.c \
+        mfbzerarc.c
+
+BUILT_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES)
+
+libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES) \
+        mfbmodule.c
+
+AM_CFLAGS = -DXF86MONO $(DIX_CFLAGS) $(XORG_CFLAGS)
+INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb
+
+mfbseg.c:
+	echo "#define POLYSEGMENT" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbline.c\"" >> $@
+mfbpgbwht.c:
+	echo "#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltWhite" > $@
+	echo "#define OPEQ |=" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbplygblt.c\"" >> $@
+mfbpgbblak.c:
+	echo "#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltBlack" > $@
+	echo "#define OPEQ &=~" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbplygblt.c\"" >> $@
+mfbpgbinv.c:
+	echo "#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltInvert" > $@
+	echo "#define OPEQ ^=" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbplygblt.c\"" >> $@
+mfbigbwht.c:
+	echo "#define MFBIMAGEGLYPHBLT xf1bppImageGlyphBltWhite" > $@
+	echo "#define OPEQ |=" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbimggblt.c\"" >> $@
+mfbigbblak.c:
+	echo "#define MFBIMAGEGLYPHBLT xf1bppImageGlyphBltBlack" > $@
+	echo "#define OPEQ &=~" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	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 \"mfbmap.h\"" >> $@
+	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 \"mfbmap.h\"" >> $@
+	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 \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbpntarea.c\"" >> $@
+mfbtewhite.c:
+	echo "#define OP" > $@
+	echo "#define CLIPTETEXT xf1bppImageGlyphBltWhite" >> $@
+	echo "#define MFBTEGLYPHBLT xf1bppTEGlyphBltWhite" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbtegblt.c\"" >> $@
+mfbteblack.c:
+	echo "#define OP ~" > $@
+	echo "#define CLIPTETEXT xf1bppImageGlyphBltBlack" >> $@
+	echo "#define MFBTEGLYPHBLT xf1bppTEGlyphBltBlack" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbtegblt.c\"" >> $@
+mfbplywhite.c:
+	echo "#define MFBFILLPOLY1RECT xf1bppFillPolyWhite" > $@
+	echo "#define OPEQ |=" >> $@
+	echo "#define EQWHOLEWORD =~0" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbply1rct.c\"" >> $@
+mfbplyblack.c:
+	echo "#define MFBFILLPOLY1RECT xf1bppFillPolyBlack" > $@
+	echo "#define OPEQ &=~" >> $@
+	echo "#define EQWHOLEWORD =0" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbply1rct.c\"" >> $@
+mfbplyinv.c:
+	echo "#define MFBFILLPOLY1RECT xf1bppFillPolyInvert" > $@
+	echo "#define OPEQ ^=" >> $@
+	echo "#define EQWHOLEWORD ^=~0" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbply1rct.c\"" >> $@
+mfbbltC.c:
+	echo "#define MROP Mcopy" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbbltX.c:
+	echo "#define MROP Mxor" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbbltCI.c:
+	echo "#define MROP McopyInverted" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbbltO.c:
+	echo "#define MROP Mor" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbbltG.c:
+	echo "#define MROP M0" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbtileC.c:
+	echo "#define MROP Mcopy" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbtile.c\"" >> $@
+mfbtileG.c:
+	echo "#define MRop M0" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbtile.c\"" >> $@
+
+$(libxf1bppmfb_a_SOURCES):
+	echo "#include \"mfbmap.h\"" > $@
+	echo "#include \"$(top_srcdir)/mfb/$@\"" >> $@
+
+EXTRA_DIST = mfbmap.sh mfbunmap.sh 
+DISTCLEANFILES = $(BUILT_SOURCES)
diff --git a/xorg-server/hw/xfree86/xf1bpp/Makefile.in b/xorg-server/hw/xfree86/xf1bpp/Makefile.in
new file mode 100644
index 000000000..d57f4e994
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/Makefile.in
@@ -0,0 +1,929 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = hw/xfree86/xf1bpp
+DIST_COMMON = $(sdk_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
+	$(top_builddir)/include/xorg-server.h \
+	$(top_builddir)/include/dix-config.h \
+	$(top_builddir)/include/xgl-config.h \
+	$(top_builddir)/include/xorg-config.h \
+	$(top_builddir)/include/xkb-config.h \
+	$(top_builddir)/include/xwin-config.h \
+	$(top_builddir)/include/kdrive-config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(sdkdir)"
+moduleLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(module_LTLIBRARIES)
+libxf1bpp_la_LIBADD =
+am__objects_1 = maskbits.lo mfbbitblt.lo mfbbres.lo mfbbresd.lo \
+	mfbclip.lo mfbcmap.lo mfbfillarc.lo mfbfillrct.lo mfbfillsp.lo \
+	mfbfont.lo mfbgc.lo mfbgetsp.lo mfbhrzvert.lo mfbimage.lo \
+	mfbline.lo mfbmisc.lo mfbpixmap.lo mfbpolypnt.lo mfbpushpxl.lo \
+	mfbscrclse.lo mfbscrinit.lo mfbsetsp.lo mfbwindow.lo \
+	mfbzerarc.lo
+am__objects_2 = mfbseg.lo mfbpgbwht.lo mfbpgbblak.lo mfbpgbinv.lo \
+	mfbigbwht.lo mfbigbblak.lo mfbpawhite.lo mfbpablack.lo \
+	mfbpainv.lo mfbtewhite.lo mfbteblack.lo mfbplywhite.lo \
+	mfbplyblack.lo mfbplyinv.lo mfbbltC.lo mfbbltX.lo mfbbltCI.lo \
+	mfbbltO.lo mfbbltG.lo mfbtileC.lo mfbtileG.lo
+am_libxf1bpp_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
+	mfbmodule.lo
+libxf1bpp_la_OBJECTS = $(am_libxf1bpp_la_OBJECTS)
+libxf1bpp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libxf1bpp_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libxf1bpp_la_SOURCES)
+DIST_SOURCES = $(libxf1bpp_la_SOURCES)
+sdkHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(sdk_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+APPDEFAULTDIR = @APPDEFAULTDIR@
+APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASE_FONT_PATH = @BASE_FONT_PATH@
+BUILD_DATE = @BUILD_DATE@
+BUILD_TIME = @BUILD_TIME@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DARWIN_LIBS = @DARWIN_LIBS@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+DEFAULT_LIBRARY_PATH = @DEFAULT_LIBRARY_PATH@
+DEFAULT_LOGPREFIX = @DEFAULT_LOGPREFIX@
+DEFAULT_MODULE_PATH = @DEFAULT_MODULE_PATH@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DGA_CFLAGS = @DGA_CFLAGS@
+DGA_LIBS = @DGA_LIBS@
+DIX_CFLAGS = @DIX_CFLAGS@
+DLLTOOL = @DLLTOOL@
+DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
+DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
+DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@
+DMXMODULES_LIBS = @DMXMODULES_LIBS@
+DMXXIEXAMPLES_DEP_CFLAGS = @DMXXIEXAMPLES_DEP_CFLAGS@
+DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
+DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
+DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
+DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
+DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
+DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
+DRIPROTO_LIBS = @DRIPROTO_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DRI_DRIVER_PATH = @DRI_DRIVER_PATH@
+DSYMUTIL = @DSYMUTIL@
+DTRACE = @DTRACE@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
+GLX_DEFINES = @GLX_DEFINES@
+GL_CFLAGS = @GL_CFLAGS@
+GL_LIBS = @GL_LIBS@
+GREP = @GREP@
+HAL_CFLAGS = @HAL_CFLAGS@
+HAL_LIBS = @HAL_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
+KDRIVE_INCS = @KDRIVE_INCS@
+KDRIVE_LIBS = @KDRIVE_LIBS@
+KDRIVE_LOCAL_LIBS = @KDRIVE_LOCAL_LIBS@
+KDRIVE_PURE_INCS = @KDRIVE_PURE_INCS@
+KDRIVE_PURE_LIBS = @KDRIVE_PURE_LIBS@
+LAUNCHD = @LAUNCHD@
+LDFLAGS = @LDFLAGS@
+LD_EXPORT_SYMBOLS_FLAG = @LD_EXPORT_SYMBOLS_FLAG@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
+LIBDRM_LIBS = @LIBDRM_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUXDOC = @LINUXDOC@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MAKE_HTML = @MAKE_HTML@
+MAKE_PDF = @MAKE_PDF@
+MAKE_PS = @MAKE_PS@
+MAKE_TEXT = @MAKE_TEXT@
+MESA_SOURCE = @MESA_SOURCE@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+MKFONTDIR = @MKFONTDIR@
+MKFONTSCALE = @MKFONTSCALE@
+NMEDIT = @NMEDIT@
+OBJC = @OBJC@
+OBJCCLD = @OBJCCLD@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
+OBJCLINK = @OBJCLINK@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
+PCI_TXT_IDS_PATH = @PCI_TXT_IDS_PATH@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PROJECTROOT = @PROJECTROOT@
+PS2PDF = @PS2PDF@
+RANLIB = @RANLIB@
+RAWCPP = @RAWCPP@
+RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
+SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
+SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
+STRIP = @STRIP@
+TSLIB_CFLAGS = @TSLIB_CFLAGS@
+TSLIB_LIBS = @TSLIB_LIBS@
+UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
+VENDOR_MAN_VERSION = @VENDOR_MAN_VERSION@
+VENDOR_NAME = @VENDOR_NAME@
+VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
+VENDOR_RELEASE = @VENDOR_RELEASE@
+VERSION = @VERSION@
+X11APP_ARCHS = @X11APP_ARCHS@
+X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
+X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
+XDMCP_CFLAGS = @XDMCP_CFLAGS@
+XDMCP_LIBS = @XDMCP_LIBS@
+XDMXCONFIG_DEP_CFLAGS = @XDMXCONFIG_DEP_CFLAGS@
+XDMXCONFIG_DEP_LIBS = @XDMXCONFIG_DEP_LIBS@
+XDMX_CFLAGS = @XDMX_CFLAGS@
+XDMX_LIBS = @XDMX_LIBS@
+XDMX_SYS_LIBS = @XDMX_SYS_LIBS@
+XEGLMODULES_CFLAGS = @XEGLMODULES_CFLAGS@
+XEGL_LIBS = @XEGL_LIBS@
+XEGL_SYS_LIBS = @XEGL_SYS_LIBS@
+XEPHYR_CFLAGS = @XEPHYR_CFLAGS@
+XEPHYR_DRI_LIBS = @XEPHYR_DRI_LIBS@
+XEPHYR_INCS = @XEPHYR_INCS@
+XEPHYR_LIBS = @XEPHYR_LIBS@
+XF86CONFIGFILE = @XF86CONFIGFILE@
+XF86MISC_CFLAGS = @XF86MISC_CFLAGS@
+XF86MISC_LIBS = @XF86MISC_LIBS@
+XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@
+XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@
+XGLMODULES_CFLAGS = @XGLMODULES_CFLAGS@
+XGLMODULES_LIBS = @XGLMODULES_LIBS@
+XGLXMODULES_CFLAGS = @XGLXMODULES_CFLAGS@
+XGLXMODULES_LIBS = @XGLXMODULES_LIBS@
+XGLX_LIBS = @XGLX_LIBS@
+XGLX_SYS_LIBS = @XGLX_SYS_LIBS@
+XGL_LIBS = @XGL_LIBS@
+XGL_MODULE_PATH = @XGL_MODULE_PATH@
+XGL_SYS_LIBS = @XGL_SYS_LIBS@
+XKB_BASE_DIRECTORY = @XKB_BASE_DIRECTORY@
+XKB_BIN_DIRECTORY = @XKB_BIN_DIRECTORY@
+XKB_COMPILED_DIR = @XKB_COMPILED_DIR@
+XKM_OUTPUT_DIR = @XKM_OUTPUT_DIR@
+XLIB_CFLAGS = @XLIB_CFLAGS@
+XLIB_LIBS = @XLIB_LIBS@
+XNESTMODULES_CFLAGS = @XNESTMODULES_CFLAGS@
+XNESTMODULES_LIBS = @XNESTMODULES_LIBS@
+XNEST_LIBS = @XNEST_LIBS@
+XNEST_SYS_LIBS = @XNEST_SYS_LIBS@
+XORGCFG_DEP_CFLAGS = @XORGCFG_DEP_CFLAGS@
+XORGCFG_DEP_LIBS = @XORGCFG_DEP_LIBS@
+XORGCONFIG_DEP_CFLAGS = @XORGCONFIG_DEP_CFLAGS@
+XORGCONFIG_DEP_LIBS = @XORGCONFIG_DEP_LIBS@
+XORG_CFLAGS = @XORG_CFLAGS@
+XORG_INCS = @XORG_INCS@
+XORG_LIBS = @XORG_LIBS@
+XORG_MODULES_CFLAGS = @XORG_MODULES_CFLAGS@
+XORG_MODULES_LIBS = @XORG_MODULES_LIBS@
+XORG_OS = @XORG_OS@
+XORG_OS_SUBDIR = @XORG_OS_SUBDIR@
+XORG_SYS_LIBS = @XORG_SYS_LIBS@
+XPRINTMODULES_CFLAGS = @XPRINTMODULES_CFLAGS@
+XPRINTMODULES_LIBS = @XPRINTMODULES_LIBS@
+XPRINTPROTO_CFLAGS = @XPRINTPROTO_CFLAGS@
+XPRINTPROTO_LIBS = @XPRINTPROTO_LIBS@
+XPRINT_CFLAGS = @XPRINT_CFLAGS@
+XPRINT_LIBS = @XPRINT_LIBS@
+XPRINT_SYS_LIBS = @XPRINT_SYS_LIBS@
+XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
+XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
+XSDL_INCS = @XSDL_INCS@
+XSDL_LIBS = @XSDL_LIBS@
+XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
+XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
+XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
+XSERVERLIBS_LIBS = @XSERVERLIBS_LIBS@
+XSERVER_LIBS = @XSERVER_LIBS@
+XSERVER_SYS_LIBS = @XSERVER_SYS_LIBS@
+XTSTEXAMPLES_DEP_CFLAGS = @XTSTEXAMPLES_DEP_CFLAGS@
+XTSTEXAMPLES_DEP_LIBS = @XTSTEXAMPLES_DEP_LIBS@
+XVFB_LIBS = @XVFB_LIBS@
+XVFB_SYS_LIBS = @XVFB_SYS_LIBS@
+XWINMODULES_CFLAGS = @XWINMODULES_CFLAGS@
+XWINMODULES_LIBS = @XWINMODULES_LIBS@
+XWIN_LIBS = @XWIN_LIBS@
+XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
+XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+__XCONFIGFILE__ = @__XCONFIGFILE__@
+abi_ansic = @abi_ansic@
+abi_extension = @abi_extension@
+abi_font = @abi_font@
+abi_videodrv = @abi_videodrv@
+abi_xinput = @abi_xinput@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+driverdir = @driverdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+extdir = @extdir@
+ft_config = @ft_config@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+launchagentsdir = @launchagentsdir@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sdkdir = @sdkdir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xglmoduledir = @xglmoduledir@
+xpconfigdir = @xpconfigdir@
+module_LTLIBRARIES = libxf1bpp.la
+sdk_HEADERS = xf1bpp.h mfbmap.h mfbunmap.h
+libxf1bpp_la_LDFLAGS = -avoid-version
+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
+
+libxf1bppmfb_a_SOURCES = \
+        maskbits.c \
+        mfbbitblt.c \
+        mfbbres.c \
+        mfbbresd.c \
+        mfbclip.c \
+        mfbcmap.c \
+        mfbfillarc.c \
+        mfbfillrct.c \
+        mfbfillsp.c \
+        mfbfont.c \
+        mfbgc.c \
+        mfbgetsp.c \
+        mfbhrzvert.c \
+        mfbimage.c \
+        mfbline.c \
+        mfbmisc.c \
+        mfbpixmap.c \
+        mfbpolypnt.c \
+        mfbpushpxl.c \
+        mfbscrclse.c \
+        mfbscrinit.c \
+        mfbsetsp.c \
+        mfbwindow.c \
+        mfbzerarc.c
+
+BUILT_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES)
+libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES) \
+        mfbmodule.c
+
+AM_CFLAGS = -DXF86MONO $(DIX_CFLAGS) $(XORG_CFLAGS)
+INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb
+EXTRA_DIST = mfbmap.sh mfbunmap.sh 
+DISTCLEANFILES = $(BUILT_SOURCES)
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  hw/xfree86/xf1bpp/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  hw/xfree86/xf1bpp/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+	@list='$(module_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-moduleLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(module_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \
+	done
+
+clean-moduleLTLIBRARIES:
+	-test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES)
+	@list='$(module_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libxf1bpp.la: $(libxf1bpp_la_OBJECTS) $(libxf1bpp_la_DEPENDENCIES) 
+	$(libxf1bpp_la_LINK) -rpath $(moduledir) $(libxf1bpp_la_OBJECTS) $(libxf1bpp_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maskbits.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbbitblt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbbltC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbbltCI.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbbltG.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbbltO.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbbltX.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbbres.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbbresd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbclip.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbcmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbfillarc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbfillrct.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbfillsp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbfont.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbgc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbgetsp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbhrzvert.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbigbblak.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbigbwht.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbimage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbline.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbmisc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbmodule.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbpablack.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbpainv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbpawhite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbpgbblak.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbpgbinv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbpgbwht.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbpixmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbplyblack.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbplyinv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbplywhite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbpolypnt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbpushpxl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbscrclse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbscrinit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbseg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbsetsp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbteblack.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbtewhite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbtileC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbtileG.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbwindow.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfbzerarc.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-sdkHEADERS: $(sdk_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(sdkdir)" || $(MKDIR_P) "$(DESTDIR)$(sdkdir)"
+	@list='$(sdk_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(sdkHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(sdkdir)/$$f'"; \
+	  $(sdkHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(sdkdir)/$$f"; \
+	done
+
+uninstall-sdkHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sdk_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(sdkdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sdkdir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(sdkdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-moduleLTLIBRARIES install-sdkHEADERS
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-moduleLTLIBRARIES uninstall-sdkHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-moduleLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-moduleLTLIBRARIES install-pdf install-pdf-am \
+	install-ps install-ps-am install-sdkHEADERS install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-moduleLTLIBRARIES \
+	uninstall-sdkHEADERS
+
+
+mfbseg.c:
+	echo "#define POLYSEGMENT" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbline.c\"" >> $@
+mfbpgbwht.c:
+	echo "#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltWhite" > $@
+	echo "#define OPEQ |=" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbplygblt.c\"" >> $@
+mfbpgbblak.c:
+	echo "#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltBlack" > $@
+	echo "#define OPEQ &=~" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbplygblt.c\"" >> $@
+mfbpgbinv.c:
+	echo "#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltInvert" > $@
+	echo "#define OPEQ ^=" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbplygblt.c\"" >> $@
+mfbigbwht.c:
+	echo "#define MFBIMAGEGLYPHBLT xf1bppImageGlyphBltWhite" > $@
+	echo "#define OPEQ |=" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbimggblt.c\"" >> $@
+mfbigbblak.c:
+	echo "#define MFBIMAGEGLYPHBLT xf1bppImageGlyphBltBlack" > $@
+	echo "#define OPEQ &=~" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	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 \"mfbmap.h\"" >> $@
+	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 \"mfbmap.h\"" >> $@
+	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 \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbpntarea.c\"" >> $@
+mfbtewhite.c:
+	echo "#define OP" > $@
+	echo "#define CLIPTETEXT xf1bppImageGlyphBltWhite" >> $@
+	echo "#define MFBTEGLYPHBLT xf1bppTEGlyphBltWhite" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbtegblt.c\"" >> $@
+mfbteblack.c:
+	echo "#define OP ~" > $@
+	echo "#define CLIPTETEXT xf1bppImageGlyphBltBlack" >> $@
+	echo "#define MFBTEGLYPHBLT xf1bppTEGlyphBltBlack" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbtegblt.c\"" >> $@
+mfbplywhite.c:
+	echo "#define MFBFILLPOLY1RECT xf1bppFillPolyWhite" > $@
+	echo "#define OPEQ |=" >> $@
+	echo "#define EQWHOLEWORD =~0" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbply1rct.c\"" >> $@
+mfbplyblack.c:
+	echo "#define MFBFILLPOLY1RECT xf1bppFillPolyBlack" > $@
+	echo "#define OPEQ &=~" >> $@
+	echo "#define EQWHOLEWORD =0" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbply1rct.c\"" >> $@
+mfbplyinv.c:
+	echo "#define MFBFILLPOLY1RECT xf1bppFillPolyInvert" > $@
+	echo "#define OPEQ ^=" >> $@
+	echo "#define EQWHOLEWORD ^=~0" >> $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbply1rct.c\"" >> $@
+mfbbltC.c:
+	echo "#define MROP Mcopy" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbbltX.c:
+	echo "#define MROP Mxor" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbbltCI.c:
+	echo "#define MROP McopyInverted" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbbltO.c:
+	echo "#define MROP Mor" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbbltG.c:
+	echo "#define MROP M0" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbtileC.c:
+	echo "#define MROP Mcopy" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbtile.c\"" >> $@
+mfbtileG.c:
+	echo "#define MRop M0" > $@
+	echo "#include \"mfbmap.h\"" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbtile.c\"" >> $@
+
+$(libxf1bppmfb_a_SOURCES):
+	echo "#include \"mfbmap.h\"" > $@
+	echo "#include \"$(top_srcdir)/mfb/$@\"" >> $@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/hw/xfree86/xf1bpp/maskbits.c b/xorg-server/hw/xfree86/xf1bpp/maskbits.c
new file mode 100644
index 000000000..a8869b2fd
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/maskbits.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/maskbits.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbbitblt.c b/xorg-server/hw/xfree86/xf1bpp/mfbbitblt.c
new file mode 100644
index 000000000..dd41a79f4
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbbitblt.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbbitblt.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbbltC.c b/xorg-server/hw/xfree86/xf1bpp/mfbbltC.c
new file mode 100644
index 000000000..83c9066c6
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbbltC.c
@@ -0,0 +1,3 @@
+#define MROP Mcopy
+#include "mfbmap.h"
+#include "../../../mfb/mfbblt.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbbltCI.c b/xorg-server/hw/xfree86/xf1bpp/mfbbltCI.c
new file mode 100644
index 000000000..c436d1533
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbbltCI.c
@@ -0,0 +1,3 @@
+#define MROP McopyInverted
+#include "mfbmap.h"
+#include "../../../mfb/mfbblt.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbbltG.c b/xorg-server/hw/xfree86/xf1bpp/mfbbltG.c
new file mode 100644
index 000000000..8ecd93835
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbbltG.c
@@ -0,0 +1,3 @@
+#define MROP M0
+#include "mfbmap.h"
+#include "../../../mfb/mfbblt.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbbltO.c b/xorg-server/hw/xfree86/xf1bpp/mfbbltO.c
new file mode 100644
index 000000000..2e463a993
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbbltO.c
@@ -0,0 +1,3 @@
+#define MROP Mor
+#include "mfbmap.h"
+#include "../../../mfb/mfbblt.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbbltX.c b/xorg-server/hw/xfree86/xf1bpp/mfbbltX.c
new file mode 100644
index 000000000..2c26467c0
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbbltX.c
@@ -0,0 +1,3 @@
+#define MROP Mxor
+#include "mfbmap.h"
+#include "../../../mfb/mfbblt.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbbres.c b/xorg-server/hw/xfree86/xf1bpp/mfbbres.c
new file mode 100644
index 000000000..3ff1187b2
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbbres.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbbres.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbbresd.c b/xorg-server/hw/xfree86/xf1bpp/mfbbresd.c
new file mode 100644
index 000000000..b745fb6bc
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbbresd.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbbresd.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbclip.c b/xorg-server/hw/xfree86/xf1bpp/mfbclip.c
new file mode 100644
index 000000000..2fadd7682
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbclip.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbclip.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbcmap.c b/xorg-server/hw/xfree86/xf1bpp/mfbcmap.c
new file mode 100644
index 000000000..5255927a2
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbcmap.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbcmap.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbfillarc.c b/xorg-server/hw/xfree86/xf1bpp/mfbfillarc.c
new file mode 100644
index 000000000..8d7cca2ba
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbfillarc.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbfillarc.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbfillrct.c b/xorg-server/hw/xfree86/xf1bpp/mfbfillrct.c
new file mode 100644
index 000000000..2ec87f4b2
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbfillrct.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbfillrct.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbfillsp.c b/xorg-server/hw/xfree86/xf1bpp/mfbfillsp.c
new file mode 100644
index 000000000..9c89144e8
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbfillsp.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbfillsp.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbfont.c b/xorg-server/hw/xfree86/xf1bpp/mfbfont.c
new file mode 100644
index 000000000..d3201a145
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbfont.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbfont.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbgc.c b/xorg-server/hw/xfree86/xf1bpp/mfbgc.c
new file mode 100644
index 000000000..f17eec900
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbgc.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbgc.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbgetsp.c b/xorg-server/hw/xfree86/xf1bpp/mfbgetsp.c
new file mode 100644
index 000000000..3638cb85a
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbgetsp.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbgetsp.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbhrzvert.c b/xorg-server/hw/xfree86/xf1bpp/mfbhrzvert.c
new file mode 100644
index 000000000..0b76abfee
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbhrzvert.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbhrzvert.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbigbblak.c b/xorg-server/hw/xfree86/xf1bpp/mfbigbblak.c
new file mode 100644
index 000000000..628631d53
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbigbblak.c
@@ -0,0 +1,4 @@
+#define MFBIMAGEGLYPHBLT xf1bppImageGlyphBltBlack
+#define OPEQ &=~
+#include "mfbmap.h"
+#include "../../../mfb/mfbimggblt.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbigbwht.c b/xorg-server/hw/xfree86/xf1bpp/mfbigbwht.c
new file mode 100644
index 000000000..c35f241bc
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbigbwht.c
@@ -0,0 +1,4 @@
+#define MFBIMAGEGLYPHBLT xf1bppImageGlyphBltWhite
+#define OPEQ |=
+#include "mfbmap.h"
+#include "../../../mfb/mfbimggblt.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbimage.c b/xorg-server/hw/xfree86/xf1bpp/mfbimage.c
new file mode 100644
index 000000000..cd43fe076
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbimage.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbimage.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbline.c b/xorg-server/hw/xfree86/xf1bpp/mfbline.c
new file mode 100644
index 000000000..dccff150f
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbline.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbline.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbmap.h b/xorg-server/hw/xfree86/xf1bpp/mfbmap.h
new file mode 100644
index 000000000..e330ebd5b
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbmap.h
@@ -0,0 +1,122 @@
+
+#ifndef _MFBMAP_H
+#define _MFBMAP_H
+
+#define InverseAlu  xf1bppInverseAlu
+#define endtab  xf1bppendtab
+#define mask  xf1bppmask
+#define mergeRopBits  xf1bppmergeRopBits
+#define mergeGetRopBits  xf1bppmergeGetRopBits
+#define mfbAllocatePrivates  xf1bppAllocatePrivates
+#define mfbBSFuncRec  xf1bppBSFuncRec
+#define mfbBlackSolidFS  xf1bppBlackSolidFS
+#define mfbBlackStippleFS  xf1bppBlackStippleFS
+#define mfbBresD  xf1bppBresD
+#define mfbBresS  xf1bppBresS
+#define mfbChangeWindowAttributes  xf1bppChangeWindowAttributes
+#define mfbCloseScreen  xf1bppCloseScreen
+#define mfbCopyArea  xf1bppCopyArea
+#define mfbCopyPixmap  xf1bppCopyPixmap
+#define mfbCopyPlane  xf1bppCopyPlane
+#define mfbCopyRotatePixmap  xf1bppCopyRotatePixmap
+#define mfbCopyWindow  xf1bppCopyWindow
+#define mfbCreateColormap  xf1bppCreateColormap
+#define mfbCreateDefColormap  xf1bppCreateDefColormap
+#define mfbCreateGC  xf1bppCreateGC
+#define mfbCreatePixmap  xf1bppCreatePixmap
+#define mfbCreateWindow  xf1bppCreateWindow
+#define mfbDestroyColormap  xf1bppDestroyColormap
+#define mfbDestroyPixmap  xf1bppDestroyPixmap
+#define mfbDestroyWindow  xf1bppDestroyWindow
+#define mfbDoBitblt  xf1bppDoBitblt
+#define mfbDoBitbltCopy  xf1bppDoBitbltCopy
+#define mfbDoBitbltCopyInverted  xf1bppDoBitbltCopyInverted
+#define mfbDoBitbltGeneral  xf1bppDoBitbltGeneral
+#define mfbDoBitbltOr  xf1bppDoBitbltOr
+#define mfbDoBitbltXor  xf1bppDoBitbltXor
+#define mfbFillInScreen  xf1bppFillInScreen
+#define mfbFillPolyBlack  xf1bppFillPolyBlack
+#define mfbFillPolyInvert  xf1bppFillPolyInvert
+#define mfbFillPolyWhite  xf1bppFillPolyWhite
+#define mfbGCPrivateIndex  xf1bppGCPrivateIndex
+#define mfbGetGCPrivateIndex  xf1bppGetGCPrivateIndex
+#define mfbGetImage  xf1bppGetImage
+#define mfbGetInverseAlu xf1bppGetInverseAlu
+#define mfbGetSpans  xf1bppGetSpans
+#define mfbGetWindowPixmap  xf1bppGetWindowPixmap
+#define mfbGetWindowPrivateIndex  xf1bppGetWindowPrivateIndex
+#define mfbGetmask  xf1bppGetmask
+#define mfbGetpartmasks xf1bppGetpartmasks
+#define mfbGetrmask  xf1bppGetrmask
+#define mfbGetstarttab  xf1bppGetstarttab
+#define mfbGetendtab  xf1bppGetendtab
+#define mfbHorzS  xf1bppHorzS
+#define mfbImageGlyphBltBlack  xf1bppImageGlyphBltBlack
+#define mfbImageGlyphBltWhite  xf1bppImageGlyphBltWhite
+#define mfbInstallColormap  xf1bppInstallColormap
+#define mfbInvertSolidFS  xf1bppInvertSolidFS
+#define mfbInvertStippleFS  xf1bppInvertStippleFS
+#define mfbLineSD  xf1bppLineSD
+#define mfbLineSS  xf1bppLineSS
+#define mfbListInstalledColormaps  xf1bppListInstalledColormaps
+#define mfbMapWindow  xf1bppMapWindow
+#define mfbPadPixmap  xf1bppPadPixmap
+#define mfbPixmapToRegion  xf1bppPixmapToRegion
+#define mfbPixmapToRegionWeak xf1bppPixmapToRegionWeak
+#define mfbPolyFillArcSolid  xf1bppPolyFillArcSolid
+#define mfbPolyFillRect  xf1bppPolyFillRect
+#define mfbPolyGlyphBltBlack  xf1bppPolyGlyphBltBlack
+#define mfbPolyGlyphBltInvert  xf1bppPolyGlyphBltInvert
+#define mfbPolyGlyphBltWhite  xf1bppPolyGlyphBltWhite
+#define mfbPolyPoint  xf1bppPolyPoint
+#define mfbPositionWindow  xf1bppPositionWindow
+#define mfbPushPixels  xf1bppPushPixels
+#define mfbPushPixelsWeak  xf1bppPushPixelsWeak
+#define mfbPutImage  xf1bppPutImage
+#define mfbQueryBestSize  xf1bppQueryBestSize
+#define mfbQueryBestSizeWeak  xf1bppQueryBestSizeWeak
+#define mfbRealizeFont  xf1bppRealizeFont
+#define mfbRealizeFontWeak  xf1bppRealizeFontWeak
+#define mfbReduceRop  xf1bppReduceRop
+#define mfbRegisterCopyPlaneProc  xf1bppRegisterCopyPlaneProc
+#define mfbResolveColor  xf1bppResolveColor
+#define mfbRestoreAreas  xf1bppRestoreAreas
+#define mfbSaveAreas  xf1bppSaveAreas
+#define mfbScreenInit  xf1bppScreenInit
+#define mfbSegmentSD  xf1bppSegmentSD
+#define mfbSegmentSS  xf1bppSegmentSS
+#define mfbSetScanline  xf1bppSetScanline
+#define mfbSetSpans  xf1bppSetSpans
+#define mfbSetWindowPixmap  xf1bppSetWindowPixmap
+#define mfbSolidBlackArea  xf1bppSolidBlackArea
+#define mfbSolidInvertArea  xf1bppSolidInvertArea
+#define mfbSolidPP  xf1bppSolidPP
+#define mfbSolidWhiteArea  xf1bppSolidWhiteArea
+#define mfbStippleBlackArea  xf1bppStippleBlackArea
+#define mfbStippleInvertArea  xf1bppStippleInvertArea
+#define mfbStippleWhiteArea  xf1bppStippleWhiteArea
+#define mfbTEGlyphBltBlack  xf1bppTEGlyphBltBlack
+#define mfbTEGlyphBltWhite  xf1bppTEGlyphBltWhite
+#define mfbTileAreaPPW  xf1bppTileAreaPPW
+#define mfbTileAreaPPWCopy  xf1bppTileAreaPPWCopy
+#define mfbTileAreaPPWGeneral  xf1bppTileAreaPPWGeneral
+#define mfbTileFS  xf1bppTileFS
+#define mfbUninstallColormap  xf1bppUninstallColormap
+#define mfbUnmapWindow  xf1bppUnmapWindow
+#define mfbUnnaturalStippleFS  xf1bppUnnaturalStippleFS
+#define mfbUnnaturalTileFS  xf1bppUnnaturalTileFS
+#define mfbUnrealizeFont  xf1bppUnrealizeFont
+#define mfbUnrealizeFontWeak  xf1bppUnrealizeFontWeak
+#define mfbValidateGC  xf1bppValidateGC
+#define mfbVertS  xf1bppVertS
+#define mfbWhiteSolidFS  xf1bppWhiteSolidFS
+#define mfbWhiteStippleFS  xf1bppWhiteStippleFS
+#define mfbWindowPrivateIndex  xf1bppWindowPrivateIndex
+#define mfbXRotatePixmap  xf1bppXRotatePixmap
+#define mfbYRotatePixmap  xf1bppYRotatePixmap
+#define mfbZeroPolyArcSS  xf1bppZeroPolyArcSS
+#define partmasks  xf1bpppartmasks
+#define rmask  xf1bpprmask
+#define starttab  xf1bppstarttab
+
+#endif
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbmap.sh b/xorg-server/hw/xfree86/xf1bpp/mfbmap.sh
new file mode 100644
index 000000000..514040776
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbmap.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.sh,v 1.1.2.3 1998/06/27 14:48:23 dawes Exp $
+#
+# This script recreates the mapping list that maps the mfb external
+#  symbols * to xf1bpp* (without "mfb")
+# This should only be rerun if there have been changes in the mfb code
+#  that affect the external symbols.
+#  It assumes that Xserver/mfb has been compiled.
+# The output goes to stdout.
+echo ""
+echo "#ifndef _MFBMAP_H"
+echo "#define _MFBMAP_H"
+echo ""
+
+nm ../../../mfb/*.o | \
+awk "{ if ((\$2 == \"D\") || (\$2 == \"T\") || (\$2 == \"C\")) print \$3 }" | \
+sed s/^_// | \
+grep -v "ModuleInit$" | \
+sort | \
+awk "{ print \"#define \" \$1 \" xf1bpp\"\$1 }" | \
+sed s/xf1bppmfb/xf1bpp/
+
+echo ""
+echo "#endif"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbmisc.c b/xorg-server/hw/xfree86/xf1bpp/mfbmisc.c
new file mode 100644
index 000000000..0c0ddb851
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbmisc.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbmisc.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbmodule.c b/xorg-server/hw/xfree86/xf1bpp/mfbmodule.c
new file mode 100644
index 000000000..ccd3572e5
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbmodule.c
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 1997 The XFree86 Project, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the XFree86 Project shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from the
+ * XFree86 Project.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Module.h"
+
+static XF86ModuleVersionInfo VersRec =
+{
+        "xf1bpp",
+        MODULEVENDORSTRING,
+        MODINFOSTRING1,
+        MODINFOSTRING2,
+        XORG_VERSION_CURRENT,
+        1, 0, 0,
+        ABI_CLASS_ANSIC,        /* Only need ansic layer */
+        ABI_ANSIC_VERSION,
+        MOD_CLASS_NONE,
+        {0,0,0,0}       /* signature, to be patched into the file by a tool */
+};
+
+_X_EXPORT XF86ModuleData xf1bppModuleData = { &VersRec, NULL, NULL };
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbpablack.c b/xorg-server/hw/xfree86/xf1bpp/mfbpablack.c
new file mode 100644
index 000000000..90aa7faf1
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbpablack.c
@@ -0,0 +1,6 @@
+#define MFBSOLIDFILLAREA xf1bppSolidBlackArea
+#define MFBSTIPPLEFILLAREA xf1bppStippleBlackArea
+#define OPEQ &=~
+#define EQWHOLEWORD =0
+#include "mfbmap.h"
+#include "../../../mfb/mfbpntarea.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbpainv.c b/xorg-server/hw/xfree86/xf1bpp/mfbpainv.c
new file mode 100644
index 000000000..fdbe7978a
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbpainv.c
@@ -0,0 +1,6 @@
+#define MFBSOLIDFILLAREA xf1bppSolidInvertArea
+#define MFBSTIPPLEFILLAREA xf1bppStippleInvertArea
+#define OPEQ ^=
+#define EQWHOLEWORD ^=~0
+#include "mfbmap.h"
+#include "../../../mfb/mfbpntarea.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbpawhite.c b/xorg-server/hw/xfree86/xf1bpp/mfbpawhite.c
new file mode 100644
index 000000000..5b5ccc93b
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbpawhite.c
@@ -0,0 +1,6 @@
+#define MFBSOLIDFILLAREA xf1bppSolidWhiteArea
+#define MFBSTIPPLEFILLAREA xf1bppStippleWhiteArea
+#define OPEQ |=
+#define EQWHOLEWORD =~0
+#include "mfbmap.h"
+#include "../../../mfb/mfbpntarea.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbpgbblak.c b/xorg-server/hw/xfree86/xf1bpp/mfbpgbblak.c
new file mode 100644
index 000000000..d6451a962
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbpgbblak.c
@@ -0,0 +1,4 @@
+#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltBlack
+#define OPEQ &=~
+#include "mfbmap.h"
+#include "../../../mfb/mfbplygblt.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbpgbinv.c b/xorg-server/hw/xfree86/xf1bpp/mfbpgbinv.c
new file mode 100644
index 000000000..52b35a507
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbpgbinv.c
@@ -0,0 +1,4 @@
+#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltInvert
+#define OPEQ ^=
+#include "mfbmap.h"
+#include "../../../mfb/mfbplygblt.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbpgbwht.c b/xorg-server/hw/xfree86/xf1bpp/mfbpgbwht.c
new file mode 100644
index 000000000..bd4d2f7c1
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbpgbwht.c
@@ -0,0 +1,4 @@
+#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltWhite
+#define OPEQ |=
+#include "mfbmap.h"
+#include "../../../mfb/mfbplygblt.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbpixmap.c b/xorg-server/hw/xfree86/xf1bpp/mfbpixmap.c
new file mode 100644
index 000000000..11c51c623
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbpixmap.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbpixmap.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbplyblack.c b/xorg-server/hw/xfree86/xf1bpp/mfbplyblack.c
new file mode 100644
index 000000000..f06f0dcf3
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbplyblack.c
@@ -0,0 +1,5 @@
+#define MFBFILLPOLY1RECT xf1bppFillPolyBlack
+#define OPEQ &=~
+#define EQWHOLEWORD =0
+#include "mfbmap.h"
+#include "../../../mfb/mfbply1rct.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbplyinv.c b/xorg-server/hw/xfree86/xf1bpp/mfbplyinv.c
new file mode 100644
index 000000000..9937d076d
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbplyinv.c
@@ -0,0 +1,5 @@
+#define MFBFILLPOLY1RECT xf1bppFillPolyInvert
+#define OPEQ ^=
+#define EQWHOLEWORD ^=~0
+#include "mfbmap.h"
+#include "../../../mfb/mfbply1rct.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbplywhite.c b/xorg-server/hw/xfree86/xf1bpp/mfbplywhite.c
new file mode 100644
index 000000000..13560dfaa
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbplywhite.c
@@ -0,0 +1,5 @@
+#define MFBFILLPOLY1RECT xf1bppFillPolyWhite
+#define OPEQ |=
+#define EQWHOLEWORD =~0
+#include "mfbmap.h"
+#include "../../../mfb/mfbply1rct.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbpolypnt.c b/xorg-server/hw/xfree86/xf1bpp/mfbpolypnt.c
new file mode 100644
index 000000000..0e45a3db6
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbpolypnt.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbpolypnt.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbpushpxl.c b/xorg-server/hw/xfree86/xf1bpp/mfbpushpxl.c
new file mode 100644
index 000000000..c03505454
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbpushpxl.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbpushpxl.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbscrclse.c b/xorg-server/hw/xfree86/xf1bpp/mfbscrclse.c
new file mode 100644
index 000000000..d4aee1bfc
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbscrclse.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbscrclse.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbscrinit.c b/xorg-server/hw/xfree86/xf1bpp/mfbscrinit.c
new file mode 100644
index 000000000..50b3889ce
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbscrinit.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbscrinit.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbseg.c b/xorg-server/hw/xfree86/xf1bpp/mfbseg.c
new file mode 100644
index 000000000..b0bfd735f
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbseg.c
@@ -0,0 +1,3 @@
+#define POLYSEGMENT
+#include "mfbmap.h"
+#include "../../../mfb/mfbline.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbsetsp.c b/xorg-server/hw/xfree86/xf1bpp/mfbsetsp.c
new file mode 100644
index 000000000..4a16db9f3
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbsetsp.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbsetsp.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbteblack.c b/xorg-server/hw/xfree86/xf1bpp/mfbteblack.c
new file mode 100644
index 000000000..32568b2ed
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbteblack.c
@@ -0,0 +1,5 @@
+#define OP ~
+#define CLIPTETEXT xf1bppImageGlyphBltBlack
+#define MFBTEGLYPHBLT xf1bppTEGlyphBltBlack
+#include "mfbmap.h"
+#include "../../../mfb/mfbtegblt.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbtewhite.c b/xorg-server/hw/xfree86/xf1bpp/mfbtewhite.c
new file mode 100644
index 000000000..16c83f779
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbtewhite.c
@@ -0,0 +1,5 @@
+#define OP
+#define CLIPTETEXT xf1bppImageGlyphBltWhite
+#define MFBTEGLYPHBLT xf1bppTEGlyphBltWhite
+#include "mfbmap.h"
+#include "../../../mfb/mfbtegblt.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbtileC.c b/xorg-server/hw/xfree86/xf1bpp/mfbtileC.c
new file mode 100644
index 000000000..60c0e4069
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbtileC.c
@@ -0,0 +1,3 @@
+#define MROP Mcopy
+#include "mfbmap.h"
+#include "../../../mfb/mfbtile.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbtileG.c b/xorg-server/hw/xfree86/xf1bpp/mfbtileG.c
new file mode 100644
index 000000000..20764136d
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbtileG.c
@@ -0,0 +1,3 @@
+#define MRop M0
+#include "mfbmap.h"
+#include "../../../mfb/mfbtile.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbunmap.h b/xorg-server/hw/xfree86/xf1bpp/mfbunmap.h
new file mode 100644
index 000000000..56b734bcd
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbunmap.h
@@ -0,0 +1,114 @@
+
+#ifdef _MFBMAP_H
+#undef _MFBMAP_H
+
+#undef InverseAlu
+#undef endtab
+#undef mask
+#undef mergeRopBits
+#undef mergeGetRopBits
+#undef mfbAllocatePrivates
+#undef mfbBSFuncRec
+#undef mfbBlackSolidFS
+#undef mfbBlackStippleFS
+#undef mfbBresD
+#undef mfbBresS
+#undef mfbChangeWindowAttributes
+#undef mfbCloseScreen
+#undef mfbCopyArea
+#undef mfbCopyPixmap
+#undef mfbCopyPlane
+#undef mfbCopyRotatePixmap
+#undef mfbCopyWindow
+#undef mfbCreateColormap
+#undef mfbCreateDefColormap
+#undef mfbCreateGC
+#undef mfbCreatePixmap
+#undef mfbCreateWindow
+#undef mfbDestroyColormap
+#undef mfbDestroyPixmap
+#undef mfbDestroyWindow
+#undef mfbDoBitblt
+#undef mfbDoBitbltCopy
+#undef mfbDoBitbltCopyInverted
+#undef mfbDoBitbltGeneral
+#undef mfbDoBitbltOr
+#undef mfbDoBitbltXor
+#undef mfbFillPolyBlack
+#undef mfbFillPolyInvert
+#undef mfbFillPolyWhite
+#undef mfbGCPrivateIndex
+#undef mfbGetImage
+#undef mfbGetInverseAlu
+#undef mfbGetSpans
+#undef mfbGetWindowPixmap
+#undef mfbHorzS
+#undef mfbImageGlyphBltBlack
+#undef mfbImageGlyphBltWhite
+#undef mfbInstallColormap
+#undef mfbInvertSolidFS
+#undef mfbInvertStippleFS
+#undef mfbLineSD
+#undef mfbLineSS
+#undef mfbListInstalledColormaps
+#undef mfbMapWindow
+#undef mfbPadPixmap
+#undef mfbPixmapToRegion
+#undef mfbPixmapToRegionWeak
+#undef mfbPolyFillArcSolid
+#undef mfbPolyFillRect
+#undef mfbPolyGlyphBltBlack
+#undef mfbPolyGlyphBltInvert
+#undef mfbPolyGlyphBltWhite
+#undef mfbPolyPoint
+#undef mfbPositionWindow
+#undef mfbPushPixels
+#undef mfbPushPixelsWeak
+#undef mfbPutImage
+#undef mfbQueryBestSize
+#undef mfbQueryBestSizeWeak
+#undef mfbRealizeFont
+#undef mfbRealizeFontWeak
+#undef mfbReduceRop
+#undef mfbRegisterCopyPlaneProc
+#undef mfbResolveColor
+#undef mfbRestoreAreas
+#undef mfbSaveAreas
+#undef mfbScreenInit
+#undef mfbSegmentSD
+#undef mfbSegmentSS
+#undef mfbSetScanline
+#undef mfbSetSpans
+#undef mfbSetWindowPixmap
+#undef mfbSolidBlackArea
+#undef mfbSolidInvertArea
+#undef mfbSolidPP
+#undef mfbSolidWhiteArea
+#undef mfbStippleBlackArea
+#undef mfbStippleInvertArea
+#undef mfbStippleWhiteArea
+#undef mfbTEGlyphBltBlack
+#undef mfbTEGlyphBltWhite
+#undef mfbTileAreaPPW
+#undef mfbTileAreaPPWCopy
+#undef mfbTileAreaPPWGeneral
+#undef mfbTileFS
+#undef mfbUninstallColormap
+#undef mfbUnmapWindow
+#undef mfbUnnaturalStippleFS
+#undef mfbUnnaturalTileFS
+#undef mfbUnrealizeFont
+#undef mfbUnrealizeFontWeak
+#undef mfbValidateGC
+#undef mfbVertS
+#undef mfbWhiteSolidFS
+#undef mfbWhiteStippleFS
+#undef mfbWindowPrivateIndex
+#undef mfbXRotatePixmap
+#undef mfbYRotatePixmap
+#undef mfbZeroPolyArcSS
+#undef partmasks
+#undef rmask
+#undef starttab
+
+#endif
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbunmap.sh b/xorg-server/hw/xfree86/xf1bpp/mfbunmap.sh
new file mode 100644
index 000000000..44dc781fc
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbunmap.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.sh,v 1.1.2.1 1998/06/27 14:48:24 dawes Exp $
+#
+# This script recreates a header that undoes the effect of mfbmap.h
+# This should only be rerun if there have been changes in the mfb code
+#  that affect the external symbols.
+#  It assumes that Xserver/mfb has been compiled.
+# The output goes to stdout.
+echo ""
+echo "#ifdef _MFBMAP_H"
+echo "#undef _MFBMAP_H"
+echo ""
+
+nm ../../../mfb/*.o | \
+awk "{ if ((\$2 == \"D\") || (\$2 == \"T\") || (\$2 == \"C\")) print \$3 }" | \
+sed s/^_// | \
+grep -v "ModuleInit$" | \
+sort | \
+awk "{ print \"#undef \" \$1 }"
+
+echo ""
+echo "#endif"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbwindow.c b/xorg-server/hw/xfree86/xf1bpp/mfbwindow.c
new file mode 100644
index 000000000..e16082559
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbwindow.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbwindow.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/mfbzerarc.c b/xorg-server/hw/xfree86/xf1bpp/mfbzerarc.c
new file mode 100644
index 000000000..01f2a5446
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/mfbzerarc.c
@@ -0,0 +1,2 @@
+#include "mfbmap.h"
+#include "../../../mfb/mfbzerarc.c"
diff --git a/xorg-server/hw/xfree86/xf1bpp/xf1bpp.h b/xorg-server/hw/xfree86/xf1bpp/xf1bpp.h
new file mode 100644
index 000000000..33e5818c3
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf1bpp/xf1bpp.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 1994-1998 The XFree86 Project, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the XFree86 Project shall
+ * not be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from the
+ * XFree86 Project.
+ */
+
+#ifndef __XF1BPP_H__
+#define __XF1BPP_H__
+
+#define MFB_PROTOTYPES_ONLY
+#include "mfbmap.h"
+#include "mfb.h"
+#include "mfbunmap.h"
+#undef MFB_PROTOTYPES_ONLY
+
+#endif