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/record | |
| 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/record')
| -rw-r--r-- | nx-X11/programs/Xserver/record/Imakefile | 10 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/record/module/Imakefile | 29 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/record/recordmod.c | 45 |
3 files changed, 0 insertions, 84 deletions
diff --git a/nx-X11/programs/Xserver/record/Imakefile b/nx-X11/programs/Xserver/record/Imakefile index fc74ec4da..40c29fe6f 100644 --- a/nx-X11/programs/Xserver/record/Imakefile +++ b/nx-X11/programs/Xserver/record/Imakefile @@ -1,14 +1,8 @@ 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() diff --git a/nx-X11/programs/Xserver/record/module/Imakefile b/nx-X11/programs/Xserver/record/module/Imakefile deleted file mode 100644 index fd78192fb..000000000 --- a/nx-X11/programs/Xserver/record/module/Imakefile +++ /dev/null @@ -1,29 +0,0 @@ -#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) diff --git a/nx-X11/programs/Xserver/record/recordmod.c b/nx-X11/programs/Xserver/record/recordmod.c deleted file mode 100644 index bd50bbd5b..000000000 --- a/nx-X11/programs/Xserver/record/recordmod.c +++ /dev/null @@ -1,45 +0,0 @@ - -#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; -} - |