xserver/hw/kdrive/i810 Makefile.am, NONE, 1.1 i810.c, 1.4, 1.5 i810_video.c, 1.4, 1.5 i810draw.c, 1.2, 1.3

[Carlos Romero]

Committed by: kidcrash

Update of /cvs/xserver/xserver/hw/kdrive/i810
In directory pdx:/tmp/cvs-serv19451/hw/kdrive/i810

Modified Files:
	i810.c i810_video.c i810draw.c 
Added Files:
	Makefile.am 
Log Message:
Enable i810.


--- NEW FILE: Makefile.am ---
INCLUDES = 					\
	@KDRIVE_INCS@				\
	@XSERVER_CFLAGS@

bin_PROGRAMS = Xi810

noinst_LIBRARIES = libi810.a

if TSLIB
TSLIB_FLAG = -lts
endif

libi810_a_SOURCES = 		\
	i810_cursor.c	\
	i810_video.c	\
	i810draw.c	\
	i810draw.h	\
	i810reg.h	\
	i810.c		\
	i810.h

Xi810_SOURCES = \
	i810stub.c

I810_LIBS =						\
	libi810.a 					\
	@KDRIVE_LIBS@

Xi810_LDADD = \
	$(I810_LIBS)					\
	@XSERVER_LIBS@                                  \
	$(TSLIB_FLAG)

Xi810_DEPENDENCIES = $(I810_LIBS) @KDRIVE_LIBS@

Index: i810.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/i810/i810.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- i810.c	11 Sep 2003 05:12:51 -0000	1.4
+++ i810.c	15 Jul 2004 09:56:39 -0000	1.5
@@ -49,7 +49,7 @@
 #include "kxv.h"
 
 #include "i810.h"
-#include "linux/agp.h"
+#include "agp.h"
 
 #include "i810draw.h"
 

Index: i810_video.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/i810/i810_video.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- i810_video.c	11 Sep 2003 05:12:51 -0000	1.4
+++ i810_video.c	15 Jul 2004 09:56:39 -0000	1.5
@@ -75,9 +75,9 @@
 #include "kxv.h"
 #include "i810.h"
 
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 
-#include "../../xfree86/common/fourcc.h"
+#include "fourcc.h"
 
 typedef struct {
     CARD32 size;

Index: i810draw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/i810/i810draw.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- i810draw.c	11 Sep 2003 05:12:51 -0000	1.2
+++ i810draw.c	15 Jul 2004 09:56:40 -0000	1.3
@@ -45,7 +45,7 @@
 #include "i810.h"
 #include "i810_reg.h"
 
-#include	"Xmd.h"
+//#include	"Xmd.h"
 #include	"gcstruct.h"
 #include	"scrnintstr.h"
 #include	"pixmapstr.h"