[PATCH 23/42] Remove the last remnants of extmod
Daniel Stone
daniel at fooishbar.org
Fri Dec 2 03:27:31 PST 2011
extmod was originally a big pointless module. Now it's an empty,
pointless module. This commit makes it unexist.
Signed-off-by: Daniel Stone <daniel at fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
Xext/Makefile.am | 2 -
Xext/dpms.c | 2 -
Xext/panoramiX.c | 2 +
Xext/saver.c | 4 ++
Xext/shm.c | 1 +
Xext/xtest.c | 2 +
configure.ac | 1 -
hw/xfree86/common/xf86Config.c | 1 -
hw/xfree86/dixmods/Makefile.am | 2 -
hw/xfree86/dixmods/extmod/Makefile.am | 12 -----
hw/xfree86/dixmods/extmod/modinit.c | 80 ---------------------------------
hw/xfree86/loader/loadmod.c | 1 +
12 files changed, 10 insertions(+), 100 deletions(-)
delete mode 100644 hw/xfree86/dixmods/extmod/Makefile.am
delete mode 100644 hw/xfree86/dixmods/extmod/modinit.c
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 86d40e1..40af2f0 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -10,8 +10,6 @@ else
noinst_LTLIBRARIES = libXext.la
endif
-INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
-
AM_CFLAGS = $(DIX_CFLAGS)
if XORG
diff --git a/Xext/dpms.c b/Xext/dpms.c
index e0bef36..c8ba904 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -41,8 +41,6 @@ Equipment Corporation.
#include "dpmsproc.h"
#include "extinit.h"
-extern void DPMSExtensionInit(void);
-
static int
ProcDPMSGetVersion(ClientPtr client)
{
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 63130cc..6731214 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -68,6 +68,8 @@ extern VisualPtr glxMatchVisual(ScreenPtr pScreen,
ScreenPtr pMatchScreen);
#endif
+extern void PanoramiXExtensionInit(void);
+
/*
* PanoramiX data declarations
*/
diff --git a/Xext/saver.c b/Xext/saver.c
index 0a4c4fa..f76e1dd 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -94,6 +94,10 @@ static void SScreenSaverNotifyEvent (
xScreenSaverNotifyEvent * /* to */
);
+extern void ScreenSaverExtensionInit (
+ void
+ );
+
static RESTYPE SuspendType; /* resource type for suspension records */
typedef struct _ScreenSaverSuspension *ScreenSaverSuspensionPtr;
diff --git a/Xext/shm.c b/Xext/shm.c
index 885d10e..5d5153f 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -119,6 +119,7 @@ static void SShmCompletionEvent(
);
static Bool ShmDestroyPixmap (PixmapPtr pPixmap);
+extern void ShmExtensionInit(void);
static unsigned char ShmReqCode;
diff --git a/Xext/xtest.c b/Xext/xtest.c
index ce6b440..4e2f9c3 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -86,6 +86,8 @@ static int XTestSwapFakeInput(
xReq * /* req */
);
+extern void XTestExtensionInit(void);
+
static int
ProcXTestGetVersion(ClientPtr client)
diff --git a/configure.ac b/configure.ac
index d96f881..5f3c7aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2174,7 +2174,6 @@ hw/xfree86/common/Makefile
hw/xfree86/common/xf86Build.h
hw/xfree86/ddc/Makefile
hw/xfree86/dixmods/Makefile
-hw/xfree86/dixmods/extmod/Makefile
hw/xfree86/doc/Makefile
hw/xfree86/dri/Makefile
hw/xfree86/dri2/Makefile
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index b999983..b7e8b76 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -109,7 +109,6 @@
#endif
static ModuleDefault ModuleDefaults[] = {
- {.name = "extmod", .toLoad = TRUE, .load_opt=NULL},
#ifdef GLXEXT
{.name = "glx", .toLoad = TRUE, .load_opt=NULL},
#endif
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index d873746..854134a 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -1,7 +1,5 @@
noinst_LTLIBRARIES = libdixmods.la libxorgxkb.la
-SUBDIRS = extmod
-
if GLX
GLXMODS = libglx.la
endif
diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am
deleted file mode 100644
index 7c09429..0000000
--- a/hw/xfree86/dixmods/extmod/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-extsmoduledir = $(moduledir)/extensions
-extsmodule_LTLIBRARIES = libextmod.la
-
-AM_CFLAGS = @DIX_CFLAGS@ @XORG_CFLAGS@
-INCLUDES = @XORG_INCS@ \
- -I$(top_srcdir)/dbe \
- -I$(top_srcdir)/hw/xfree86/loader \
- -I$(top_srcdir)/miext/shadow
-
-libextmod_la_LDFLAGS = -module -avoid-version
-libextmod_la_SOURCES = modinit.c
-libextmod_la_LIBADD = $(top_builddir)/Xext/libXextmodule.la
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
deleted file mode 100644
index 2ca1c0e..0000000
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 1997 Matthieu Herrb
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Matthieu Herrb not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Matthieu Herrb makes no
- * representations about the suitability of this software for any purpose.
- * It is provided "as is" without express or implied warranty.
- *
- * MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Module.h"
-#include "xf86Opt.h"
-
-#include <X11/Xproto.h>
-
-#include "extinit.h"
-#include "xf86Extensions.h"
-#include "globals.h"
-
-static MODULESETUPPROTO(extmodSetup);
-
-/*
- * Array describing extensions to be initialized
- */
-static ExtensionModule extensionModules[] = {
- { /* DON'T delete this entry ! */
- NULL,
- NULL,
- NULL,
- NULL,
- NULL
- }
-};
-
-static XF86ModuleVersionInfo VersRec =
-{
- "extmod",
- MODULEVENDORSTRING,
- MODINFOSTRING1,
- MODINFOSTRING2,
- XORG_VERSION_CURRENT,
- 1, 0, 0,
- ABI_CLASS_EXTENSION,
- ABI_EXTENSION_VERSION,
- MOD_CLASS_EXTENSION,
- {0,0,0,0}
-};
-
-/*
- * Data for the loader
- */
-_X_EXPORT XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL };
-
-static pointer
-extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin)
-{
- int i;
-
- for (i = 0; extensionModules[i].name != NULL; i++)
- LoadExtension(&extensionModules[i], FALSE);
-
- /* Need a non-NULL return */
- return (pointer)1;
-}
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index ae53a82..4634587 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -810,6 +810,7 @@ static const char *compiled_in_modules[] = {
"ramdac",
"dbe",
"record",
+ "extmod",
NULL
};
--
1.7.7.3
More information about the xorg-devel
mailing list