aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-10-29 22:52:53 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-02 17:54:04 +0100
commit96c9aafd6bf6d09ce2e98a77685f5e25b9009e35 (patch)
tree883d169fb5bceee645221b7039ab2284a1b1c0fb /nx-X11/config/cf
parent8dab7c21dde79298274fe73b7a4bbe9c71f006de (diff)
downloadnx-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/config/cf')
-rw-r--r--nx-X11/config/cf/Imake.rules37
-rw-r--r--nx-X11/config/cf/Imake.tmpl6
-rw-r--r--nx-X11/config/cf/host.def17
-rw-r--r--nx-X11/config/cf/linux.cf17
-rw-r--r--nx-X11/config/cf/xf86.rules95
-rw-r--r--nx-X11/config/cf/xorg.cf24
-rw-r--r--nx-X11/config/cf/xorg.tmpl75
-rw-r--r--nx-X11/config/cf/xorgsite.def17
8 files changed, 0 insertions, 288 deletions
diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules
index fb6df65ce..06b78993b 100644
--- 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
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 0545f1094..6406fca33 100644
--- 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
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index bdf440fbc..0dccfad8b 100644
--- 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
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index 085984165..9238b9e6f 100644
--- 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
diff --git a/nx-X11/config/cf/xf86.rules b/nx-X11/config/cf/xf86.rules
index 12125fb9b..879bd3c90 100644
--- 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
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index f967796f0..470c9adb8 100644
--- 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
diff --git a/nx-X11/config/cf/xorg.tmpl b/nx-X11/config/cf/xorg.tmpl
index c5f332b3a..2737ebdf9 100644
--- 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 */
diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def
index f28bb2b2e..1614fce5e 100644
--- 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