Start autoifying everything.

hw/kdrive/Makefile.am

@@ -0,0 +1,47 @@
+SUBDIRS =	\
+	vesa
+
+INCLUDES = 					\
+	-I$(top_srcdir)/fb			\
+	-I$(top_srcdir)/include			\
+	-I$(top_srcdir)/mi			\
+	-I$(top_srcdir)/miext/shadow		\
+	-I$(top_srcdir)/randr			\
+	-I$(top_srcdir)/render			
+
+
+noinst_LTLIBRARIES = libkdrive.la
+
+libkdrive_la_SOURCES =	\
+	kaa.c		\
+	kasync.c	\
+	kcmap.c		\
+	kcolor.c	\
+	kcurscol.c	\
+	kdrive.c	\
+	kinfo.c		\
+	kinput.c	\
+	kmap.c		\
+	kmode.c		\
+	knoop.c		\
+	kpict.c		\
+	kshadow.c	\
+	ktest.c		\
+	kxv.c		\
+	vga.c
+
+libkdrive_la_LIBADD = 				\
+	$(top_builddir)/dix/libdix.la		\
+	$(top_builddir)/fb/libfb.la		\
+	$(top_builddir)/mi/libmi.la		\
+	$(top_builddir)/render/librender.la	\
+	$(top_builddir)/randr/librandr.la	\
+	$(top_builddir)/os/libos.la		\
+	$(X_LIBS) -lXfont
+
+
+bin_PROGRAMS = Xvesa
+
+Xvesa_SOURCES = # Intentionally left blank
+
+Xvesa_LDADD = $(top_builddir)/hw/kdrive/libkdrive.la

hw/kdrive/itsy/ts.c

@@ -25,7 +25,7 @@
 
 #define NEED_EVENTS
 #include "itsy.h"
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "inputstr.h"
 #include "Xpoll.h"
 

hw/kdrive/linux/agp.c

@@ -41,7 +41,7 @@ of the copyright holder.
  * Author: Pontus Lidman <pontus.lidman@nokia.com> (adaption to KDrive) and others
  */
 
-#include "X.h"
+#include <X11/X.h>
 
 #include "Xdefs.h"
 #include "Xmd.h"

hw/kdrive/linux/bus.c

@@ -23,8 +23,8 @@
  */
 
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "kdrive.h"

hw/kdrive/linux/mouse.c

@@ -23,8 +23,8 @@
  */
 
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "kdrive.h"

hw/kdrive/linux/ms.c

@@ -23,8 +23,8 @@ THE SOFTWARE.
 /* $RCSId: xc/programs/Xserver/hw/kdrive/linux/ms.c,v 1.1 2001/08/09 20:45:15 dawes Exp $ */
 
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "kdrive.h"

hw/kdrive/linux/ps2.c

@@ -23,8 +23,8 @@
  */
 
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "kdrive.h"

hw/kdrive/linux/ts.c

@@ -26,8 +26,8 @@
  */
 
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "kdrive.h"

hw/kdrive/linux/tslib.c

@@ -47,8 +47,8 @@
 
 
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "kdrive.h"

hw/kdrive/pcmcia/pcmciarotate.c

@@ -22,7 +22,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include    "X.h"
+#include    <X11/X.h>
 #include    "scrnintstr.h"
 #include    "windowstr.h"
 #include    "font.h"

hw/kdrive/pcmcia/pcmciashadow.c

@@ -23,7 +23,7 @@
  */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciashadow.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */
 
-#include    "X.h"
+#include    <X11/X.h>
 #include    "scrnintstr.h"
 #include    "windowstr.h"
 #include    "font.h"

hw/kdrive/src/kdrive.h

@@ -24,10 +24,10 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/kdrive.h,v 1.29 2002/11/13 16:37:39 keithp Exp $ */
 
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #define NEED_EVENTS
-#include "Xproto.h"
-#include "Xos.h"
+#include <X11/Xproto.h>
+#include <X11/Xos.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "windowstr.h"

hw/kdrive/src/kxv.c

@@ -49,8 +49,8 @@ of the copyright holder.
 #include "gcstruct.h"
 #include "dixstruct.h"
 
-#include "Xv.h"
-#include "Xvproto.h"
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvproto.h>
 
 #include "kxv.h"
 

hw/kdrive/vesa/Makefile.am

@@ -0,0 +1,19 @@
+INCLUDES = 					\
+	-I$(top_srcdir)/fb			\
+	-I$(top_srcdir)/hw/kdrive		\
+	-I$(top_srcdir)/include			\
+	-I$(top_srcdir)/mi			\
+	-I$(top_srcdir)/miext/layer		\
+	-I$(top_srcdir)/miext/shadow		\
+	-I$(top_srcdir)/randr			\
+	-I$(top_srcdir)/render
+
+
+noinst_LTLIBRARIES = libvesa.la
+
+libvesa_la_SOURCES = 	\
+	vesa.c		\
+	vesainit.c	\
+	vbe.c		\
+	vga.c		\
+	vm86.c

hw/kdrive/vesa/vm86.h

@@ -63,9 +63,9 @@ static void ErrorF(char*, ...);
 #define xcalloc(a,b) calloc(a,b)
 #define xfree(a) free(a)
 #else
-#include "X.h"
-#include "Xproto.h"
-#include "Xos.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xos.h>
 #include "os.h"
 #endif
 

hw/kdrive/vxworks/vxmouse.c

@@ -7,8 +7,8 @@
  */
 
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "kdrive.h"