Merge branch 'pr/unused_files' into 3.6.x

Attributes GH PR #267: https://github.com/ArcticaProject/nx-libs/pull/267

Merge branch 'pr/unused_files' into 3.6.x
1d1d1fc2 · Mike Gabriel · 6eb8d3ec · 7d884049 · 1d1d1fc2 · 1d1d1fc2
Unverified Commit 1d1d1fc2 authored Nov 02, 2016 by Mike Gabriel
82 changed files
--- a/debian/nx-x11proto-core-dev.install
+++ b/debian/nx-x11proto-core-dev.install
@@ -18,6 +18,5 @@ usr/include/*/nx-X11/Xpoll.h
 usr/include/*/nx-X11/Xproto.h
 usr/include/*/nx-X11/Xprotostr.h
 usr/include/*/nx-X11/Xthreads.h
-usr/include/*/nx-X11/ap_keysym.h
 usr/include/*/nx-X11/keysym.h
 usr/include/*/nx-X11/keysymdef.h
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,6 @@ override_dh_install:

 	# remove extras, GL, and other unneeded headers
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/GL/
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XInput.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XK*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/*Xv*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XRes*.h

--- a/nx-X11/config/cf/Imake.rules
+++ b/nx-X11/config/cf/Imake.rules
@@ -3419,42 +3419,25 @@ MutexDirective:	targets
 * ObjectModuleTarget - build a module as a single object file
 */
 #ifndef ObjectModuleTarget
-#if MakeDllModules && DoLoadableServer
-#define ObjectModuleTarget(module,objects)				@@\
-DynamicModuleTarget(Concat(module,_drv.so), objects)
-#else
 #define ObjectModuleTarget(module,objects)				@@\
 NormalRelocatableTarget(Concat(module,_drv), objects)
 #endif
-#endif

 /*
 * LibraryModuleTarget
 */
 #ifndef LibraryModuleTarget
-#if MakeDllModules && DoLoadableServer
-#define LibraryModuleTarget(module,objects)				@@\
-NormalLibraryTarget(module, objects)					@@\
-DynamicModuleTarget(Concat3(lib,module,.so), objects)
-#else
 #define LibraryModuleTarget(module, objects)				@@\
 NormalLibraryTarget(module, objects)
 #endif
-#endif

 /*
 * DepLibraryModuleTarget
 */
 #ifndef DepLibraryModuleTarget
-#if MakeDllModules && DoLoadableServer
-#define DepLibraryModuleTarget(module,deplist,objects)			@@\
-NormalDepLibraryTarget(module, deplist, objects)			@@\
-DepDynamicModuleTarget(Concat3(lib,module,.so), deplist, objects)
-#else
 #define DepLibraryModuleTarget(module,deplist,objects)			@@\
 NormalDepLibraryTarget(module, deplist, objects)
 #endif
-#endif

 /*
 * DynamicModuleTarget - build a module to be dynamically loaded
@@ -3532,31 +3515,11 @@ InstallObjectModule(module,dest,multimedia)
 #endif

 #ifndef InstallObjectModule
-#if !DoLoadableServer
 #define InstallObjectModule(module,dest,subdir)	/**/
-#else
-#if MakeDllModules
-#define InstallObjectModule(module,dest,subdir)				@@\
-InstallDynamicModule(Concat(module,_drv.so),dest,subdir)
-#else
-#define InstallObjectModule(module,dest,subdir)				@@\
-InstallDynamicModule(Concat(module,_drv.o),dest,subdir)
-#endif
-#endif
 #endif

 #ifndef InstallLibraryModule
-#if !DoLoadableServer
 #define InstallLibraryModule(module,dest,subdir)	/**/
-#else
-#if MakeDllModules
-#define InstallLibraryModule(module,dest,subdir)			@@\
-InstallDynamicModule(Concat3(lib,module,.so),dest,subdir)
-#else
-#define InstallLibraryModule(module,dest,subdir)			@@\
-InstallDynamicModule(ModuleLibraryTargetName(module),dest,subdir)
-#endif
-#endif
 #endif

 #ifndef InstallModuleManPage

--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -293,12 +293,6 @@ XCOMM the platform-specific parameters - edit site.def to change
 #define HasCookieMaker	NO
 #endif

-#ifndef DoLoadableServer
-#define DoLoadableServer NO
-#endif
-#ifndef MakeDllModules
-#define MakeDllModules NO
-#endif
 #ifndef StripInstalledPrograms
 #define StripInstalledPrograms NO	/* leave symbol table just in case */
 #endif

--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -300,23 +300,6 @@
 */

 /*
- * Build a server that dynamically loads the modules by setting
- * this to YES.  This defaults to YES on most platforms.  A static server
- * can be built by setting this to NO.
- *
-#define DoLoadableServer	NO
- */
-
-/*
- * This release defaults to building dlopen() style modules instead of the 
- * previously standard loader modules.
- * 
- * Uncomment the following to return to the XFree86 custom loader modules.
- *
-#define MakeDllModules		NO
- */
-
-/*
 * Build XAA.  This can be disabled with:
 *
 #define XF86XAA			NO

--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -462,26 +462,12 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 # endif
 #endif

-#if UseElfFormat
-# ifndef DoLoadableServer
-#  if defined(MipsArchitecture) || defined(SuperHArchitecture)
-#   define DoLoadableServer	NO
-#  else
-#   define DoLoadableServer	YES
-#  endif
-# endif
-#endif
-
-
 #if LinuxElfDefault
 # if UseElfFormat
 #  ifdef MipsArchitecture
 #   ifndef AsCmd
 #     define AsCmd		gcc -c -x assembler-with-cpp
 #   endif
-#   ifndef MakeDllModules
-#     define MakeDllModules	YES
-#   endif
 #  endif /* MipsArchitecure */
 #  if defined (i386Architecture) && ((GccMajorVersion >3) \
   || ((GccMajorVersion == 3) &&  (GccMinorVersion >= 1)))
@@ -840,9 +826,6 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 # define LinuxMachineDefines	-D__sh__
 # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-# ifndef DoLoadableServer
-#  define DoLoadableServer NO
-# endif
 #endif

 #ifdef AMD64Architecture

--- a/nx-X11/config/cf/xf86.rules
+++ b/nx-X11/config/cf/xf86.rules
@@ -74,149 +74,54 @@ clean::									@@\
 */

 #ifndef InstallDriverSDKNonExecFile
-#if !DoLoadableServer
 #define InstallDriverSDKNonExecFile(file,dest)				/**/
-#else
-#define InstallDriverSDKNonExecFile(file,dest)				@@\
-install.sdk:: file							@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTDATFLAGS) file $(DESTDIR)dest
-#endif
 #endif

 #ifndef InstallDriverSDKLibrary
-#if !DoLoadableServer
 #define InstallDriverSDKLibrary(libname,dest)				/**/
-#else
-#define InstallDriverSDKLibrary(libname,dest)				@@\
-install.sdk:: Concat(lib,libname.a)					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.a) $(DESTDIR)dest @@\
-	RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,libname.a))
-#endif
 #endif

 #ifndef InstallDriverSDKNamedLibrary
-#if !DoLoadableServer
 #define InstallDriverSDKNamedLibrary(libname,dlibname,dest)		/**/
-#else
-#define InstallDriverSDKNamedLibrary(libname,dlibname,dest)		@@\
-install.sdk:: Concat(lib,libname.a)					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.a) \		@@\
-	  Concat($(DESTDIR)dest/lib,dlibname.a)				@@\
-	RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,dlibname.a))
-#endif
 #endif

 #ifndef InstallDriverSDKNamedNonExec
-#if !DoLoadableServer
 #define InstallDriverSDKNamedNonExec(srcname,dstname,dest)		/**/
-#else
-#define InstallDriverSDKNamedNonExec(srcname,dstname,dest)		@@\
-install.sdk:: srcname							@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTDATFLAGS) srcname $(DESTDIR)dest/dstname
-#endif
 #endif

 #ifndef InstallDriverSDKNamedProg
-#if !DoLoadableServer
 #define InstallDriverSDKNamedProg(srcname,dstname,dest)			/**/
-#else
-#define InstallDriverSDKNamedProg(srcname,dstname,dest)			@@\
-install.sdk:: srcname							@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTBINFLAGS) srcname $(DESTDIR)dest/dstname
-#endif
 #endif

 #ifndef InstallDriverSDKSubdirs
-#if !DoLoadableServer
 #define InstallDriverSDKSubdirs(dirs)					/**/
-#else
-#define InstallDriverSDKSubdirs(dirs) \
-NamedTargetSubdirs(install.sdk,dirs,"installing driver SDK",DESTDIR='$(DESTDIR)',install.sdk)
-#endif
 #endif

 #ifndef InstallDriverSDKMultipleDestFlags
-#if !DoLoadableServer
 #define InstallDriverSDKMultipleDestFlags(list,dest,flags)		/**/
-#else
-#define InstallDriverSDKMultipleDestFlags(list,dest,flags) \
-InstallMultipleDestFlags(install.sdk,list,dest,flags)
-#endif
 #endif

 #ifndef InstallDriverSDKDynamicModule
-#if !DoLoadableServer
 #define InstallDriverSDKDynamicModule(module,dest,subdir)		/**/
-#else
-#define InstallDriverSDKDynamicModule(module,dest,subdir)		@@\
-install.sdk:: module							@@\
-	MakeDir($(DESTDIR)dest/subdir)					@@\
-	$(INSTALL) -c module $(DESTDIR)dest/subdir
-#endif
 #endif

 #ifndef InstallDriverSDKObjectModule
-#if !DoLoadableServer
 #define InstallDriverSDKObjectModule(module,dest,subdir)		/**/
-#else
-#if MakeDllModules
-#define InstallDriverSDKObjectModule(module,dest,subdir)		@@\
-InstallDriverSDKDynamicModule(Concat(module,_drv.so),dest,subdir)
-#else
-#define InstallDriverSDKObjectModule(module,dest,subdir)		@@\
-InstallDriverSDKDynamicModule(Concat(module,_drv.o),dest,subdir)
-#endif
-#endif
 #endif


 #ifndef InstallDriverSDKObjectSubModule
-#if !DoLoadableServer
 #define InstallDriverSDKObjectSubModule(module,dest,subdir)		/**/
-#else
-#if MakeDllModules
-#define InstallDriverSDKObjectSubModule(module,dest,subdir)		@@\
-InstallDriverSDKDynamicModule(Concat(module,.so),dest,subdir)
-#else
-#define InstallDriverSDKObjectSubModule(module,dest,subdir)		@@\
-InstallDriverSDKDynamicModule(Concat(module,.o),dest,subdir)
-#endif
-#endif
 #endif

 #ifndef InstallDriverSDKLibraryModule
-#if !DoLoadableServer
 #define InstallDriverSDKLibraryModule(module,dest,subdir)		/**/
-#else
-#if MakeDllModules
-#define InstallDriverSDKLibraryModule(module,dest,subdir)		@@\
-InstallDriverSDKDynamicModule(Concat3(lib,module,.so),dest,subdir)
-#else
-#define InstallDriverSDKLibraryModule(module,dest,subdir)		@@\
-InstallDriverSDKDynamicModule(ModuleLibraryTargetName(module),dest,subdir)
-#endif
-#endif
 #endif

 #ifndef ServerDriverSDKTarget
-#if !DoLoadableServer
 #define ServerDriverSDKTarget(program)					/**/
-#else
-#define ServerDriverSDKTarget(program)					@@\
-InstallDriverSDKProgramWithFlags(program,$(DRIVERSDKDIR),$(_NOOP_))
-#endif
 #endif

 #ifndef InstallDriverSDKProgramWithFlags
-#if !DoLoadableServer
 #define InstallDriverSDKProgramWithFlags(program,dest,flags)		/**/
-#else
-#define InstallDriverSDKProgramWithFlags(program,dest,flags)		@@\
-InstallTarget(install.sdk,ProgramTargetName(program),$(INSTPGMFLAGS) flags,dest)
-#endif
 #endif
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -201,18 +201,6 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
 #define BuildModuleInSubdir	NO
 #endif

-#ifndef DoLoadableServer
-#define DoLoadableServer	NO
-#endif
-
-#ifndef MakeDllModules
-#if DoLoadableServer
-#define MakeDllModules		YES
-#else
-#define MakeDllModules		NO
-#endif
-#endif 
-
 /*
 * Default settings for which X Servers to build.
 */
@@ -337,10 +325,6 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
 #ifndef XorgServer
 # define XorgServer		NO
 #endif
-#if !XorgServer
-# undef DoLoadableServer
-# define DoLoadableServer	NO
-#endif

 /*
 * Fbdev module defines.  They are set to indicate the fb types supported
@@ -569,18 +553,10 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif

 #ifndef ExtraLoaderDefines
-# if MakeDllModules
-#  define ExtraLoaderDefines	DlopenHack
-# else
 #  define ExtraLoaderDefines	/**/
-# endif
 #endif

-#if DoLoadableServer
-# define XFree86LoaderDefines	-DXFree86LOADER ExtraLoaderDefines
-#else
 # define XFree86LoaderDefines	/**/
-#endif

 #ifndef HasBsdMake
 #define HasBsdMake		NO

--- a/nx-X11/config/cf/xorg.tmpl
+++ b/nx-X11/config/cf/xorg.tmpl
@@ -64,79 +64,4 @@ BUILDERADDR = "xorg@lists.freedesktop.org"
 #define HasGccMergeConstants	NO
 #endif

-#if HasGccMergeConstants && DoLoadableServer && !MakeDllModules
-MODULE_GCC_FLAGS = -fno-merge-constants
-#endif
-
-#if defined(IHaveModules) && MakeDllModules
-MODULE_PIC_FLAGS = $(PICFLAGS)
-#endif
-
 MODULE_CFLAGS = $(MODULE_PIC_FLAGS) $(MODULE_GCC_FLAGS)
-
-#if defined(IHaveModules)
-# if DoLoadableServer
-MODULE_DEFINES = -DIN_MODULE -DXFree86Module
-# else
-MODULE_DEFINES = -DXFree86Module
-# endif
-#endif
-
-#if defined(IHaveModules) && DoLoadableServer
-
-/* This overrides the ObjCompile in Imake.rules! */
-#undef ObjectCompile
-#define ObjectCompile(options) RemoveFile($@)                           @@\
-	ClearmakeOSName\
-	$(MODCC) $(MODCFLAGS) options -c $*.c
-
-/* This overrides an AssembleObject in xf86.rules or in an os-dependent
- * rules file (currently only minix.cf and os2.rules (uncritical))
- */
-#define ModCPPOnlyAsm(basename,options) RemoveFile(basename.i)		@@\
-	$(MODCPP) AsmDefines $(DEFINES) $(INCLUDES) options basename.S | \	@@\
-		grep -v '^\#' > basename.i
-
-#undef AssembleObject
-#define AssembleObject(basename,flags) ModCPPOnlyAsm(basename,flags)	@@\
-	RemoveFile(basename.o)						@@\
-	$(MODAS) $(MODASFLAGS) -o basename.o basename.i			@@\
-	RemoveFile(basename.i)
-
-/* This overrides the NormalRelocatableTarget in Imake.rules */
-#undef NormalRelocatableTarget
-#define	NormalRelocatableTarget(objname,objlist)			@@\
-AllTarget(objname.Osuf)							@@\
-									@@\
-objname.Osuf: objlist $(EXTRALIBRARYDEPS)				@@\
-	RemoveFile($@)							@@\
-	$(MODLD) $(MODLDCOMBINEFLAGS) objlist -o $@
-
-/* This overrides the NormalDepRelocatableTarget in Imake.rules */
-#undef NormalDepRelocatableTarget
-#define	NormalDepRelocatableTarget(objname,deplist,objlist)		@@\
-AllTarget(objname.Osuf)							@@\
-									@@\
-objname.Osuf: deplist $(EXTRALIBRARYDEPS)				@@\
-	RemoveFile($@)							@@\
-	$(MODLD) $(MODLDCOMBINEFLAGS) objlist -o $@
-
-/* This overrides the RanLibrary in Imake.rules */
-#if DoRanlibCmd || NeedModuleRanlib
-#undef RanLibrary
-#define RanLibrary(args) $(MODRANLIB) args
-#endif
-
-/* This overrides the MakeLibrary rule in Imake.rules */
-#undef MakeLibrary
-#define MakeLibrary(libname,objlist) $(MODAR) libname objlist
-
-/* This overrides the LibraryTargetName rule in Imake.rules */
-#undef LibraryTargetName
-#define LibraryTargetName(libname)Concat(lib,libname.a)
-
-/* This disables an OS/2 rule */
-#undef BuildLibSupportLibs
-#define BuildLibSupportLibs(dummy)
-
-#endif /* IHaveModules */
--- a/nx-X11/config/cf/xorgsite.def
+++ b/nx-X11/config/cf/xorgsite.def
@@ -169,23 +169,6 @@
 */

 /*
- * Build a server that dynamically loads the modules by setting
- * this to YES.  This defaults to YES on most platforms.  A static server
- * can be built by setting this to NO.
- *
-#define DoLoadableServer	NO
- */
-
-/*
- * This release defaults to building dlopen() style modules instead of the 
- * previously standard loader modules.
- * 
- * Uncomment the following to return to the XFree86 custom loader modules.
- *
-#define MakeDllModules		NO
- */
-
-/*
 * Build XAA.  This can be disabled with:
 *
 #define XF86XAA			NO

--- a/nx-X11/include/GL/Imakefile
+++ b/nx-X11/include/GL/Imakefile
@@ -3,7 +3,7 @@ LinkSourceFile(glext.h, $(MESASRCDIR)/include/GL)
 LinkSourceFile(glxext.h, $(MESASRCDIR)/include/GL)
 LinkSourceFile(osmesa.h, $(MESASRCDIR)/include/GL)

-GLXHEADERS = gl.h glext.h glu.h glx.h glxint.h glxmd.h glxproto.h \
+GLXHEADERS = gl.h glext.h glx.h glxint.h glxmd.h glxproto.h \
 	     glxtokens.h osmesa.h glxext.h

 HEADERS = $(GLXHEADERS)

--- a/nx-X11/include/GL/glu.h
+++ b/nx-X11/include/GL/glu.h
--- a/nx-X11/include/Imakefile
+++ b/nx-X11/include/Imakefile
@@ -38,7 +38,6 @@ HEADERS = \
 	Xproto.h \
 	Xprotostr.h \
 	Xthreads.h \
-	ap_keysym.h \
 	keysym.h \
 	keysymdef.h \
 	$(AU_HEADERS) \

--- a/nx-X11/include/ap_keysym.h
+++ b/nx-X11/include/ap_keysym.h
-/******************************************************************
-Copyright 1987 by Apollo Computer Inc., Chelmsford, Massachusetts.
-Copyright 1989 by Hewlett-Packard Company.
-
-                        All Rights Reserved
-
-Permission to use, duplicate, change, and distribute this software and
-its documentation for any purpose and without fee is granted, provided
-that the above copyright notice appear in such copy and that this
-copyright notice appear in all supporting documentation, and that the
-names of Apollo Computer Inc., the Hewlett-Packard Company, or the X
-Consortium not be used in advertising or publicity pertaining to
-distribution of the software without written prior permission.
-
-HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-PURPOSE.  Hewlett-Packard shall not be liable for errors 
-contained herein or direct, indirect, special, incidental or 
-consequential damages in connection with the furnishing, 
-performance, or use of this material.
-
-This software is not subject to any license of the American
-Telephone and Telegraph Company or of the Regents of the
-University of California.
-******************************************************************/
-
-#define apXK_LineDel            0x1000FF00
-#define apXK_CharDel            0x1000FF01
-#define apXK_Copy               0x1000FF02
-#define apXK_Cut                0x1000FF03
-#define apXK_Paste              0x1000FF04
-#define apXK_Move               0x1000FF05
-#define apXK_Grow               0x1000FF06
-#define apXK_Cmd                0x1000FF07
-#define apXK_Shell              0x1000FF08
-#define apXK_LeftBar            0x1000FF09
-#define apXK_RightBar           0x1000FF0A
-#define apXK_LeftBox            0x1000FF0B
-#define apXK_RightBox           0x1000FF0C
-#define apXK_UpBox              0x1000FF0D
-#define apXK_DownBox            0x1000FF0E
-#define apXK_Pop                0x1000FF0F
-#define apXK_Read               0x1000FF10
-#define apXK_Edit               0x1000FF11
-#define apXK_Save               0x1000FF12
-#define apXK_Exit               0x1000FF13
-#define apXK_Repeat             0x1000FF14
-
-#define apXK_KP_parenleft       0x1000FFA8
-#define apXK_KP_parenright      0x1000FFA9
--- a/nx-X11/include/extensions/Imakefile
+++ b/nx-X11/include/extensions/Imakefile
@@ -8,8 +8,8 @@ SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
 XF86BIGFONTHEADERS = xf86bigfont.h xf86bigfproto.h
 #endif
 #if BuildXvExt
-XVHEADERS = Xv.h Xvlib.h Xvproto.h
-XVMCHEADERS = XvMC.h XvMClib.h XvMCproto.h vldXvMC.h
+XVHEADERS = Xv.h Xvproto.h
+XVMCHEADERS = XvMC.h XvMCproto.h
 #endif
 #if BuildXinerama
 XINERAMAHEADERS = panoramiXext.h panoramiXproto.h
@@ -53,7 +53,7 @@ EXTRAHEADERS = \
 HEADERS = \
 	xcmiscstr.h \
 	bigreqstr.h \
-	XI.h XInput.h XIproto.h \
+	XI.h XIproto.h \
 	xtestconst.h xtestext1.h xteststr.h \
 	XKB.h XKBgeom.h XKBproto.h XKBstr.h XKBsrv.h \
 	Xdbeproto.h \
@@ -80,7 +80,4 @@ InstallDriverSDKNonExecFile(dpms.h,$(DRIVERSDKINCLUDEDIR)/extensions)
 InstallDriverSDKNonExecFile(renderproto.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/extensions)
 InstallDriverSDKNonExecFile(XvMC.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(vldXvMC.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(Xvlib.h,$(DRIVERSDKINCLUDEDIR)/extensions)
 InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/X11/extensions)
-InstallDriverSDKNonExecFile(Xvlib.h,$(DRIVERSDKINCLUDEDIR)/X11/extensions)
--- a/nx-X11/include/extensions/XInput.h
+++ b/nx-X11/include/extensions/XInput.h
--- a/nx-X11/include/extensions/XvMClib.h
+++ b/nx-X11/include/extensions/XvMClib.h
-
-#ifndef _XVMCLIB_H_
-#define _XVMCLIB_H_
-
-#include <nx-X11/Xfuncproto.h>
-#include <nx-X11/extensions/Xvlib.h>
-#include <nx-X11/extensions/XvMC.h>
-
-_XFUNCPROTOBEGIN
-
-Bool XvMCQueryExtension (Display *display, int *eventBase, int *errBase);
-Status XvMCQueryVersion (Display *display, int *major_versionp,
-			 int *minor_versionp);
-Status XvMCGetDRInfo(Display *dpy, XvPortID port,
-		     char **name, char **busID, 
-		     int *major, int *minor, 
-		     int *patchLevel,
-		     int *isLocal);
-
-
-XvMCSurfaceInfo * XvMCListSurfaceTypes(Display *dpy, XvPortID port, int *num);
-
-Status XvMCCreateContext (
-   Display *display,
-   XvPortID port,
-   int surface_type_id,
-   int width,
-   int height,
-   int flags,
-   XvMCContext * context
-);
-
-Status XvMCDestroyContext (Display *display, XvMCContext * context);
-
-Status 
-XvMCCreateSurface(
-  Display *display,
-  XvMCContext * context,
-  XvMCSurface * surface
-);
-
-Status XvMCDestroySurface(Display *display, XvMCSurface *surface);
-
-XvImageFormatValues * XvMCListSubpictureTypes (
-  Display * display,
-  XvPortID port,
-  int surface_type_id,
-  int *count_return
-);
-
-Status
-XvMCPutSurface(
-  Display *display,
-  XvMCSurface *surface,
-  Drawable draw,
-  short srcx, 
-  short srcy, 
-  unsigned short srcw, 
-  unsigned short srch,
-  short destx,
-  short desty,
-  unsigned short destw,
-  unsigned short desth,
-  int flags
-);
-
-Status XvMCHideSurface(Display *display, XvMCSurface *surface);
-
-Status
-XvMCCreateSubpicture (
-   Display *display, 
-   XvMCContext *context,
-   XvMCSubpicture *subpicture, 
-   unsigned short width,
-   unsigned short height,
-   int xvimage_id
-);
-
-
-Status
-XvMCClearSubpicture (
-  Display *display,
-  XvMCSubpicture *subpicture,
-  short x,
-  short y,
-  unsigned short width,
-  unsigned short height,
-  unsigned int color
-);
-
-Status
-XvMCCompositeSubpicture (
-   Display *display,
-   XvMCSubpicture *subpicture,
-   XvImage *image,
-   short srcx,
-   short srcy,
-   unsigned short width,
-   unsigned short height,
-   short dstx,
-   short dsty
-);
-
-Status
-XvMCDestroySubpicture (Display *display, XvMCSubpicture *subpicture);
-
-Status
-XvMCSetSubpicturePalette (
-  Display *display, 
-  XvMCSubpicture *subpicture, 
-  unsigned char *palette
-);
-
-Status
-XvMCBlendSubpicture (
-   Display *display,
-   XvMCSurface *target_surface,
-   XvMCSubpicture *subpicture,
-   short subx,
-   short suby,
-   unsigned short subw,
-   unsigned short subh,
-   short surfx,
-   short surfy,
-   unsigned short surfw,
-   unsigned short surfh
-);
-
-Status
-XvMCBlendSubpicture2 (
-   Display *display,
-   XvMCSurface *source_surface,
-   XvMCSurface *target_surface,
-   XvMCSubpicture *subpicture,
-   short subx,
-   short suby,
-   unsigned short subw,
-   unsigned short subh,
-   short surfx,
-   short surfy,
-   unsigned short surfw,
-   unsigned short surfh
-);
-
-Status XvMCSyncSurface (Display *display, XvMCSurface *surface);
-Status XvMCFlushSurface (Display *display, XvMCSurface *surface);
-Status XvMCGetSurfaceStatus (Display *display, XvMCSurface *surface, int *stat);
-
-Status XvMCRenderSurface ( 
-   Display *display,
-   XvMCContext *context,
-   unsigned int picture_structure,
-   XvMCSurface *target_surface,
-   XvMCSurface *past_surface,
-   XvMCSurface *future_surface,
-   unsigned int flags,
-   unsigned int num_macroblocks,
-   unsigned int first_macroblock,
-   XvMCMacroBlockArray *macroblock_array,
-   XvMCBlockArray *blocks
-);
-
-
-Status XvMCSyncSubpicture (Display *display, XvMCSubpicture *subpicture);
-Status XvMCFlushSubpicture (Display *display, XvMCSubpicture *subpicture);
-Status
-XvMCGetSubpictureStatus (Display *display, XvMCSubpicture *subpic, int *stat);
-
-Status XvMCCreateBlocks (
-   Display *display, 
-   XvMCContext *context,
-   unsigned int num_blocks,
-   XvMCBlockArray *block
-);
-
-Status XvMCDestroyBlocks (Display *display,XvMCBlockArray *block);
-
-Status XvMCCreateMacroBlocks (
-   Display *display,
-   XvMCContext *context,
-   unsigned int num_blocks,
-   XvMCMacroBlockArray *blocks
-);
-
-Status XvMCDestroyMacroBlocks (
-   Display *display,
-   XvMCMacroBlockArray *block
-);
-
-XvAttribute *
-XvMCQueryAttributes (
-    Display *display,
-    XvMCContext *context,
-    int *number
-);
-
-Status
-XvMCSetAttribute (
-    Display *display,
-    XvMCContext *context, 
-    Atom attribute, 
-    int value
-);
-
-Status
-XvMCGetAttribute (
-    Display *display,
-    XvMCContext *context, 
-    Atom attribute, 
-    int *value
-);
-
-_XFUNCPROTOEND
-
-#endif
--- a/nx-X11/include/extensions/Xvlib.h
+++ b/nx-X11/include/extensions/Xvlib.h
--- a/nx-X11/include/extensions/vldXvMC.h
+++ b/nx-X11/include/extensions/vldXvMC.h
-/*****************************************************************************
- * VLD XvMC Nonstandard extension API.
- *
- * Copyright (c) 2004 The Unichrome Project. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- * 
- * Author: Thomas Hellström, 2004.
- */
-
-
-#ifndef _VLDXVMC_H
-#define _VLDXVMC_H
-
-#include <nx-X11/Xlib.h>
-#include <nx-X11/extensions/XvMC.h>
-#include <nx-X11/extensions/XvMClib.h>
-
-/* 
- * New "Motion compensation type".
- */
-
-#define XVMC_VLD 0x0020000
-
-/*
- * Below Flags to be passed in the XvMCMpegControl structure 'flag' field.
- */
-
-#define XVMC_PROGRESSIVE_SEQUENCE 0x00000010
-
-/*
- * Zig-Zag Scan / Alternative Scan.
- */
-
-#define XVMC_ZIG_ZAG_SCAN         0x00000000
-#define XVMC_ALTERNATE_SCAN       0x00000100
-
-/*
- * Frame DCT and frame prediction are used. /
- * Field prediction
- */
-
-#define XVMC_PRED_DCT_FRAME       0x00000040
-#define XVMC_PRED_DCT_FIELD       0x00000000
-
-/*
- * Top / Bottom field first
- */
-
-#define XVMC_TOP_FIELD_FIRST      0x00000080
-#define XVMC_BOTTOM_FIELD_FIRST   0x00000000
-
-/*
- * Motion vectors coded in intra macroblocks
- */
-
-#define XVMC_CONCEALMENT_MOTION_VECTORS 0x00000200
-
-/*
- * Which of two mappings between quantiser_scale_code
- * and quantiser_scale shall apply.
- */ 
-
-#define XVMC_Q_SCALE_TYPE         0x00000400
-
-/*
- * Intra VLC Format: Bit = 0,  Bit = 1
- * Intra blocks      B-14      B-15
- * Non-intra blocks  B-14      B-14
- */
-#define XVMC_INTRA_VLC_FORMAT     0x00000800
-
-/*
- * Also XVMC_SECOND_FIELD should be set in flags if active. 
- */ 
-
-#define XVMC_I_PICTURE 1
-#define XVMC_P_PICTURE 2
-#define XVMC_B_PICTURE 3
-
-typedef struct _XvMCMpegControl{
-    unsigned 
-        BVMV_range,        /* Backward vertical motion vector range */
-	BHMV_range,        /* Backward horizontal motion vector range */
-	FVMV_range,        /* Forward vertical motion vector range */
-	FHMV_range,        /* Forward horizontal motion vector range */
-	picture_structure, /* XVMC_TOP_FIELD, XVMC_BOTTOM_FIELD, 
-			    *  XVMC_FRAME_PICTURE
-			    */
-	intra_dc_precision, /* 0x00 - 0x03 corresponds to 8 to 11 bits prec. */
-	picture_coding_type,/* XVMC_X_PICTURE */
-	mpeg_coding,        /* XVMC_MPEG_2 */
-	flags;              /* See above */
-}XvMCMpegControl;
-
-
-/*
- * The following function is called BEFORE starting sending slices to the
- * lib. It grabs the decoder hardware and prepares it for coming slices.
- * The function XvMCSyncSurface will release the hardware for other contexts
- * in addition to it's current functionality.
- */
-
-extern Status XvMCBeginSurface(Display *display,
-			       XvMCContext *context,
-			       XvMCSurface *target_surface,
-			       XvMCSurface *past_surface,
-			       XvMCSurface *future_surface,
-			       const XvMCMpegControl *control);
-
-
-/*
- * The quantizer matrix structure. This should be filled in by the user and
- * uploaded whenever a change is needed. The lib initializes with 
- * default matrices and will automatically load the hardware with new matrices
- * on decoder context switches. To load data, set the corresponding load flag
- * to true and fill in the values. The VIA MPEG2 engine only uses the
- * intra_quantiser_matrix and the non_intra_quantiser_matrix. 
- */
-    
-typedef struct _XvMCQMatrix {
-    int load_intra_quantiser_matrix;
-    int load_non_intra_quantiser_matrix;
-    int load_chroma_intra_quantiser_matrix;
-    int load_chroma_non_intra_quantiser_matrix;
-    unsigned char intra_quantiser_matrix[64];
-    unsigned char non_intra_quantiser_matrix[64];
-    unsigned char chroma_intra_quantiser_matrix[64];
-    unsigned char chroma_non_intra_quantiser_matrix[64];
-} XvMCQMatrix;
-
-/*
- * Upload a XvMCQMatrix structure to the clientlib. 
- * The hardware will start using it the next XvMCBeginSurface.
- */
-
-extern Status XvMCLoadQMatrix(Display *display, XvMCContext *context,
-			      const XvMCQMatrix *qmx);
-
-
-/*
- * Put a slice to the decoder. The hardware will start processing it 
- * immediately.
- */
-
-extern Status XvMCPutSlice(Display *display,XvMCContext *context, 
-			   char *slice, int nBytes);
-/*
- * Put a slice without the slice start code to the decoder. 
- * The hardware will start processing it 
- * immediately. This function is for client optimization. 
- * XvMCPutSlice(display,context,slice,nBytes) is equivalent to
- * XvMCPutSlice2(display,context,slice+4,nBytes-4,slice[3]);
- */
-
-extern Status XvMCPutSlice2(Display *display,XvMCContext *context, 
-			   char *slice, int nBytes, int sliceCode);
-
-#endif
--- a/nx-X11/lib/X11/X11-def.cpp
+++ b/nx-X11/lib/X11/X11-def.cpp
--- a/nx-X11/lib/X11/jump_funcs
+++ b/nx-X11/lib/X11/jump_funcs
--- a/nx-X11/lib/X11/jump_ignore
+++ b/nx-X11/lib/X11/jump_ignore
-# $Xorg: jump_ignore,v 1.3 2000/08/17 19:45:16 cpqbld Exp $
-#
-#
-#
-#
-# $XFree86: xc/lib/X11/jump_ignore,v 3.10 1999/05/30 02:27:59 dawes Exp $
-# jump_ignore
-00000000 T __XlcAddCT           libX11         lcCT
-00000000 T __XKeycodeToKeysym   libX11         KeyBind
-00000000 T __XKeysymToKeycode   libX11         KeyBind
-00000000 T __XLookupKeysym      libX11         KeyBind
-00000000 T __XRefreshKeyboardMapping libX11         KeyBind
-00000000 T __XLookupString      libX11         KeyBind
-00000000 T __XkbReloadDpy       libX11         XKBBind
-00000000 T __XkbReadGetCompatMapReply libX11         XKBCompat
-00000000 T __XkbKSToKnownSet    libX11         XKBCvt
-00000000 T __XkbKSToThai        libX11         XKBCvt
-00000000 T __XkbGetConverters   libX11         XKBCvt
-00000000 T __XkbGetCharset      libX11         XKBCvt
-00000000 T __XkbReadGetMapReply libX11         XKBGetMap
-00000000 T __XkbReadGetNamesReply libX11         XKBNames
-00000000 T __XkbInitReadBuffer  libX11         XKBRdBuf
-00000000 T __XkbSkipReadBufferData libX11         XKBRdBuf
-00000000 T __XkbCopyFromReadBuffer libX11         XKBRdBuf
-00000000 T __XkbReadCopyKeySyms libX11         XKBRdBuf
-00000000 T __XkbReadBufferCopyKeySyms libX11         XKBRdBuf
-00000000 T __XkbWriteCopyKeySyms libX11         XKBRdBuf
-00000000 T __XkbPeekAtReadBuffer libX11         XKBRdBuf
-00000000 T __XkbGetReadBufferPtr libX11         XKBRdBuf
-00000000 T __XkbFreeReadBuffer  libX11         XKBRdBuf
-00000000 T __XkbGetReadBufferCountedString libX11         XKBRdBuf
-00000000 T __XkbNoteCoreMapChanges libX11         XKBUse
-00000000 T __XkbReadGetIndicatorMapReply libX11         XKBleds
-00000000 T __XkbReadGetGeometryReply libX11         XKBGeom
-00000000 T __SendSetGeometry    libX11         XKBSetGeom
-00000000 T __XmbDefaultTextEscapement libX11         omDefault
-00000000 T __XwcDefaultTextEscapement libX11         omDefault
-00000000 T __XmbDefaultTextExtents libX11         omDefault
-00000000 T __XwcDefaultTextExtents libX11         omDefault
-00000000 T __XmbDefaultTextPerCharExtents libX11         omDefault
-00000000 T __XwcDefaultTextPerCharExtents libX11         omDefault
-00000000 T __XmbDefaultDrawString libX11         omDefault
-00000000 T __XwcDefaultDrawString libX11         omDefault
-00000000 T __XmbDefaultDrawImageString libX11         omDefault
-00000000 T __XwcDefaultDrawImageString libX11         omDefault
-00000000 T __XSnprintf libX11         snprintf
-00000000 T __XVsnprintf libX11         snprintf
-00000004 D __XkbInternAtomFunc  libX11         XKB
-00000004 D __XkbGetAtomNameFunc libX11         XKB
-00000000 T __XTextHeight        libX11         TextExt
-00000000 T __XTextHeight16      libX11         TextExt16
-00000000 T _default_ct_data_list libX11         lcCT
-00000000 T _default_ct_data_list_num libX11         lcCT
-00000000 T __XlcParsePath       libX11         lcFile
-00000000 T __XlcGetCodeSetFromName libX11         lcGenConv
-00000000 T __XlcParse_scopemaps libX11         lcGeneric
-00000000 T __XlcDbg_printValue  libX11         lcGeneric
-00000000 T _add_conversion      libX11         lcGeneric
-00000000 T __XlcJisLoader       libX11         lcJis
-00000000 T _parse_fontname      libX11         omGeneric
-00000000 T _destroy_fontdata    libX11         omGeneric
-00000000 T _read_EncodingInfo   libX11         omGeneric
-00000000 T __XomGetFontDataFromFontSet libX11         omXChar
-00000000 K __Xcyrillic          libX11         XKBCvt
-00000000 K __Xkoi8              libX11         XKBCvt
-00000000 K __Xkoi8u             libX11         XKBCvt
-00000000 K __Xgreek             libX11         XKBCvt
--- a/nx-X11/lib/X11/jump_vars
+++ b/nx-X11/lib/X11/jump_vars
-# $Xorg: jump_vars,v 1.3 2000/08/17 19:45:16 cpqbld Exp $
-#
-#
-#
-#
-# $XFree86: xc/lib/X11/jump_vars,v 3.1 1995/01/28 15:42:57 dawes Exp $
-#
-00008000 K __XkeyTable          libX11         XStrKeysym
-00000100 K __Xevent_to_mask     libX11         evtomask
-00000004 D __qfree              libX11         globals
-00000004 C __XIOErrorFunction   libX11         globals
-00000004 C __XErrorFunction     libX11         globals
-00000004 C __Xdebug             libX11         globals
-00000004 C __XHeadOfDisplayList libX11         globals
-00000040 D _XcmsCIELabColorSpace libX11         CIELab
-00000040 D _XcmsCIELuvColorSpace libX11         CIELuv
-00000040 D _XcmsCIEXYZColorSpace libX11         CIEXYZ
-00000040 D _XcmsCIEuvYColorSpace libX11         CIEuvY
-00000040 D _XcmsCIExyYColorSpace libX11         CIExyY
-00000040 D _XcmsTekHVCColorSpace libX11         TekHVC
-00000040 D _XcmsUNDEFINEDColorSpace libX11         UNDEFINED
-00000040 D __XcmsDIColorSpacesInit libX11         XcmsGlobls
-00000004 D __XcmsDIColorSpaces  libX11         XcmsGlobls
-00000020 D __XcmsDDColorSpacesInit libX11         XcmsGlobls
-00000004 D __XcmsDDColorSpaces  libX11         XcmsGlobls
-00000010 D __XcmsSCCFuncSetsInit libX11         XcmsGlobls
-00000004 D __XcmsSCCFuncSets    libX11         XcmsGlobls
-00000010 D __XcmsCIEXYZ_prefix   libX11         XcmsGlobls
-00000010 D __XcmsCIEuvY_prefix   libX11         XcmsGlobls
-00000010 D __XcmsCIExyY_prefix   libX11         XcmsGlobls
-00000010 D __XcmsCIELab_prefix   libX11         XcmsGlobls
-00000010 D __XcmsCIELuv_prefix   libX11         XcmsGlobls
-00000010 D __XcmsTekHVC_prefix   libX11         XcmsGlobls
-00000010 D __XcmsRGBi_prefix     libX11         XcmsGlobls
-00000010 D __XcmsRGB_prefix      libX11         XcmsGlobls
-00000080 D __XcmsRegColorSpaces libX11         XcmsGlobls
-00000040 D _XcmsRGBiColorSpace  libX11         XcmsLRGB
-00000040 D _XcmsRGBColorSpace   libX11         XcmsLRGB
-00000020 D _XcmsLinearRGBFunctionSet libX11         XcmsLRGB
-000000a8 D __X11TransSocketINETFuncs libX11         x11trans
-000000a8 D __X11TransSocketTCPFuncs libX11         x11trans
-000000a8 D __X11TransSocketUNIXFuncs libX11         x11trans
-000000a8 D __X11TransSocketLocalFuncs libX11         x11trans
-000000a8 D __XimXTransSocketINETFuncs libX11         ximtrans
-000000a8 D __XimXTransSocketTCPFuncs libX11         ximtrans
-000000a8 D __XimXTransSocketUNIXFuncs libX11         ximtrans
-000000a8 D __XimXTransSocketLocalFuncs libX11         ximtrans
-00000040 D __XimImSportRec      libX11         imImSw
-00000040 D __XimTransportRec    libX11         imTransR
-00000004 D __XlcGenericMethods  libX11         lcGeneric
-00000004 D __XlcPublicMethods   libX11         lcPublic
-00000004 D __SmcOpcode          libSM          sm_client
-00000004 D __SmsOpcode          libSM          sm_client
-00000004 D __SmVersionCount     libSM          sm_client
-00000018 D __SmcVersions        libSM          sm_client
-00000018 D __SmsVersions        libSM          sm_client
-00000004 D __SmAuthCount        libSM          sm_client
-00000004 D __SmAuthNames        libSM          sm_client
-00000004 D __SmcAuthProcs       libSM          sm_client
-00000004 D __SmsAuthProcs       libSM          sm_client
-00000004 D __SmcErrorHandler    libSM          sm_client
-00000004 D __SmsErrorHandler    libSM          sm_client
-00000004 C __SmsNewClientProc   libSM          sm_client
-00000004 C __SmsNewClientData   libSM          sm_client
-00000004 D __IceConnectionCount libICE         connect
-00000004 D __IceLastMajorOpcode libICE         connect
-00000004 D __IceAuthCount       libICE         connect
-00000004 D __IceAuthNames       libICE         connect
-00000004 D __IcePoAuthProcs     libICE         connect
-00000004 D __IcePaAuthProcs     libICE         connect
-00000004 D __IcePaAuthDataEntryCount libICE         connect
-00000004 D __IceVersionCount    libICE         connect
-00000018 D __IceVersions        libICE         connect
-00000004 D __IceWatchProcs      libICE         connect
-00000004 D __IceErrorHandler    libICE         connect
-00000004 D __IceIOErrorHandler  libICE         connect
-00000600 C __IceConnectionObjs  libICE         connect
-00000600 C __IceConnectionStrings libICE         connect
-00001000 C __IceProtocols       libICE         connect
-00001000 C __IcePaAuthDataEntries libICE         connect
-00000070 D __IceTransSocketINETFuncs libICE         transport
-00000070 D __IceTransSocketTCPFuncs libICE         transport
-00000070 D __IceTransSocketUNIXFuncs libICE         transport
-00000070 D __IceTransSocketLocalFuncs libICE         transport
--- a/nx-X11/lib/X11/util/mkks.sh
+++ b/nx-X11/lib/X11/util/mkks.sh
-#!/bin/sh
-
-cat $* | awk 'BEGIN { \
-    printf "/*\n * This file is generated from %s.  Do not edit.\n */\n", \
-	   "$(INCLUDESRC)/keysymdef.h";\
-} \
-/^#define/ { \
-	len = length($2)-3; \
-	printf("{ \"%s\", %s },\n", substr($2,4,len), $3); \
-}' 
-
--- a/nx-X11/programs/Xserver/GL/Imakefile
+++ b/nx-X11/programs/Xserver/GL/Imakefile
@@ -7,10 +7,6 @@

 SUBDIRS = glx $(CORE_SUBDIR)

-#if DoLoadableServer
-MSRCS = glxmodule.c
-MOBJS = glxmodule.o
-#endif

 #if BuildModuleInSubdir
 SRCS = glx/module/?*.c $(MSRCS)

--- a/nx-X11/programs/Xserver/GL/glx/Imakefile
+++ b/nx-X11/programs/Xserver/GL/glx/Imakefile
 NULL =

-#if DoLoadableServer
-# if !BuildModuleInSubdir
-#  define IHaveModules
-# elif !defined(IHaveModules)
-#  define IHaveSubdirs
-SUBDIRS = module
-# endif
-#endif

 /* Large PIC tables needed for SPARC builds */
 #if defined(sparc) || defined(SparcArchitecture)
@@ -131,10 +123,6 @@ XCOMM add DEBUG to the define in ../mesa/src/X/xf86glx.c
                $(NX_DEFINES)		\
                $(NULL)

-#ifdef IHaveModules
-ModuleObjectRule()
-LibraryModuleTarget(glx,$(OBJS))
-#else
 NormalLibraryObjectRule()
 NormalLibraryTarget(glx,$(OBJS))
 #if defined(GlxUseWindows) && GlxUseWindows
@@ -145,7 +133,6 @@ includes::
 SpecialObjectRule(stdcall/%.o,%.c,-DUSE_OPENGL32 -o $@)
 NormalLibraryTarget(glx_stdcall,$(foreach obj,$(OBJS), stdcall/$(obj)))
 #endif
-#endif
 SubdirLibraryRule($(OBJS))

 LintLibraryTarget(glx,$(SRCS))

--- a/nx-X11/programs/Xserver/GL/glx/glx-def.cpp
+++ b/nx-X11/programs/Xserver/GL/glx/glx-def.cpp
--- a/nx-X11/programs/Xserver/GL/glxmodule.c
+++ b/nx-X11/programs/Xserver/GL/glxmodule.c
--- a/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcore-def.cpp
+++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcore-def.cpp
--- a/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c
+++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Kevin E. Martin <kevin@precisioninsight.com>
- *
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Module.h"
-
-static MODULESETUPPROTO(GLcoreSetup);
-
-static XF86ModuleVersionInfo VersRec =
-{
-        "GLcore",
-        MODULEVENDORSTRING,
-        MODINFOSTRING1,
-        MODINFOSTRING2,
-        XORG_VERSION_CURRENT,
-        1, 0, 0,
-        ABI_CLASS_EXTENSION,
-        ABI_EXTENSION_VERSION,
-        MOD_CLASS_NONE,
-        {0,0,0,0}
-};
-
-XF86ModuleData GLcoreModuleData = { &VersRec, GLcoreSetup, NULL };
-
-static void *
-GLcoreSetup(void * module, void * opts, int *errmaj, int *errmin)
-{
-    /* Need a non-NULL return value to indicate success */
-    return (void *)1;
-}
--- a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile
-#if DoLoadableServer
-#define IHaveModules
-#endif
-
 #include <Server.tmpl>

 #define NeedAllMesaSrc
@@ -29,11 +25,6 @@
 #include "../X/Imakefile.inc"
 #include "../Imakefile.inc"

-#ifdef IHaveModules
-        MSRCS = GLcoremodule.c
-        MOBJS = GLcoremodule.o
-#endif
-
        XOBJS = ../X/?*.o

         OBJS = $(COREMESAOBJS) $(MOBJS)
@@ -50,16 +41,8 @@

      DEFINES = $(GLX_DEFINES)

-#ifdef IHaveModules
-ModuleObjectRule()
-
-DepLibraryModuleTarget(GLcore, $(DONES) $(OBJS),$(OBJS) $(XOBJS))
-InstallLibraryModule(GLcore,$(MODULEDIR),extensions)
-
-#else
 NormalDepLibraryTarget(GLcore, $(DONES) $(OBJS), $(OBJS) $(XOBJS))
 NormalLibraryObjectRule()
-#endif

 InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions)


--- a/nx-X11/programs/Xserver/GL/mesa/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/Imakefile
-#if DoLoadableServer
-#define IHaveModules
-#endif
-
 #define IHaveSubdirs
      SUBDIRS = main math array_cache swrast swrast_setup tnl shader X GLcore $(MODSUBDIR)

@@ -20,11 +16,7 @@

      DEFINES = $(GLX_DEFINES)

-#ifdef IHaveModules
-ModuleObjectRule()
-#else
 NormalLibraryObjectRule()
-#endif

 #ifdef IHaveSubdirs
 MakeSubdirs($(SUBDIRS))

--- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile
-#if DoLoadableServer
-#define IHaveModules
-#endif
-
 #include <Server.tmpl>

 #define NeedAllMesaSrc
@@ -42,11 +38,7 @@ LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11)

      DEFINES = $(GLX_DEFINES) $(GLXSRV_DEFINES) -DNXAGENT_SERVER /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/

-#ifdef IHaveModules
-ModuleObjectRule()
-#else
 NormalLibraryObjectRule()
-#endif

 SubdirLibraryRule($(OBJS))

@@ -59,10 +51,6 @@ MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 #endif

-#if defined(IHaveModules) && BuildModuleInSubdir
-LinkSourceFile(xf86glx.c,..)
-LinkSourceFile(xf86glx_util.c,..)
-#endif

 #ifndef MesaDrvSrcDir
 #define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri

--- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile
-#if DoLoadableServer
-#define IHaveModules
-#endif
-
 #include <Server.tmpl>

 #define NeedAllMesaSrc
@@ -25,11 +21,7 @@

      DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/

-#ifdef IHaveModules
-ModuleObjectRule()
-#else
 NormalLibraryObjectRule()
-#endif

 SubdirLibraryRule($(OBJS))


--- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile
-#if DoLoadableServer
-#define IHaveModules
-#endif
-
 /* Large PIC tables needed for Solaris/SPARC builds */
 #if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags)
   PICFLAGS = LargePositionIndependentCFlags
@@ -29,11 +25,7 @@

      DEFINES = $(GLX_DEFINES) -DNXAGENT_SERVER /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/

-#ifdef IHaveModules
-ModuleObjectRule()
-#else
 NormalLibraryObjectRule()
-#endif

 SubdirLibraryRule($(OBJS))


--- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
-#if DoLoadableServer
-#define IHaveModules
-#endif
-
 #include <Server.tmpl>

 #define NeedAllMesaSrc
@@ -24,11 +20,7 @@

      DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/

-#ifdef IHaveModules
-ModuleObjectRule()
-#else
 NormalLibraryObjectRule()
-#endif

 SubdirLibraryRule($(OBJS))


--- a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile
-#if DoLoadableServer
-#define IHaveModules
-#endif

 #define IHaveSubdirs
      SUBDIRS = grammar slang
@@ -29,11 +26,7 @@

      DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/

-#ifdef IHaveModules
-ModuleObjectRule()
-#else
 NormalLibraryObjectRule()
-#endif

 SubdirLibraryRule($(OBJS))


--- a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile
-#if DoLoadableServer
-#define IHaveModules
-#endif

 #include <Server.tmpl>

@@ -25,11 +22,7 @@

      DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/

-#ifdef IHaveModules
-ModuleObjectRule()
-#else
 NormalLibraryObjectRule()
-#endif

 SubdirLibraryRule($(OBJS))


--- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile
-#if DoLoadableServer
-#define IHaveModules
-#endif

 #define IHaveSubdirs
      SUBDIRS = library
@@ -28,11 +25,7 @@

      DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/

-#ifdef IHaveModules
-ModuleObjectRule()
-#else
 NormalLibraryObjectRule()
-#endif

 SubdirLibraryRule($(OBJS))


--- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile
-#if DoLoadableServer
-#define IHaveModules
-#endif

 #include <Server.tmpl>

@@ -22,11 +19,7 @@

      DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/

-#ifdef IHaveModules
-ModuleObjectRule()
-#else
 NormalLibraryObjectRule()
-#endif

 DependTarget()


--- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile
-#if DoLoadableServer
-#define IHaveModules
-#endif
-
 /* Large PIC tables needed for Solaris/SPARC builds */
 #if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags)
   PICFLAGS = LargePositionIndependentCFlags
@@ -32,11 +28,7 @@

      DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/

-#ifdef IHaveModules
-ModuleObjectRule()
-#else
 NormalLibraryObjectRule()
-#endif

 SubdirLibraryRule($(OBJS))


--- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile
-#if DoLoadableServer
-#define IHaveModules
-#endif
-
 #include <Server.tmpl>

 #define NeedAllMesaSrc
@@ -24,11 +20,7 @@

      DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/

-#ifdef IHaveModules
-ModuleObjectRule()
-#else
 NormalLibraryObjectRule()
-#endif

 SubdirLibraryRule($(OBJS))


--- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile
-#if DoLoadableServer
-#define IHaveModules
-#endif
-
 /* Large PIC tables needed for Solaris/SPARC builds */
 #if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags)
   PICFLAGS = LargePositionIndependentCFlags
@@ -34,11 +30,7 @@

      DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/

-#ifdef IHaveModules
-ModuleObjectRule()
-#else
 NormalLibraryObjectRule()
-#endif

 SubdirLibraryRule($(OBJS))


--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -61,13 +61,8 @@ INSTPGMFLAGS =
 #define AllFBLibs PreFbLibs $(FB) PostFbLibs

 #if BuildGlxExt
-# if DoLoadableServer
      GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
               GL/mesa/GLcore/ModuleLibraryTargetName(GLcore)
-# else
-      GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
-               GL/mesa/GLcore/ModuleLibraryTargetName(GLcore)
-# endif
      GLXDIR = GL
      GLXEXT = $(GLXLIB)
 #endif
@@ -101,14 +96,8 @@ INSTPGMFLAGS =
 #ifdef SiteExtensionDirs
    SITEEXTDIRS = SiteExtensionDirs
 #endif
-#if DoLoadableServer && HasDlopen
-          LIBDL = DlLibrary
-#endif
       LIBREGEX = RegexLibrary

-#if DoLoadableServer
-    LIBCWRAPPER = os/libcwrapper.o
-#endif

 #if BuildRender
      RENDERDIR = render
@@ -130,46 +119,24 @@ INSTPGMFLAGS =
          CWDIR = miext/cw
   COMPOSITEDIR = composite
   COMPOSITELIB = $(COMPOSITEDIR)/libcomposite.a
-#if DoLoadableServer
-             CW = miext/cw/ModuleLibraryTargetName(cw)
-#else
             CW = miext/cw/LibraryTargetName(cw)
 #endif
-#endif
-#if DoLoadableServer
-     EXTENSIONS = $(COMPOSITELIB) $(DAMAGELIB) $(DAMAGE) $(FIXESLIB) $(CW) \
-		  $(OTHEREXTS) $(RANDRLIB) $(RENDERLIB)
-   LOADABLEEXTS = $(MISCEXT) $(DBEEXT) $(RECORDEXT) $(GLXEXT)
-        MISCEXT = Xext/LibraryTargetName(ext)
-      OTHEREXTS = Xext/LibraryTargetName(exts) $(XKBEXT) $(XINPUTEXT) \
-                  $(SITEEXTS)
-#else
     EXTENSIONS = $(COMPOSITELIB) $(DAMAGELIB) $(DAMAGE) $(FIXESLIB) $(CW) \
 		  $(OTHEREXTS) $(GLXEXT) $(RANDRLIB) $(RENDERLIB)
      OTHEREXTS = Xext/LibraryTargetName(ext) $(XKBEXT) $(XINPUTEXT) \
                  $(DBEEXT) $(RECORDEXT) $(SITEEXTS)
-#endif
        EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(GLXDIR) \
                  $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) \
                  $(RANDRDIR) $(RENDERDIR) $(XPCONFIGDIR) \
 		  $(FIXESDIR) $(DAMAGEDIR) $(CWDIR) $(COMPOSITEDIR)
             OS = os/LibraryTargetName(os)
        BSDEMUL = $(DEPXBSDLIB)
-#if DoLoadableServer
-             FB = fb/ModuleLibraryTargetName(fb)
-#if (!(defined(NXAgentServer) && NXAgentServer))
-         DAMAGE = miext/damage/ModuleLibraryTargetName(damage)
-#endif
-         SHADOW = miext/shadow/ModuleLibraryTargetName(shadow)
-          LAYER = miext/layer/ModuleLibraryTargetName(layer) 
-#else 
             FB = fb/LibraryTargetName(fb)
 #if (!(defined(NXAgentServer) && NXAgentServer))
         DAMAGE = miext/damage/LibraryTargetName(damage)
 #endif
         SHADOW = miext/shadow/LibraryTargetName(shadow)
          LAYER = miext/layer/LibraryTargetName(layer) 
-#endif
 #if !HasFfs && (defined(mingwArchitecture) || defined(cygwinArchitecture))
             /* Order of libraries is important when linking in mingw or
              * cygwin. libmi.a requires ffs from libdix.a. So it is added
@@ -220,11 +187,11 @@ XCOMM
 #if defined(NXAgentServer) && NXAgentServer
 NXAGENT = nxagent
 #endif
-#if defined(NXWinServer) && NXWinServer && !MakeDllModules
+#if defined(NXWinServer) && NXWinServer
 NXWIN = NXWin
 #endif
 #if (defined(NXAgentServer) && NXAgentServer) || \
-    (!MakeDllModules && defined(NXWinServer) && NXWinServer) 
+    (defined(NXWinServer) && NXWinServer)
 MakeMutex($(NXAGENT) $(NXWIN))
 #endif
 MakeMutex($(STDDIRS) fb)
@@ -568,20 +535,3 @@ ForceSubdirs($(DEPDIRS) $(SUBDIRS))

 DEFAULTFONTPATH = DefaultFontPath
 EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`"
-
-#if MakeDllModules && DoLoadableServer && \
-        (defined(SunArchitecture) && defined(SVR4Architecture))
-XCOMM Hackery for building dlopen-able .so modules on Solaris
-
-AllTarget(linker-deps)
-
-LINKER_DEPS_DIRS = $(SUBDIRS)
-
-XCOMM After everything is built, run through and generate linker dependencies
-linker-deps:
-        RunPerlScript($(XF86SRC)/os-support/sunos/find_deps.pl,-R ProjectRoot $(LINKER_DEPS_DIRS))
-	for i in $(LINKER_DEPS_DIRS) ; do \
-	  echo "relinking with dependency flags in $(CURRENT_DIR)/$$i..."; \
-                MakeNamedTargetSubdir($$i,NullParameter,all) ; \
-        done
-#endif
--- a/nx-X11/programs/Xserver/Xext/Imakefile
+++ b/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
@@ -123,10 +118,6 @@ NormalLibraryTarget(ext,$(OBJS))
 LintLibraryTarget(ext,$(SRCS))
 NormalLintTarget($(SRCS))

-#if DoLoadableServer
-NormalLibraryTarget(exts,$(SOBJS))
-#endif
-
 #if BuildXF86BigfontExt
 SpecialCObjectRule(xf86bigfont,$(ICONFIGFILES),$(SHM_DEFINES))
 #endif
@@ -136,18 +127,11 @@ SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF))

 LinkConfDirectory(xserver,.,xserver,.)

-LinkSourceFile(modinit.h,extmod)
-
 #if BuildXCSecurity && InstallSecurityConfig
 InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR))
 #endif

 DependTarget()

-#if DoLoadableServer
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-#endif
-
 InstallDriverSDKNonExecFile(xvdix.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(xvmcext.h,$(DRIVERSDKINCLUDEDIR))
--- a/nx-X11/programs/Xserver/Xext/bigreq.c
+++ b/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;

--- a/nx-X11/programs/Xserver/Xext/dpms.c
+++ b/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;

--- a/nx-X11/programs/Xserver/Xext/extmod/Imakefile
+++ b/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)
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.c
+++ b/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 */
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h
+++ b/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
--- a/nx-X11/programs/Xserver/Xext/panoramiX.c
+++ b/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

--- a/nx-X11/programs/Xserver/Xext/saver.c
+++ b/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

--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/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 */


--- a/nx-X11/programs/Xserver/Xext/shape.c
+++ b/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 */

--- a/nx-X11/programs/Xserver/Xext/shm.c
+++ b/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;

--- a/nx-X11/programs/Xserver/Xext/sync.c
+++ b/nx-X11/programs/Xserver/Xext/sync.c
@@ -77,8 +77,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #endif
 #endif

-#include "modinit.h"
-
 /*
 * Local Global Variables
 */

--- a/nx-X11/programs/Xserver/Xext/xcmisc.c
+++ b/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>


--- a/nx-X11/programs/Xserver/Xext/xres.c
+++ b/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

--- a/nx-X11/programs/Xserver/Xext/xtest.c
+++ b/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

--- a/nx-X11/programs/Xserver/Xext/xtest1.frags
+++ b/nx-X11/programs/Xserver/Xext/xtest1.frags
-There are several code fragments that need to be placed in the device
-dependent part of the server.  These are described below.  These code
-fragments are device and implementation dependent.
-
-This code fragment should go in your ddx InitInput() routine:
-
-#ifdef XTESTEXT1
-extern KeyCode xtest_command_key;
-#endif
-
-#ifdef XTESTEXT1
-    xtest_command_key = <whatever-is-a-good-keycode-for-your-keyboard>;
-#endif
-
-This code fragment should go at the front of the file that handles
-keyboards:
-
-#ifdef XTESTEXT1
-/*
- * defined in xtestext1di.c
- */
-extern int	on_steal_input;
-extern Bool	XTestStealKeyData();
-#endif XTESTEXT1
-
-This code fragment should go in the function that parses input from the
-keyboard or pointer after you know what input action has occurred, but before
-you have told the server about it.  If conditionalizes the actual function
-call to pass the information on:
-
-#ifdef XTESTEXT1
-	if (!on_steal_input ||
-	    XTestStealKeyData(code, direction, dev_type, x, y))
-#endif /* XTESTEXT1 */
-	handle_device_event(...);
-
-This code fragment should go in the function that handles mouse motion after
-you have figured out how much the mouse has moved:
-
-#ifdef XTESTEXT1
-	if (on_steal_input)
-	    XTestStealMotionData(dx, dy, dev, x, y);
-#endif XTESTEXT1
-
-
-This code fragment should go at the front of the os-specific code where
-you wait (by doing a select on the socket in our implementation) for
-something to happen:
-
-#ifdef	XTESTEXT1
-extern int	playback_on;
-void XTestComputeWaitTime();
-#endif  XTESTEXT1
-
-These code fragments should go in the os-specific code on both sides of
-where you wait (by doing a select on the socket in our implementation)
-for something to happen:
-
-#ifdef XTESTEXT1
-	    if (playback_on)
-		    XTestComputeWaitTime(wt = &waittime);
-#endif XTESTEXT1
-	    ... code to do select ...
-	    WakeupHandler(i, LastSelectMask);
-#ifdef XTESTEXT1
-	    if (playback_on)
-		    i = XTestProcessInputAction(i, &waittime);
-#endif XTESTEXT1
-
-
-You also need to implement the following routines (documentation
-is needed; for now, see server/ddx/hp/hp/x_hil.c):
-
-void
-XTestGenerateEvent(dev_type, keycode, keystate, mousex, mousey)
-	int	dev_type;
-	int	keycode;
-	int	keystate;
-	int	mousex;
-	int	mousey;
-
-void
-XTestGetPointerPos(fmousex, fmousey)
-	short *fmousex, *fmousey;
-
-void
-XTestJumpPointer(jx, jy, dev_type)
-	int	jx;
-	int	jy;
-	int	dev_type;
--- a/nx-X11/programs/Xserver/Xext/xtest1di.c
+++ b/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"


--- a/nx-X11/programs/Xserver/Xext/xvmod.c
+++ b/nx-X11/programs/Xserver/Xext/xvmod.c
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <nx-X11/X.h>
-#include "misc.h"
-#include "scrnintstr.h"
-#include "gc.h"
-#include <nx-X11/extensions/Xv.h>
-#include <nx-X11/extensions/Xvproto.h>
-#include "xvdix.h"
-#include "xvmodproc.h"
-
-void
-XvRegister()
-{
-    XvScreenInitProc = XvScreenInit;
-    XvGetScreenIndexProc = XvGetScreenIndex;
-    XvGetRTPortProc = XvGetRTPort;
-    XvMCScreenInitProc = XvMCScreenInit;
-}
-
--- a/nx-X11/programs/Xserver/Xext/xvmodproc.h
+++ b/nx-X11/programs/Xserver/Xext/xvmodproc.h
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "xvmcext.h"
-
-extern int (*XvGetScreenIndexProc)(void);
-extern unsigned long (*XvGetRTPortProc)(void);
-extern int (*XvScreenInitProc)(ScreenPtr);
-extern int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr);
-
-extern void XvRegister(void);
--- a/nx-X11/programs/Xserver/dbe/Imakefile
+++ b/nx-X11/programs/Xserver/dbe/Imakefile
-#if DoLoadableServer
-#define IHaveSubdirs
-#endif
-
 #include <Server.tmpl>

-#if DoLoadableServer
-    SUBDIRS = module
-#endif

       SRCS = dbe.c midbe.c 
       OBJS = dbe.o midbe.o 
@@ -20,10 +13,6 @@ NormalLibraryTarget(dbe,$(OBJS))
 LintLibraryTarget(dbe,$(SRCS))
 NormalLintTarget($(SRCS))

-#if DoLoadableServer
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-#endif

 DependTarget()

--- a/nx-X11/programs/Xserver/dbe/dbemodule.c
+++ b/nx-X11/programs/Xserver/dbe/dbemodule.c
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Module.h"
-#include "globals.h"
-
-static MODULESETUPPROTO(dbeSetup);
-
-extern void DbeExtensionInit(void);
-
-ExtensionModule dbeExt = {
-    DbeExtensionInit,
-    "DOUBLE-BUFFER",
-    &noDbeExtension,
-    NULL,
-    NULL
-};
-
-static XF86ModuleVersionInfo VersRec =
-{
-	"dbe",
-	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 dbeModuleData = { &VersRec, dbeSetup, NULL };
-
-static void *
-dbeSetup(void * module, void * opts, int *errmaj, int *errmin)
-{
-    LoadExtension(&dbeExt, FALSE);
-
-    /* Need a non-NULL return value to indicate success */
-    return (void *)1;
-}
--- a/nx-X11/programs/Xserver/dbe/module/Imakefile
+++ b/nx-X11/programs/Xserver/dbe/module/Imakefile
-#define IHaveModules
-#include <Server.tmpl>
-
-#if DoLoadableServer
-      MSRCS = dbemodule.c
-      MOBJS = dbemodule.o
-#endif
-
-       SRCS = dbe.c midbe.c $(MSRCS)
-       OBJS = dbe.o midbe.o $(MOBJS)
-   INCLUDES = -I.. -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) $(EXTRAINCLUDES)
-   LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln
-    DEFINES = $(EXT_DEFINES)
-
-LinkSourceFile(dbemodule.c,..)
-LinkSourceFile(midbe.c,..)
-LinkSourceFile(dbe.c,..)
-
-ModuleObjectRule()
-
-LibraryModuleTarget(dbe,$(OBJS))
-
-LintLibraryTarget(dbe,$(SRCS))
-NormalLintTarget($(SRCS))
-
-InstallLibraryModule(dbe,$(MODULEDIR),extensions)
-
-DependTarget()
-
-InstallDriverSDKLibraryModule(dbe,$(DRIVERSDKMODULEDIR),extensions)
--- a/nx-X11/programs/Xserver/fb/Imakefile
+++ b/nx-X11/programs/Xserver/fb/Imakefile
@@ -17,14 +17,6 @@ SpecialCObjectRule(fbcopy,fbcopy.c,$(USEMMXOPTIONS))
 #endif
 */

-#if DoLoadableServer
-#if !BuildModuleInSubdir
-#define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
-#endif

 #include <Server.tmpl>

@@ -32,10 +24,6 @@ SUBDIRS = module
 FB_DEFINES=-DFBNOPIXADDR -DFBNO24BIT
 #endif

-#if defined(IHaveModules)
-XFMODSRC = fbmodule.c
-XFMODOBJ = fbmodule.o
-#endif

 #if BuildRender
 RENDERSRC = fbcompose.c
@@ -131,21 +119,13 @@ OBJS =	$(XFMODOBJ) \
   LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln \
 	     $(SERVERSRC)/mi/llib-lmi.ln

-#ifdef IHaveModules
-ModuleObjectRule()
-LibraryModuleTarget(fb,$(OBJS))
-#else
 NormalLibraryObjectRule()
 NormalLibraryTarget(fb,$(OBJS))
-#endif

 LintLibraryTarget(fb,$(SRCS))

 NormalLintTarget($(SRCS))

-#ifdef IHaveModules
-InstallLibraryModule(fb,$(MODULEDIR),.)
-#endif

 DependTarget()


--- a/nx-X11/programs/Xserver/fb/fb24_32.h
+++ b/nx-X11/programs/Xserver/fb/fb24_32.h
-/*
- * $XFree86$
- *
- * Copyright © 2000 SuSE, Inc.
- *
- * 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 SuSE not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  SuSE makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
- * 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.
- *
- * Author:  Keith Packard, SuSE, Inc.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _FB24_32_H_
-#define _FB24_32_H_
-
-Bool
-fb24_32FinishScreenInit(ScreenPtr    pScreen,
-			void         *pbits,
-			int          xsize,
-			int          ysize,
-			int          dpix,
-			int          dpiy,
-			int          width,
-			int          bpp);
-
-Bool
-fb24_32ScreenInit(ScreenPtr  pScreen,
-		  void       *pbits,
-		  int        xsize,
-		  int        ysize,
-		  int        dpix,
-		  int        dpiy,
-		  int        width,
-		  int        bpp);
-
-#endif
--- a/nx-X11/programs/Xserver/fb/fbmodule.c
+++ b/nx-X11/programs/Xserver/fb/fbmodule.c
-/*
- * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the XFree86 Project shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in this Software without prior written authorization from the
- * XFree86 Project.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#ifdef XFree86LOADER
-
-#include "xf86Module.h"
-#include "fb.h"
-
-static XF86ModuleVersionInfo VersRec =
-{
-	"fb",
-	MODULEVENDORSTRING,
-	MODINFOSTRING1,
-	MODINFOSTRING2,
-	XORG_VERSION_CURRENT,
-	1, 0, 0,
-	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
-	ABI_ANSIC_VERSION,
-	MOD_CLASS_NONE,
-	{0,0,0,0}       /* signature, to be patched into the file by a tool */
-};
-
-XF86ModuleData fbModuleData = { &VersRec, NULL, NULL };
-
-#endif
--- a/nx-X11/programs/Xserver/fb/module/Imakefile
+++ b/nx-X11/programs/Xserver/fb/module/Imakefile
-#define IHaveModules
-#define LinkDirectory ..
-
-#include "../Imakefile"
--- a/nx-X11/programs/Xserver/include/Imakefile
+++ b/nx-X11/programs/Xserver/include/Imakefile
@@ -2,10 +2,6 @@ HEADERS = os.h misc.h

 #if defined(XorgVersion) \
 	|| defined(BSDOSArchitecture)
-#if DoLoadableServer
-LinkSourceFile(xf86Module.h,$(XF86COMSRC))
-LinkSourceFile(xf86Opt.h,$(XF86COMSRC))
-#endif
 #endif

 LinkSourceFile(osdep.h,../os)

--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/nx-X11/programs/Xserver/mi/Imakefile
@@ -36,12 +36,8 @@ CBRT_OBJ = cbrt.o
 FFS_DEFINES = -DHAS_FFS
 #endif

-#if DoLoadableServer
-EXTRAMIINITEXTOBJ = miinitext.o
-#else
 MIINITEXTSRC = miinitext.c
 MIINITEXTOBJ = miinitext.o
-#endif

 #if (!(defined(NXAgentServer) && NXAgentServer))
 NXAGENT_SKIP_SRCS =                     \

--- a/nx-X11/programs/Xserver/miext/cw/Imakefile
+++ b/nx-X11/programs/Xserver/miext/cw/Imakefile
-#define IHaveModules
 #include <Server.tmpl>

 SRCS = cw.c cw_ops.c cw_render.c

--- a/nx-X11/programs/Xserver/os/Imakefile
+++ b/nx-X11/programs/Xserver/os/Imakefile
@@ -188,9 +188,4 @@ SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
 LinkSourceFile(snprintf.c,$(LIBSRC)/misc)
 #endif

-#if DoLoadableServer
-AllTarget(libcwrapper.o)
-ObjectFromSpecialSource(libcwrapper,$(XF86OSSRC)/shared/libc_wrapper,-DSELF_CONTAINED_WRAPPER)
-#endif
-
 DependTarget()
--- a/nx-X11/programs/Xserver/randr/registry.h
+++ b/nx-X11/programs/Xserver/randr/registry.h
-/***********************************************************
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-******************************************************************/
-
-#ifndef DIX_REGISTRY_H
-#define DIX_REGISTRY_H
-
-/*
- * Result returned from any unsuccessful lookup
- */
-#define XREGISTRY_UNKNOWN "<unknown>"
-
-#ifdef XREGISTRY
-
-#include "resource.h"
-#include "extnsionst.h"
-
-/* Internal string registry - for auditing, debugging, security, etc. */
-
-/*
- * Registration functions.  The name string is not copied, so it must
- * not be a stack variable.
- */
-void RegisterResourceName(RESTYPE type, char *name);
-void RegisterExtensionNames(ExtensionEntry * ext);
-
-/*
- * Lookup functions.  The returned string must not be modified or freed.
- */
-const char *LookupMajorName(int major);
-const char *LookupRequestName(int major, int minor);
-const char *LookupEventName(int event);
-const char *LookupErrorName(int error);
-const char *LookupResourceName(RESTYPE rtype);
-
-/*
- * Setup and teardown
- */
-void dixResetRegistry(void);
-
-#else                           /* XREGISTRY */
-
-/* Define calls away when the registry is not being built. */
-
-#define RegisterResourceName(a, b) { ; }
-#define RegisterExtensionNames(a) { ; }
-
-#define LookupMajorName(a) XREGISTRY_UNKNOWN
-#define LookupRequestName(a, b) XREGISTRY_UNKNOWN
-#define LookupEventName(a) XREGISTRY_UNKNOWN
-#define LookupErrorName(a) XREGISTRY_UNKNOWN
-#define LookupResourceName(a) XREGISTRY_UNKNOWN
-
-#define dixResetRegistry() { ; }
-
-#endif                          /* XREGISTRY */
-#endif                          /* DIX_REGISTRY_H */
--- a/nx-X11/programs/Xserver/record/Imakefile
+++ b/nx-X11/programs/Xserver/record/Imakefile
       NULL =

-#if DoLoadableServer
-#define IHaveSubdirs
-#endif

 #include <Server.tmpl>

-#if DoLoadableServer
-    SUBDIRS = module
-#endif
       SRCS = record.c set.c
       OBJS = record.o set.o
   INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext `pkg-config --cflags-only-I pixman-1`
@@ -28,9 +22,5 @@ NormalLibraryTarget(record,$(OBJS))
 LintLibraryTarget(record,$(SRCS))
 NormalLintTarget($(SRCS))

-#if DoLoadableServer
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-#endif

 DependTarget()
--- a/nx-X11/programs/Xserver/record/module/Imakefile
+++ b/nx-X11/programs/Xserver/record/module/Imakefile
-#define IHaveModules
-#include <Server.tmpl>
-
-#if DoLoadableServer
-      MSRCS = recordmod.c
-      MOBJS = recordmod.o
-#endif
-
-       SRCS = record.c set.c $(MSRCS)
-       OBJS = record.o set.o $(MOBJS)
-   INCLUDES = -I.. -I../../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
-	-I$(SERVERSRC)/Xext
-   LINTLIBS = ../../dix/llib-ldix.ln
-    DEFINES = -DNDEBUG
-
-LinkSourceFile(recordmod.c,..)
-LinkSourceFile(record.c,..)
-LinkSourceFile(set.c,..)
-
-ModuleObjectRule()
-LibraryModuleTarget(record,$(OBJS))
-LintLibraryTarget(record,$(SRCS))
-NormalLintTarget($(SRCS))
-
-InstallLibraryModule(record,$(MODULEDIR),extensions)
-
-DependTarget()
-
-InstallDriverSDKLibraryModule(record,$(DRIVERSDKMODULEDIR),extensions)
--- a/nx-X11/programs/Xserver/record/recordmod.c
+++ b/nx-X11/programs/Xserver/record/recordmod.c
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Module.h"
-
-extern Bool noTestExtensions;
-
-static MODULESETUPPROTO(recordSetup);
-
-extern void RecordExtensionInit(void);
-
-ExtensionModule recordExt = {
-    RecordExtensionInit,
-    "RECORD",
-    &noTestExtensions,
-    NULL,
-    NULL
-};
-
-static XF86ModuleVersionInfo VersRec = {
-	"record",
-	MODULEVENDORSTRING,
-	MODINFOSTRING1,
-	MODINFOSTRING2,
-	XORG_VERSION_CURRENT,
-	1, 13, 0,
-	ABI_CLASS_EXTENSION,
-	ABI_EXTENSION_VERSION,
-	MOD_CLASS_EXTENSION,
-	{0,0,0,0}
-};
-
-XF86ModuleData recordModuleData = { &VersRec, recordSetup, NULL };
-
-static void *
-recordSetup(void * module, void * opts, int *errmaj, int *errmin)
-{
-    LoadExtension(&recordExt, FALSE);
-
-    /* Need a non-NULL return value to indicate success */
-    return (void *)1;
-}
-
--- a/nx-X11/programs/Xserver/xkb/Imakefile
+++ b/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,.)

--- a/nx-X11/registry
+++ b/nx-X11/registry
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -411,7 +411,6 @@ chmod 755  %{buildroot}%{_libdir}/lib*.so*

 #Remove extras, GL, and other unneeded headers
 rm -r %{buildroot}%{_includedir}/GL
-rm -r %{buildroot}%{_includedir}/nx-X11/extensions/XInput.h
 rm -r %{buildroot}%{_includedir}/nx-X11/extensions/XK*.h
 rm -r %{buildroot}%{_includedir}/nx-X11/extensions/*Xv*.h
 rm -r %{buildroot}%{_includedir}/nx-X11/extensions/dpms.h
@@ -537,7 +536,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
 %{_includedir}/nx-X11/Xproto.h
 %{_includedir}/nx-X11/Xprotostr.h
 %{_includedir}/nx-X11/Xthreads.h
-%{_includedir}/nx-X11/ap_keysym.h
 %{_includedir}/nx-X11/keysym.h
 %{_includedir}/nx-X11/keysymdef.h
 %{_includedir}/nx-X11/extensions/Xdbeproto.h

--- a/nxcomp/Utils.cpp
+++ b/nxcomp/Utils.cpp
-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMP, NX protocol compression and NX extensions to this software     */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE.nxcomp which comes in the       */
-/* source distribution.                                                   */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#include "NX.h"
-
-#include "Timestamp.h"
-
-//
-// Log level.
-//
-
-#define PANIC
-#define WARNING
-#undef  TEST
-#undef  DEBUG
-
-int NXTransSearch(char *data, int size, int step, int threshold)
-{
-  return -1;
-}
-