From a7a2f9f66ddc27df96557093f3dd266e24eb653b Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 10 Jul 2012 02:03:13 +0100 Subject: [PATCH] Remove the last remnants of extmod extmod was originally a big pointless module. Now it's an empty, pointless module. This commit makes it unexist. Signed-off-by: Daniel Stone Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard --- Xext/Makefile.am | 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 | 72 --------------------------- hw/xfree86/loader/loadmod.c | 1 + 7 files changed, 1 insertion(+), 90 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 957fa671a..0420951ab 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/configure.ac b/configure.ac index fc5e2d9d1..14459d61a 100644 --- a/configure.ac +++ b/configure.ac @@ -2244,7 +2244,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 7b68e355b..a701d87ee 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 3aa7d27c5..1ad122a95 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 d5e0cdeea..000000000 --- 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 $(LD_NO_UNDEFINED_FLAG) -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 74171cf5d..000000000 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ /dev/null @@ -1,72 +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 -#endif - -#include "xf86Module.h" -#include "xf86Opt.h" - -#include - -#include "extinit.h" -#include "xf86Extensions.h" -#include "globals.h" - -static MODULESETUPPROTO(extmodSetup); - -/* - * Array describing extensions to be initialized - */ -static ExtensionModule extensionModules[] = { -}; - -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; i < ARRAY_SIZE(extensionModules); 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 9ce581375..1ec4ff00b 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -835,6 +835,7 @@ static const char *compiled_in_modules[] = { "ramdac", "dbe", "record", + "extmod", NULL };