debrix-driver-apm/apm apm.h, 1.2, 1.3 apm_cursor.c, 1.2, 1.3 apm_driver.c, 1.2, 1.3

Committed by: ajax

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

Modified Files:
	apm.h apm_cursor.c apm_driver.c 
Log Message:
Finish autotooling, fix header locations.


Index: apm.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-apm/apm/apm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- apm.h	23 Apr 2004 19:25:03 -0000	1.2
+++ apm.h	28 Jun 2004 01:53:04 -0000	1.3
@@ -3,6 +3,7 @@
 
 /* All drivers should typically include these */
 #include "xf86.h"
+#include "xf86str.h"
 #include "xf86_OSproc.h"
 
 /* All drivers need this */
@@ -54,7 +55,7 @@
 #include "xf86DDC.h"
 
 #include "xf86xv.h"
-#include "Xv.h"
+#include "X11/extensions/Xv.h"
 
 #ifdef TRUE
 #undef TRUE

Index: apm_cursor.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-apm/apm/apm_cursor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- apm_cursor.c	23 Apr 2004 19:25:03 -0000	1.2
+++ apm_cursor.c	28 Jun 2004 01:53:04 -0000	1.3
@@ -1,8 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c,v 1.14 2000/06/30 18:27:02 dawes Exp $ */
 
 
-#include "X.h"
-#include "Xproto.h"
+#include "X11/X.h"
+#include "X11/Xproto.h"
 #include "misc.h"
 #include "input.h"
 #include "cursorstr.h"

Index: apm_driver.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-apm/apm/apm_driver.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- apm_driver.c	23 Apr 2004 19:25:03 -0000	1.2
+++ apm_driver.c	28 Jun 2004 01:53:04 -0000	1.3
@@ -10,7 +10,7 @@
 
 #include "opaque.h"
 #define DPMS_SERVER
-#include "extensions/dpms.h"
+#include "X11/extensions/dpms.h"
 
 #define VERSION			4000
 #define APM_NAME		"APM"