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

1 files changed, 153 insertions, 0 deletions

diff --git a/xorg-server/cfb/Makefile.am.inc b/xorg-server/cfb/Makefile.am.inc
new file mode 100644
index 000000000..a2ee143aa
--- /dev/null
+++ b/xorg-server/cfb/Makefile.am.inc
@@ -0,0 +1,153 @@
+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)
+
+CFB_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/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/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 \
+	$(top_srcdir)/cfb/cfbcmap.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\"" >> $@
+
+
+if XPRINT
+
+PLATFORMDEFS = -DXFREE86
+
+cfb8bit.o:   compiler.h
+
+compiler.h:
+	echo "#include \"$(top_srcdir)/hw/xfree86/common/compiler.h\"" >> $@
+
+endif
+