debrix/hw/xorg/loader Makefile.am,1.4,1.5 xf86sym.c,1.4,1.5

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/debrix/hw/xorg/loader
In directory pdx:/tmp/cvs-serv18452/hw/xorg/loader

Modified Files:
	Makefile.am xf86sym.c 
Log Message:
* configure.ac:
Minor cleanups; add some XKB defines.

* hw/xorg/common/debrixInit.c:
Add space in printed string (cosmetic).

* hw/xorg/loader/xf86sym.c:
Add in a bunch of symbols, so atimisc loads on my Mach64.

* xkb/Makefile.am:
Remove defines as per configure.ac.

* xkb/XKB*.c:
Add in a heap of missing #include <config.h>'s for xkbfile-derived
code.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	1 Jul 2004 17:49:49 -0000	1.4
+++ Makefile.am	6 Jul 2004 23:53:56 -0000	1.5
@@ -1,8 +1,8 @@
 noinst_LIBRARIES = libloader.a
-AM_CFLAGS = -DDLOPEN_SUPPORT -DHAS_SHM_
 INCLUDES = -I$(srcdir)/../parser -I$(srcdir)/../vbe \
            -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
-           -I$(srcdir)/../fbdevhw -I$(srcdir)/../scanpci -I$(srcdir)/../xaa
+           -I$(srcdir)/../fbdevhw -I$(srcdir)/../scanpci -I$(srcdir)/../xaa \
+           -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac -I$(srcdir)/../shadowfb
 
 libloader_a_SOURCES = \
         dlloader.c \

Index: xf86sym.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/loader/xf86sym.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xf86sym.c	1 Jul 2004 17:49:49 -0000	1.4
+++ xf86sym.c	6 Jul 2004 23:53:56 -0000	1.5
@@ -85,6 +85,11 @@
 #include "xf86miscproc.h"
 #include "loader.h"
 #include "xaarop.h"
+#include "vgaHW.h"
+#include "shadow.h"
+#include "shadowfb.h"
+#include "fb.h"
+#include "xf86Cursor.h"
 #define DONT_DEFINE_WRAPPERS
 #include "xf86_ansic.h"
 #include "xisb.h"
@@ -254,6 +259,7 @@
 extern XF86ModuleData xaaModuleData;
 extern XF86ModuleData xf1bppModuleData;
 extern XF86ModuleData xf4bppModuleData;
+extern int fbWinPrivateIndex;
 
 /* XFree86 things */
 
@@ -1175,7 +1181,7 @@
     /* int10 */
     SYMFUNC(xf86FreeInt10)
 
-    /* ddc */
+    /* module records */
     SYMVAR(ddcModuleData)
     SYMVAR(fbModuleData)
     SYMVAR(i2cModuleData)
@@ -1191,8 +1197,24 @@
     SYMVAR(xf1bppModuleData)
     SYMVAR(xf4bppModuleData)
 
+    /* vgahw */
+    SYMVAR(vgaHWGetHWRec)
+
+    /* shadow */
+    SYMVAR(shadowUpdatePlanar4)
+
     /* xaa */
     SYMVAR(XAACopyROP)
 
+    /* fb */
+    SYMVAR(fbWinPrivateIndex)
+    SYMFUNC(fbScreenInit)
+
+    /* ramdac */
+    SYMFUNC(xf86CreateCursorInfoRec)
+
+    /* shadowfb */
+    SYMFUNC(ShadowFBInit)
+
     {0, 0}
 };