Remove extmod from nx-X11/programs/Xserver/Xext/.

nx-X11/programs/Xserver/Xext/Imakefile

@@ -25,11 +25,6 @@
 
 #include <Server.tmpl>
 
-#if DoLoadableServer
-#define IHaveSubdirs
-SUBDIRS = extmod
-#endif
-
 #if HasShm && (!(defined(NXAgentServer) && NXAgentServer))
   SHMSRCS = shm.c
   SHMOBJS = shm.o
@@ -136,8 +131,6 @@ SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF))
 
 LinkConfDirectory(xserver,.,xserver,.)
 
-LinkSourceFile(modinit.h,extmod)
-
 #if BuildXCSecurity && InstallSecurityConfig
 InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR))
 #endif

nx-X11/programs/Xserver/Xext/bigreq.c

@@ -38,7 +38,6 @@ from The Open Group.
 #include "extnsionst.h"
 #include <nx-X11/extensions/bigreqstr.h>
 #include "opaque.h"
-#include "modinit.h"
 
 #if 0
 static unsigned char XBigReqCode;

nx-X11/programs/Xserver/Xext/dpms.c

@@ -48,7 +48,6 @@ Equipment Corporation.
 #include <nx-X11/extensions/dpms.h>
 #include <nx-X11/extensions/dpmsstr.h>
 #include "dpmsproc.h"
-#include "modinit.h"
 
 #if 0
 static unsigned char DPMSCode;

nx-X11/programs/Xserver/Xext/extmod/Imakefile

-#define IHaveModules
-#include <Server.tmpl>
-
-#if BuildScreenSaverExt
-      SCRNSAVSRC = saver.c
-      SCRNSAVOBJ = saver.o
-LinkSourceFile(saver.c,..)
-#endif
-
-#if BuildDPMS
-        DPMSSRCS = dpms.c
-        DPMSOBJS = dpms.o
-LinkSourceFile(dpms.c,..)
-#endif
-
-#if BuildXvExt
-          XVSRCS = xvmain.c xvdisp.c xvmod.c xvmc.c
-          XVOBJS = xvmain.o xvdisp.o xvmod.o xvmc.o
-LinkSourceFile(xvmain.c,..)
-LinkSourceFile(xvdisp.c,..)
-LinkSourceFile(xvmod.c,..)
-LinkSourceFile(xvmc.c,..)
-#endif
-
-#if BuildXResExt
-   XRESSRCS = xres.c
-   XRESOBJS = xres.o
-LinkSourceFile(xres.c,..)
-#endif
-
-     MODINITSRCS = modinit.c 
-     MODINITOBJS = modinit.o
-
-       SRCS = shape.c \
-	      bigreq.c sync.c $(SCRNSAVSRC) xcmisc.c \
-	      $(DPMSSRCS) \
-	      $(XVSRCS) $(MODINITSRCS) $(XRESSRCS)
-
-      MOBJS = $(MODINITOBJS) shape.o \
-	      bigreq.o sync.o $(SCRNSAVOBJ) xcmisc.o \
-              $(DPMSOBJS) \
-	      $(XVOBJS) $(XRESOBJS)
-
-    DEFINES = -DEXTMODULE $(EXT_DEFINES)
-
-XF86INCLUDES = -I$(XF86COMSRC)
-    INCLUDES = -I.. -I../../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
-	       $(XF86INCLUDES)
-    LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln
-
-LinkSourceFile(shape.c,..)
-LinkSourceFile(bigreq.c,..)
-LinkSourceFile(sync.c,..)
-LinkSourceFile(xcmisc.c,..)
-
-ModuleObjectRule()
-
-SpecialCObjectRule(modinit,$(ICONFIGFILES),$(EXT_DEFINES))
-LibraryModuleTarget(extmod,$(MOBJS))
-NormalLintTarget($(SRCS))
-
-InstallLibraryModule(extmod,$(MODULEDIR),extensions)
-
-DependTarget()
-
-InstallDriverSDKLibraryModule(extmod,$(DRIVERSDKMODULEDIR),extensions)

nx-X11/programs/Xserver/Xext/extmod/modinit.c

-
-/*
- *
- * 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
-
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-
-#include "xf86Module.h"
-#include "xf86Opt.h"
-
-#include <nx-X11/Xproto.h>
-
-#include "modinit.h"
-#include "globals.h"
-
-static MODULESETUPPROTO(extmodSetup);
-
-/*
- * Array describing extensions to be initialized
- */
-ExtensionModule extensionModules[] = {
-#ifdef SHAPE
-    {
-	ShapeExtensionInit,
-	SHAPENAME,
-	&noShapeExtension,
-	NULL,
-	NULL
-    },
-#endif
-#ifdef notyet
-    {
-	XTestExtensionInit,
-	XTestExtensionName,
-	&noTestExtensions,
-	NULL,
-	NULL
-    },
-#endif
-#ifdef BIGREQS
-     {
-	BigReqExtensionInit,
-	XBigReqExtensionName,
-	&noBigReqExtension,
-	NULL,
-	NULL
-     },
-#endif
-#ifdef XSYNC
-    {
-	SyncExtensionInit,
-	SYNC_NAME,
-	&noSyncExtension,
-	NULL,
-	NULL
-    },
-#endif
-#ifdef SCREENSAVER
-    {
-	ScreenSaverExtensionInit,
-	ScreenSaverName,
-	&noScreenSaverExtension,
-	NULL,
-	NULL
-    },
-#endif
-#ifdef DPMSExtension
-    {
-	DPMSExtensionInit,
-	DPMSExtensionName,
-	&noDPMSExtension,
-	NULL,
-	NULL
-    },
-#endif
-#ifdef XV
-    {
-	XvExtensionInit,
-	XvName,
-	&noXvExtension,
-	XvRegister,
-	NULL
-    },
-    {
-        XvMCExtensionInit,
-        XvMCName,
-        &noXvExtension,
-        NULL,
-        NULL
-    },
-#endif
-#ifdef RES
-    {
-        ResExtensionInit,
-        XRES_NAME, 
-        &noResExtension,
-        NULL,
-        NULL
-    },
-#endif
-    {				/* 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
- */
-XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL };
-
-static void *
-extmodSetup(void * module, void * opts, int *errmaj, int *errmin)
-{
-    int i;
-
-    /* XXX the option stuff here is largely a sample/test case */
-
-    for (i = 0; extensionModules[i].name != NULL; i++) {
-	if (opts) {
-	    char *s;
-	    s = (char *)malloc(strlen(extensionModules[i].name) + 5);
-	    if (s) {
-		void * o;
-		strcpy(s, "omit");
-		strcat(s, extensionModules[i].name);
-		o = xf86FindOption(opts, s);
-		free(s);
-		if (o) {
-		    xf86MarkOptionUsed(o);
-		    continue;
-		}
-	    }
-	}
-	LoadExtension(&extensionModules[i], FALSE);
-    }
-    /* Need a non-NULL return */
-    return (void *)1;
-}
-
-#endif /* XFree86LOADER */

nx-X11/programs/Xserver/Xext/extmod/modinit.h

-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifdef SHAPE
-extern void ShapeExtensionInit(void);
-#include <X11/extensions/shapeproto.h>
-#endif
-
-#ifdef XTEST
-extern void XTestExtensionInit(void);
-#define _XTEST_SERVER_
-#include <nx-X11/extensions/xtestconst.h>
-#include <nx-X11/extensions/xteststr.h>
-#endif
-
-#if 1
-extern void XTestExtension1Init(void);
-#endif
-
-#ifdef BIGREQS
-extern void BigReqExtensionInit(void);
-#include <nx-X11/extensions/bigreqstr.h>
-#endif
-
-#ifdef XSYNC
-extern void SyncExtensionInit(void);
-#define _SYNC_SERVER
-#include <nx-X11/extensions/sync.h>
-#include <nx-X11/extensions/syncstr.h>
-#endif
-
-#ifdef SCREENSAVER
-extern void ScreenSaverExtensionInit (void);
-#include <nx-X11/extensions/saver.h>
-#endif
-
-#ifdef XCMISC
-extern void XCMiscExtensionInit(void);
-#include <nx-X11/extensions/xcmiscstr.h>
-#endif
-
-#ifdef DPMSExtension
-extern void DPMSExtensionInit(void);
-#include <nx-X11/extensions/dpmsstr.h>
-#endif
-
-#ifdef XV
-extern void XvExtensionInit(void);
-extern void XvMCExtensionInit(void);
-extern void XvRegister(void);
-#include <nx-X11/extensions/Xv.h>
-#include <nx-X11/extensions/XvMC.h>
-#endif
-
-#ifdef RES
-extern void ResExtensionInit(void);
-#include <nx-X11/extensions/XResproto.h>
-#endif
-
-#ifdef SHM
-extern void ShmExtensionInit(void);
-#include <X11/extensions/shmproto.h>
-extern void ShmSetPixmapFormat(
-    ScreenPtr pScreen,
-    int format);
-extern void ShmRegisterFuncs(
-    ScreenPtr pScreen,
-    ShmFuncsPtr funcs);
-#endif
-
-#if 1
-extern void SecurityExtensionInit(void);
-#endif
-
-#if 1
-extern void XagExtensionInit(void);
-#endif
-
-#if 1
-extern void XpExtensionInit(void);
-#endif
-
-#if 1
-extern void PanoramiXExtensionInit(int argc, char *argv[]);
-#endif
-
-#if 1
-extern void XkbExtensionInit(void);
-#endif

nx-X11/programs/Xserver/Xext/panoramiX.c

@@ -55,7 +55,6 @@ Equipment Corporation.
 #ifdef RENDER
 #include "picturestr.h"
 #endif
-#include "modinit.h"
 #include "protocol-versions.h"
 
 #ifdef GLXPROXY

nx-X11/programs/Xserver/Xext/saver.c

@@ -59,8 +59,6 @@ in this Software without prior written authorization from the X Consortium.
 #include <stdio.h>
 #endif
 
-#include "modinit.h"
-
 #include "protocol-versions.h"
 
 #if 0

nx-X11/programs/Xserver/Xext/security.c

@@ -112,8 +112,6 @@ static char _NXPolicyFilePath[1024];
 
 #endif
 
-#include "modinit.h"
-
 static int SecurityErrorBase;  /* first Security error number */
 static int SecurityEventBase;  /* first Security event number */
 

nx-X11/programs/Xserver/Xext/shape.c

@@ -46,7 +46,6 @@ in this Software without prior written authorization from The Open Group.
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
 #endif
-#include "modinit.h"
 
 typedef	RegionPtr (*CreateDftPtr)(
 	WindowPtr /* pWin */

nx-X11/programs/Xserver/Xext/shm.c

@@ -68,8 +68,6 @@ in this Software without prior written authorization from The Open Group.
 #include "panoramiXsrv.h"
 #endif
 
-#include "modinit.h"
-
 typedef struct _ShmDesc {
     struct _ShmDesc *next;
     int shmid;

nx-X11/programs/Xserver/Xext/sync.c

@@ -77,8 +77,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #endif
 #endif
 
-#include "modinit.h"
-
 /*
  * Local Global Variables
  */

nx-X11/programs/Xserver/Xext/xcmisc.c

@@ -38,7 +38,6 @@ from The Open Group.
 #include "extnsionst.h"
 #include "swaprep.h"
 #include <nx-X11/extensions/xcmiscstr.h>
-#include "modinit.h"
 
 #include <stdint.h>
 

nx-X11/programs/Xserver/Xext/xres.c

@@ -15,7 +15,6 @@
 #include "swaprep.h"
 #include <nx-X11/extensions/XResproto.h>
 #include "pixmapstr.h"
-#include "modinit.h"
 #include "protocol-versions.h"
 
 static int

nx-X11/programs/Xserver/Xext/xtest.c

@@ -54,8 +54,6 @@ from The Open Group.
 #include "xf86_ansic.h"
 #endif
 
-#include "modinit.h"
-
 #if 0
 static unsigned char XTestReqCode;
 #endif

nx-X11/programs/Xserver/Xext/xtest1di.c

@@ -71,7 +71,6 @@ University of California.
 #include "opaque.h"
 #define  XTestSERVER_SIDE
 #include <nx-X11/extensions/xtestext1.h>
-#include "modinit.h"
 
 #include "xtest1dd.h"
 

nx-X11/programs/Xserver/xkb/Imakefile

@@ -65,8 +65,6 @@ AllTarget($(XF86_OBJS))
 
 SpecialCObjectRule(xkbInit,$(ICONFIGFILES),$(XKB_DEFINES))
 
-LinkSourceFile(modinit.h,../Xext/extmod)
-
 #if BuildLibraries
 #if UseConfDirForXkb
 LinkConfDirectory(xkb,.,xkb,.)