diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2016-10-29 22:52:53 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-02 17:54:04 +0100 |
commit | 96c9aafd6bf6d09ce2e98a77685f5e25b9009e35 (patch) | |
tree | 883d169fb5bceee645221b7039ab2284a1b1c0fb /nx-X11/programs/Xserver/dbe | |
parent | 8dab7c21dde79298274fe73b7a4bbe9c71f006de (diff) | |
download | nx-libs-96c9aafd6bf6d09ce2e98a77685f5e25b9009e35.tar.gz nx-libs-96c9aafd6bf6d09ce2e98a77685f5e25b9009e35.tar.bz2 nx-libs-96c9aafd6bf6d09ce2e98a77685f5e25b9009e35.zip |
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.
Diffstat (limited to 'nx-X11/programs/Xserver/dbe')
-rw-r--r-- | nx-X11/programs/Xserver/dbe/Imakefile | 11 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/dbe/dbemodule.c | 47 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/dbe/module/Imakefile | 30 |
3 files changed, 0 insertions, 88 deletions
diff --git a/nx-X11/programs/Xserver/dbe/Imakefile b/nx-X11/programs/Xserver/dbe/Imakefile index 4e03a03ad..54ce471c5 100644 --- a/nx-X11/programs/Xserver/dbe/Imakefile +++ b/nx-X11/programs/Xserver/dbe/Imakefile @@ -1,12 +1,5 @@ -#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() diff --git a/nx-X11/programs/Xserver/dbe/dbemodule.c b/nx-X11/programs/Xserver/dbe/dbemodule.c deleted file mode 100644 index 00be6cb49..000000000 --- a/nx-X11/programs/Xserver/dbe/dbemodule.c +++ /dev/null @@ -1,47 +0,0 @@ - -#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; -} diff --git a/nx-X11/programs/Xserver/dbe/module/Imakefile b/nx-X11/programs/Xserver/dbe/module/Imakefile deleted file mode 100644 index 8b099e844..000000000 --- a/nx-X11/programs/Xserver/dbe/module/Imakefile +++ /dev/null @@ -1,30 +0,0 @@ -#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) |