Enough build fixes to get {sdl,ephyr,fake} to link.

hw/kdrive/Makefile.am

@@ -1,9 +1,6 @@
-# none of this works yet.  fbdev, ephyr, and the hardware servers all rely
-# on miext/shadow/ changes we haven't brought over yet, and sdl relies on
-# some detection-fu that hasn't been ported.
-
 if KDRIVEVESA
-VESA_SUBDIRS = vesa mach64 mga nvidia r128 smi chips pm2 via neomagic
+VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
+               smi via
 endif
 
 if KDRIVEFBDEV
@@ -11,7 +8,7 @@ FBDEV_SUBDIRS = fbdev
 endif
 
 if XSDLSERVER
-XSDL_SUBDIRS=sdl
+XSDL_SUBDIRS = sdl
 endif
 
 if XEPHYR
@@ -25,8 +22,4 @@ SUBDIRS =			\
 	$(FBDEV_SUBDIRS)	\
 	$(VESA_SUBDIRS)		\
 	$(XEPHYR_SUBDIRS)       \
-	ati			\
-	fake			\
-	ephyr                   \
-	i810			\
-	epson
+	fake

hw/kdrive/fake/Makefile.am

@@ -24,7 +24,8 @@ Xfake_LDADD = 						\
 	libfake.a					\
 	@KDRIVE_LIBS@					\
 	@KDRIVE_LIBS@					\
-	$(TSLIB_FLAG)
+	$(TSLIB_FLAG)                                   \
+        @XSERVER_LIBS@
 
 Xfake_DEPENDENCIES =					\
 	libfake.a					\

hw/kdrive/src/Makefile.am

@@ -2,7 +2,7 @@ INCLUDES = 					\
 	@KDRIVE_INCS@				\
 	@KDRIVE_CFLAGS@
 
-noinst_LIBRARIES = libkdrive.a
+noinst_LIBRARIES = libkdrive.a libkdrivestubs.a
 
 libkdrive_a_SOURCES =	\
 	fourcc.h	\
@@ -26,4 +26,9 @@ libkdrive_a_SOURCES =	\
 	kxv.c		\
 	kxv.h		\
 	vga.c		\
-	vga.h
+	vga.h           \
+        $(top_srcdir)/mi/miinitext.c
+
+libkdrivestubs_a_SOURCES = \
+        $(top_srcdir)/Xi/stubs.c \
+        $(top_srcdir)/fb/fbcmap.c

hw/kdrive/src/kdrive.c

@@ -1512,3 +1512,5 @@ DPMSSupported (void)
     return FALSE;
 }
 #endif
+
+void ddxInitGlobals(void) { /* THANK YOU XPRINT */ }

hw/kdrive/src/kshadow.c

@@ -68,12 +68,12 @@ KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindow
     KdScreenInfo *screen = pScreenPriv->screen;
     int	 fb;
 
-    shadowUnset (pScreen);
+    shadowRemove (pScreen, pScreen->GetScreenPixmap(pScreen));
     for (fb = 0; fb < KD_MAX_FB && screen->fb[fb].depth; fb++)
     {
 	if (screen->fb[fb].shadow)
-	    return shadowSet (pScreen, (*pScreen->GetScreenPixmap) (pScreen), 
-			      update, window, randr, 0);
+            return shadowAdd (pScreen, pScreen->GetScreenPixmap(pScreen),
+                              update, window, randr, 0);
     }
     return TRUE;
 }
@@ -81,5 +81,5 @@ KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindow
 void
 KdShadowUnset (ScreenPtr pScreen)
 {
-    shadowUnset (pScreen);
+    shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
 }