Don't bother building RAC as a module, that's just absurd.

3 files changed, 7 insertions, 31 deletions

diff --git a/hw/xfree86/rac/Makefile.am b/hw/xfree86/rac/Makefile.am
index 144159d5f..0e7cc72b5 100644
--- a/hw/xfree86/rac/Makefile.am
+++ b/hw/xfree86/rac/Makefile.am
@@ -1,6 +1,5 @@
-module_LTLIBRARIES = librac.la
-librac_la_LDFLAGS = -avoid-version
-librac_la_SOURCES = xf86RACmodule.c xf86RAC.c
+module_LIBRARIES = librac.a
+librac_a_SOURCES = xf86RAC.c
 
 sdk_HEADERS = xf86RAC.h
 
diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c
index 1f2d3a129..aba86226e 100644
--- a/hw/xfree86/rac/xf86RAC.c
+++ b/hw/xfree86/rac/xf86RAC.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.5 1999/06/12 17:30:21 dawes Exp $ */
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -243,12 +241,12 @@ static void RACCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor *color,
 			      int nRect, xRectangle *rects);
 #endif
 
-GCFuncs RACGCFuncs = {
+static GCFuncs RACGCFuncs = {
     RACValidateGC, RACChangeGC, RACCopyGC, RACDestroyGC,
     RACChangeClip, RACDestroyClip, RACCopyClip
 };
 
-GCOps RACGCOps = {
+static GCOps RACGCOps = {
     RACFillSpans, RACSetSpans, RACPutImage, RACCopyArea, 
     RACCopyPlane, RACPolyPoint, RACPolylines, RACPolySegment, 
     RACPolyRectangle, RACPolyArc, RACFillPolygon, RACPolyFillRect, 
@@ -257,13 +255,13 @@ GCOps RACGCOps = {
     {NULL}		/* devPrivate */
 };
 
-miPointerSpriteFuncRec RACSpriteFuncs = {
+static miPointerSpriteFuncRec RACSpriteFuncs = {
     RACSpriteRealizeCursor, RACSpriteUnrealizeCursor, RACSpriteSetCursor,
     RACSpriteMoveCursor
 };
 
-int RACScreenIndex = -1;
-int RACGCIndex = -1;
+static int RACScreenIndex = -1;
+static int RACGCIndex = -1;
 static unsigned long RACGeneration = 0;
 
 
diff --git a/hw/xfree86/rac/xf86RACmodule.c b/hw/xfree86/rac/xf86RACmodule.c
deleted file mode 100644
index 7b1bdac98..000000000
--- a/hw/xfree86/rac/xf86RACmodule.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Module.h"
-
-static XF86ModuleVersionInfo racVersRec =
-{
-    "rac",
-    MODULEVENDORSTRING,
-    MODINFOSTRING1,
-    MODINFOSTRING2,
-    XORG_VERSION_CURRENT,
-    1, 0, 0,
-    ABI_CLASS_VIDEODRV,		/* requires the video driver ABI */
-    ABI_VIDEODRV_VERSION,
-    MOD_CLASS_NONE,
-    {0,0,0,0}
-};
-
-_X_EXPORT XF86ModuleData racModuleData = { &racVersRec, NULL, NULL };