debrix/hw/xorg/xf24_32bpp Makefile.am, NONE, 1.1 cfbbstore.c, 1.2, 1.3 cfbcpyarea.c, 1.2, 1.3 cfbgc.c, 1.2, 1.3 cfbgcmisc.c, 1.2, 1.3 cfbimage.c, 1.2, 1.3 cfbpixmap.c, 1.2, 1.3 cfbscrinit.c, 1.2, 1.3 cfbwindow.c, 1.2, 1.3

[Adam Jackson]

Committed by: ajax

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

Modified Files:
	cfbbstore.c cfbcpyarea.c cfbgc.c cfbgcmisc.c cfbimage.c 
	cfbpixmap.c cfbscrinit.c cfbwindow.c 
Added Files:
	Makefile.am 
Log Message:
- Import afb and xf24_32bpp
- Make xf24_32bpp build properly
- Add shadow.h to the sdk headers


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

sdk_HEADERS = cfb24_32.h

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

# note, cfbbstore.c doesn't build.  Old Imakefile doesn't even use it, hrm...
libxf24_32bpp_a_SOURCES = \
	cfb24_32module.c \
	cfbcpyarea.c \ 
	cfbgc24.c \
	cfbgc32.c \
	cfbgcmisc.c \
	cfbimage.c \
	cfbpixmap.c \
	cfbscrinit.c \
	cfbwindow.c

cfbgc24.c: cfbgc.c
	echo '#define PSZ 24' > $@
	echo '#include "cfbgc.c"' >> $@

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

DISTCLEANFILES = cfbgc24.c cfbgc32.c

Index: cfbbstore.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf24_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:17 -0000	1.2
+++ cfbbstore.c	2 Jul 2004 21:16:03 -0000	1.3
@@ -6,7 +6,7 @@
 #include "cfb24.h"
 #include "cfb32.h"
 #include "cfb24_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/xf24_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:17 -0000	1.2
+++ cfbcpyarea.c	2 Jul 2004 21:16:03 -0000	1.3
@@ -1,7 +1,7 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbcpyarea.c,v 1.5 1999/05/16 10:13:05 dawes 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: cfbgc.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf24_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:17 -0000	1.2
+++ cfbgc.c	2 Jul 2004 21:16:03 -0000	1.3
@@ -62,9 +62,9 @@
 
 /* This gets built twice.  Once for 24bpp 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/xf24_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:17 -0000	1.2
+++ cfbgcmisc.c	2 Jul 2004 21:16:03 -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: cfbimage.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf24_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:17 -0000	1.2
+++ cfbimage.c	2 Jul 2004 21:16:03 -0000	1.3
@@ -1,6 +1,6 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbimage.c,v 1.3 2000/02/25 00:21:00 mvojkovi Exp $ */
 
-#include "X.h"
+#include "X11/X.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
 #include "scrnintstr.h"

Index: cfbpixmap.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf24_32bpp/cfbpixmap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cfbpixmap.c	23 Apr 2004 19:54:17 -0000	1.2
+++ cfbpixmap.c	2 Jul 2004 21:16:03 -0000	1.3
@@ -1,6 +1,6 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c,v 1.1 1999/01/23 09:56:14 dawes Exp $ */
 
-#include "Xmd.h"
+#include "X11/Xmd.h"
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"

Index: cfbscrinit.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xf24_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:17 -0000	1.2
+++ cfbscrinit.c	2 Jul 2004 21:16:03 -0000	1.3
@@ -1,8 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbscrinit.c,v 1.5 2003/07/16 01:38:49 dawes 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/xf24_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:17 -0000	1.2
+++ cfbwindow.c	2 Jul 2004 21:16:03 -0000	1.3
@@ -1,6 +1,6 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbwindow.c,v 1.4tsi Exp $ */
 
-#include "X.h"
+#include "X11/X.h"
 #include "windowstr.h"
 #include "regionstr.h"
 #include "pixmapstr.h"