debrix-driver-sis/sis Makefile.am, NONE, 1.1 sis.h, 1.6, 1.7 sis6326_video.c, 1.3, 1.4 sis_driver.c, 1.7, 1.8 sis_setup.c, 1.3, 1.4 sis_video.c, 1.3, 1.4

[Adam Jackson]

Committed by: ajax

Update of /cvs/xserver/debrix-driver-sis/sis
In directory pdx:/home/ajax/tmp/sis/sis

Modified Files:
	sis.h sis6326_video.c sis_driver.c sis_setup.c sis_video.c 
Added Files:
	Makefile.am 
Log Message:
Autotool a few more drivers.


--- NEW FILE: Makefile.am ---
driver_LTLIBRARIES = libsis.la
man_MANS = sis.man

if DRI
SIS_DRI = sis_dri.c sis_dri.h
endif

libsis_la_SOURCES = \
	sis_driver.c \
	sis_dac.c \
	sis_cursor.c \
	sis_accel.c \
	sis_setup.c \
	sis300_accel.c \
	sis310_accel.c \
	sis_vga.c \
	sis_vb.c \
	sis_opt.c \
	sis_dga.c \
	sis_video.c \
	init.c \
	init301.c \
	sis_shadow.c \
	sis6326_video.c \
	300vtbl.h \
	310vtbl.h \
	init.h \
	init301.h \
	initdef.h \
	oem300.h \
	oem310.h \
	osdef.h \
	sis.h \
	sis300_accel.h \
	sis310_accel.h \
	sis_accel.h \
	sis_common.h \
	sis_cursor.h \
	sis_dac.h \
	sis_driver.h \
	sis_regs.h \
	sis_shadow.h \
	sis_vb.h \
	vgatypes.h \
	vstruct.h \
	$(SIS_DRI)

Index: sis.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-sis/sis/sis.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sis.h	23 Jun 2004 21:35:45 -0000	1.6
+++ sis.h	2 Jul 2004 04:37:57 -0000	1.7
@@ -124,7 +124,7 @@
 #define NEED_REPLIES  		/* ? */
 #define EXTENSION_PROC_ARGS void *
 #include "extnsionst.h"  	/* required */
-#include "panoramiXproto.h"  	/* required */
+#include "X11/extensions/panoramiXproto.h"  	/* required */
 #endif
 #endif
 

Index: sis6326_video.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-sis/sis/sis6326_video.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sis6326_video.c	17 Jun 2004 13:20:13 -0000	1.3
+++ sis6326_video.c	2 Jul 2004 04:37:57 -0000	1.4
@@ -44,7 +44,7 @@
 #include "regionstr.h"
 
 #include "xf86xv.h"
-#include "Xv.h"
+#include "X11/extensions/Xv.h"
 #include "xaa.h"
 #include "dixstruct.h"
 #include "fourcc.h"

Index: sis_driver.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-sis/sis/sis_driver.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sis_driver.c	23 Jun 2004 21:35:45 -0000	1.7
+++ sis_driver.c	2 Jul 2004 04:37:57 -0000	1.8
@@ -76,16 +76,16 @@
 #include "sis_driver.h"
 
 #define _XF86DGA_SERVER_
-#include "extensions/xf86dgastr.h"
+#include "X11/extensions/xf86dgastr.h"
 
 #include "globals.h"
 
 #define DPMS_SERVER
-#include "extensions/dpms.h"
+#include "X11/extensions/dpms.h"
 
 #if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0,0)) || (defined(XvExtension))
 #include "xf86xv.h"
-#include "Xv.h"
+#include "X11/extensions/Xv.h"
 #endif
 
 #ifdef XF86DRI

Index: sis_setup.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-sis/sis/sis_setup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sis_setup.c	17 Jun 2004 13:20:14 -0000	1.3
+++ sis_setup.c	2 Jul 2004 04:37:58 -0000	1.4
@@ -51,11 +51,11 @@
 #include "sis_dac.h"
 
 #define _XF86DGA_SERVER_
-#include "extensions/xf86dgastr.h"
+#include "X11/extensions/xf86dgastr.h"
 
 #include "globals.h"
 #define DPMS_SERVER
-#include "extensions/dpms.h"
+#include "X11/extensions/dpms.h"
 
 static const char *dramTypeStr[] = {
         "Fast Page DRAM",

Index: sis_video.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-sis/sis/sis_video.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sis_video.c	17 Jun 2004 13:20:14 -0000	1.3
+++ sis_video.c	2 Jul 2004 04:37:58 -0000	1.4
@@ -104,7 +104,7 @@
 
 #include "sis.h"
 #include "xf86xv.h"
-#include "Xv.h"
+#include "X11/extensions/Xv.h"
 #include "xaa.h"
 #include "dixstruct.h"
 #include "fourcc.h"