aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-03-04 08:35:50 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-04 10:53:36 +0200
commitebe00df38f264ef71dac3c73d416a74685c8cbd2 (patch)
treea6f4b6aced0bdf7f84635d037020060d834757b8 /nx-X11/config/cf
parentb1fc73ad4d6042b1213aa9e28c9fca05e7b0409e (diff)
downloadnx-libs-ebe00df38f264ef71dac3c73d416a74685c8cbd2.tar.gz
nx-libs-ebe00df38f264ef71dac3c73d416a74685c8cbd2.tar.bz2
nx-libs-ebe00df38f264ef71dac3c73d416a74685c8cbd2.zip
imake cleanup: Drop all references to XdmxServer and BuildXdmx*.
Diffstat (limited to 'nx-X11/config/cf')
-rw-r--r--nx-X11/config/cf/README1
-rw-r--r--nx-X11/config/cf/X11.tmpl65
-rw-r--r--nx-X11/config/cf/host.def7
-rw-r--r--nx-X11/config/cf/xf86site.def6
-rw-r--r--nx-X11/config/cf/xorgsite.def6
5 files changed, 5 insertions, 80 deletions
diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index 8317ef4f0..051d58748 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -465,7 +465,6 @@ The following variables are used by some part of the tree:
HtmlDir path used by Web server for HTML and RX docs
CgiBinDir path used by Web server for CGI programs
ProxyManager ICE network ID to contact a running proxymngr
- XdmxServer build Distributed Multihead X server
Make Variables
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 38e627181..09dbc8f70 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -138,18 +138,8 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildDocs
#define BuildDocs !BuildServersOnly
#endif
-#ifndef BuildDmx
-#define BuildDmx NO
-#endif
-#ifndef XdmxServer
-#define XdmxServer BuildDmx
-#endif
-#ifndef BuildLibrariesForDmx
-#define BuildLibrariesForDmx XdmxServer
-#endif
#ifndef BuildLibraries
-#define BuildLibraries (!BuildServersOnly || BuildClients || \
- BuildLibrariesForDmx)
+#define BuildLibraries (!BuildServersOnly || BuildClients)
#endif
#ifndef BuildLibrariesForXServers
#define BuildLibrariesForXServers BuildServer
@@ -362,8 +352,7 @@ XORGRELSTRING = XorgManVersionString
#define BuildXInputExt NO
#endif
#ifndef BuildXInputLib
-#define BuildXInputLib (BuildXInputExt && \
- (!BuildServersOnly || BuildLibrariesForDmx))
+#define BuildXInputLib (BuildXInputExt && !BuildServersOnly)
#endif
#ifndef BuildEVI
#define BuildEVI YES
@@ -385,8 +374,7 @@ XORGRELSTRING = XorgManVersionString
#define BuildFontLib (BuildLibraries || BuildServer)
#else
#define BuildFontLib (BuildLibraries || \
- (BuildServer && !DoLoadableServer) || \
- XprtServer || XdmxServer)
+ (BuildServer && !DoLoadableServer) || XprtServer)
#endif
#endif
#ifndef BuildFontCache
@@ -419,7 +407,6 @@ XORGRELSTRING = XorgManVersionString
#endif
#ifndef BuildXKBlib
#define BuildXKBlib (BuildXKB && (!BuildServersOnly || \
- XdmxServer || \
BuildXkbcomp ))
#endif
#ifndef BuildXKBuilib
@@ -459,13 +446,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXineramaLibrary
#define BuildXineramaLibrary (BuildXinerama)
#endif
-#ifndef BuildDmxDevelTools
-#define BuildDmxDevelTools NO
-#endif
-#ifndef BuildDmxLibrary
-#define BuildDmxLibrary (BuildDmx && \
- (!BuildServersOnly || BuildDmxDevelTools))
-#endif
#ifndef BuildXCSecurity
#define BuildXCSecurity YES
#endif
@@ -550,8 +530,7 @@ XORGRELSTRING = XorgManVersionString
#define BuildXResExt NO
#endif
#ifndef BuildXResLibrary
-#define BuildXResLibrary (BuildXResExt && \
- (!BuildServersOnly || BuildDmxDevelTools))
+#define BuildXResLibrary (BuildXResExt && !BuildServersOnly)
#endif
#ifndef BuildXvExt
#define BuildXvExt NO
@@ -616,7 +595,7 @@ XORGRELSTRING = XorgManVersionString
#define BuildRender YES
#endif
#ifndef BuildRenderLibrary
-#define BuildRenderLibrary (XdmxServer || !BuildServersOnly)
+#define BuildRenderLibrary !BuildServersOnly
#endif
#ifndef BuildXftLibrary
#define BuildXftLibrary BuildRenderLibrary
@@ -2516,30 +2495,6 @@ SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedX
ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir)
#endif
-#if BuildDmxLibrary
-#ifndef SharedLibDmx
-#define SharedLibDmx NO
-#endif
-#ifndef NormalLibDmx
-#define NormalLibDmx YES
-#endif
-#ifndef DebugLibDmx
-#define DebugLibDmx NO
-#endif
-#ifndef ProfileLibDmx
-#define ProfileLibDmx NO
-#endif
-#else /* BuildDmxLibrary */
-#undef SharedLibDmx
-#define SharedLibDmx NO
-#undef NormalLibDmx
-#define NormalLibDmx NO
-#undef DebugLibDmx
-#define DebugLibDmx NO
-#undef ProfileLibDmx
-#define ProfileLibDmx NO
-#endif /* BuildDmxLibrary */
-
XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
#if SharedLibXxf86rush
#ifndef SharedXxf86rushRev
@@ -2592,16 +2547,6 @@ SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev)
ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir)
#endif
- DMXLIBSRC = $(LIBSRC)/dmx
-#if SharedLibDmx
-#ifndef SharedDmxRev
-#define SharedDmxRev 1.0
-#endif
-SharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev)
-#else
-ProjectUnsharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),XBuildLibDir)
-#endif
-
DPSLIBSRC = $(LIBSRC)/dps
#if SharedLibDps
#ifndef SharedDpsRev
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 28f0e3ada..4a5f4b21a 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -76,13 +76,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define XorgServer NO
/*
- * To enable building Xdmx, uncomment this.
- *
-#define XdmxServer YES
- */
-#define XdmxServer NO
-
-/*
* To disable building Xprt, uncomment this.
*
#define XprtServer NO
diff --git a/nx-X11/config/cf/xf86site.def b/nx-X11/config/cf/xf86site.def
index 4cdf0d893..ca429c9b9 100644
--- a/nx-X11/config/cf/xf86site.def
+++ b/nx-X11/config/cf/xf86site.def
@@ -45,12 +45,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*/
/*
- * To enable building Xdmx, uncomment this.
- *
-#define XdmxServer YES
- */
-
-/*
* To disable building Xprt, uncomment this.
*
#define XprtServer NO
diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def
index ad9bfd8c9..ee0c5db98 100644
--- a/nx-X11/config/cf/xorgsite.def
+++ b/nx-X11/config/cf/xorgsite.def
@@ -45,12 +45,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*/
/*
- * To enable building Xdmx, uncomment this.
- *
-#define XdmxServer YES
- */
-
-/*
* To disable building Xprt, uncomment this.
*
#define XprtServer NO