debrix/hw/xorg/xf8_32bpp Makefile.am, NONE, 1.1 cfbbstore.c, 1.2, 1.3 cfbcpyarea.c, 1.2, 1.3 cfbcpyplane.c, 1.2, 1.3 cfbgc.c, 1.2, 1.3 cfbgcmisc.c, 1.2, 1.3 cfbgcunder.c, 1.2, 1.3 cfbimage.c, 1.2, 1.3 cfbpntwin.c, 1.2, 1.3 cfbscrinit.c, 1.2, 1.3 cfbwindow.c, 1.2, 1.3 xf86overlay.c, 1.2, 1.3

[Adam Jackson]

Committed by: ajax

Update of /cvs/xserver/debrix/hw/xorg/xf8_32bpp
In directory pdx:/home/ajax/debrix/hw/xorg/xf8_32bpp

Modified Files:
	cfbbstore.c cfbcpyarea.c cfbcpyplane.c cfbgc.c cfbgcmisc.c 
	cfbgcunder.c cfbimage.c cfbpntwin.c cfbscrinit.c cfbwindow.c 
	xf86overlay.c 
Added Files:
	Makefile.am 
Log Message:
Activate overlay support, fix lots of #includes.


--- NEW FILE: Makefile.am ---
noinst_LIBRARIES = libxf8_32bpp.a

sdk_HEADERS = cfb8_32.h

INCLUDES = -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb

libxf8_32bpp_a_SOURCES = \
	cfbbstore.c \
	cfbcpyarea.c \
	cfbcpyplane.c \
	cfbgcmisc.c \
	cfbimage.c \
	cfbpntwin.c \
	cfbscrinit.c \
	cfbwindow.c \
	xf86overlay.c \
	cfb8_32module.c \
	cfbgc8.c \
	cfbgc32.c \
	cfbgcunder.c

cfbgc8.c: cfbgc.c
	echo '#define PSZ 8' > $@
	echo '#include "cfbgc.c"' >> $@

cfbgc32.c: cfbgc.c
	echo '#define PSZ 32' > $@
	echo '#include "cfbgc.c"' >> $@

DISTCLEANFILES = cfbgc8.c cfbgc32.c

Index: cfbbstore.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf8_32bpp/cfbbstore.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cfbbstore.c	23 Apr 2004 19:54:21 -0000	1.2
+++ cfbbstore.c	28 Jun 2004 02:43:44 -0000	1.3
@@ -5,7 +5,7 @@
 #undef PSZ
 #include "cfb32.h"
 #include "cfb8_32.h"
-#include "X.h"
+#include "X11/X.h"
 #include "mibstore.h"
 #include "regionstr.h"
 #include "scrnintstr.h"

Index: cfbcpyarea.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf8_32bpp/cfbcpyarea.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cfbcpyarea.c	23 Apr 2004 19:54:21 -0000	1.2
+++ cfbcpyarea.c	28 Jun 2004 02:43:44 -0000	1.3
@@ -1,7 +1,7 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.5 2000/02/29 00:17:16 mvojkovi Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
+#include "X11/X.h"
+#include "X11/Xmd.h"
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"

Index: cfbcpyplane.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf8_32bpp/cfbcpyplane.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cfbcpyplane.c	23 Apr 2004 19:54:21 -0000	1.2
+++ cfbcpyplane.c	28 Jun 2004 02:43:44 -0000	1.3
@@ -1,8 +1,8 @@
 /* $XFree86$ */
 
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
+#include "X11/X.h"
+#include "X11/Xmd.h"
+#include "X11/Xproto.h"
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "scrnintstr.h"

Index: cfbgc.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf8_32bpp/cfbgc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cfbgc.c	23 Apr 2004 19:54:21 -0000	1.2
+++ cfbgc.c	28 Jun 2004 02:43:44 -0000	1.3
@@ -61,9 +61,9 @@
 
 /* This gets built twice.  Once for 8bpp and another for 32bpp */
 
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
+#include "X11/X.h"
+#include "X11/Xmd.h"
+#include "X11/Xproto.h"
 #include "cfb.h"
 #include "fontstruct.h"
 #include "dixfontstr.h"

Index: cfbgcmisc.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf8_32bpp/cfbgcmisc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cfbgcmisc.c	23 Apr 2004 19:54:21 -0000	1.2
+++ cfbgcmisc.c	28 Jun 2004 02:43:44 -0000	1.3
@@ -1,8 +1,8 @@
 /* $XFree86$ */
 
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
+#include "X11/X.h"
+#include "X11/Xmd.h"
+#include "X11/Xproto.h"
 #define PSZ 8
 #include "cfb.h"
 #undef PSZ

Index: cfbgcunder.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf8_32bpp/cfbgcunder.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cfbgcunder.c	23 Apr 2004 19:54:21 -0000	1.2
+++ cfbgcunder.c	28 Jun 2004 02:43:44 -0000	1.3
@@ -47,9 +47,9 @@
 ******************************************************************/
 #define PSZ 32
 
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
+#include "X11/X.h"
+#include "X11/Xmd.h"
+#include "X11/Xproto.h"
 #include "cfb.h"
 #include "fontstruct.h"
 #include "dixfontstr.h"

Index: cfbimage.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf8_32bpp/cfbimage.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cfbimage.c	23 Apr 2004 19:54:21 -0000	1.2
+++ cfbimage.c	28 Jun 2004 02:43:44 -0000	1.3
@@ -1,6 +1,6 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.2 2000/02/25 00:21:40 mvojkovi Exp $ */
 
-#include "X.h"
+#include "X11/X.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
 #include "scrnintstr.h"

Index: cfbpntwin.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf8_32bpp/cfbpntwin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cfbpntwin.c	23 Apr 2004 19:54:21 -0000	1.2
+++ cfbpntwin.c	28 Jun 2004 02:43:44 -0000	1.3
@@ -1,7 +1,7 @@
 /* $XdotOrg$ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1 1999/01/03 03:58:56 dawes Exp $ */
 
-#include "X.h"
+#include "X11/X.h"
 
 #include "windowstr.h"
 #include "regionstr.h"

Index: cfbscrinit.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf8_32bpp/cfbscrinit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cfbscrinit.c	23 Apr 2004 19:54:21 -0000	1.2
+++ cfbscrinit.c	28 Jun 2004 02:43:44 -0000	1.3
@@ -1,8 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.11 2001/04/14 21:17:49 mvojkovi Exp $ */
 
 
-#include "X.h"
-#include "Xmd.h"
+#include "X11/X.h"
+#include "X11/Xmd.h"
 #include "misc.h"
 #include "servermd.h"
 #include "scrnintstr.h"

Index: cfbwindow.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf8_32bpp/cfbwindow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cfbwindow.c	23 Apr 2004 19:54:21 -0000	1.2
+++ cfbwindow.c	28 Jun 2004 02:43:44 -0000	1.3
@@ -1,7 +1,7 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.8tsi Exp $ */
 
 
-#include "X.h"
+#include "X11/X.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #define PSZ 8

Index: xf86overlay.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf8_32bpp/xf86overlay.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86overlay.c	23 Apr 2004 19:54:21 -0000	1.2
+++ xf86overlay.c	28 Jun 2004 02:43:44 -0000	1.3
@@ -11,7 +11,7 @@
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include "X11/X.h"
 #include "scrnintstr.h"
 #include "regionstr.h"
 #include "windowstr.h"