From 96c9aafd6bf6d09ce2e98a77685f5e25b9009e35 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 29 Oct 2016 22:52:53 +0200 Subject: Imake: drop DoLoadableServer, MakeDllModules and IHaveModules We do not build loadable modules, so we do not need them anywhere. Also remove the extra files requires for module builds. --- .../programs/Xserver/GL/mesa/GLcore/GLcoremodule.c | 63 ---------------------- nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile | 17 ------ nx-X11/programs/Xserver/GL/mesa/Imakefile | 8 --- nx-X11/programs/Xserver/GL/mesa/X/Imakefile | 12 ----- .../programs/Xserver/GL/mesa/array_cache/Imakefile | 8 --- nx-X11/programs/Xserver/GL/mesa/main/Imakefile | 8 --- nx-X11/programs/Xserver/GL/mesa/math/Imakefile | 8 --- nx-X11/programs/Xserver/GL/mesa/shader/Imakefile | 7 --- .../Xserver/GL/mesa/shader/grammar/Imakefile | 7 --- .../Xserver/GL/mesa/shader/slang/Imakefile | 7 --- .../Xserver/GL/mesa/shader/slang/library/Imakefile | 7 --- nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile | 8 --- .../Xserver/GL/mesa/swrast_setup/Imakefile | 8 --- nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile | 8 --- 14 files changed, 176 deletions(-) delete mode 100644 nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c (limited to 'nx-X11/programs/Xserver/GL/mesa') diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c b/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c deleted file mode 100644 index 34eb4d673..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c +++ /dev/null @@ -1,63 +0,0 @@ -/************************************************************************** - -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 - * - */ - -#ifdef HAVE_XORG_CONFIG_H -#include -#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; -} diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile index 698cba2d9..5fb93b364 100644 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile @@ -1,7 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif - #include #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) diff --git a/nx-X11/programs/Xserver/GL/mesa/Imakefile b/nx-X11/programs/Xserver/GL/mesa/Imakefile index 7f9b5191c..f1dbbe101 100644 --- a/nx-X11/programs/Xserver/GL/mesa/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/Imakefile @@ -1,7 +1,3 @@ -#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)) diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile index c8ea2ab72..f8812e096 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile @@ -1,7 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif - #include #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 diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile index 548c6adb0..474710747 100644 --- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile @@ -1,7 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif - #include #define NeedAllMesaSrc @@ -25,11 +21,7 @@ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif SubdirLibraryRule($(OBJS)) diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile index ff95bd187..d6e914b89 100644 --- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile @@ -1,7 +1,3 @@ -#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)) diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile index 77e7f7664..6af3a0a0c 100644 --- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile @@ -1,7 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif - #include #define NeedAllMesaSrc @@ -24,11 +20,7 @@ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif SubdirLibraryRule($(OBJS)) diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile index b52d193d3..bf3acd4f6 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile @@ -1,6 +1,3 @@ -#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)) diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile index 56cfb4bc9..3fe604f2e 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile @@ -1,6 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif #include @@ -25,11 +22,7 @@ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif SubdirLibraryRule($(OBJS)) diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile index 572000f26..d5ec4d6cf 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile @@ -1,6 +1,3 @@ -#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)) diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile index d6de08e1b..8c216804d 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile @@ -1,6 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif #include @@ -22,11 +19,7 @@ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif DependTarget() diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile index bf4df7b4a..df47a1caa 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile @@ -1,7 +1,3 @@ -#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)) diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile index ca29177a0..be2ce62a4 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile @@ -1,7 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif - #include #define NeedAllMesaSrc @@ -24,11 +20,7 @@ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif SubdirLibraryRule($(OBJS)) diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile index 2fec2d03f..b36454259 100644 --- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile @@ -1,7 +1,3 @@ -#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)) -- cgit v1.2.3