[X2Go-Commits] [nx-libs] 02/45: imake cleanup: Drop all references to XNestServer.
git-admin at x2go.org
git-admin at x2go.org
Mon Apr 27 04:50:10 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit 6471f66c99864dd95a7c4f866825fcb9f8fd3a33
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Mar 3 12:13:59 2015 +0100
imake cleanup: Drop all references to XNestServer.
---
nx-X11/config/cf/README | 1 -
nx-X11/config/cf/X11.tmpl | 4 ++--
nx-X11/config/cf/host.def | 10 +-------
nx-X11/config/cf/xf86site.def | 6 -----
nx-X11/config/cf/xfree86.cf | 3 ---
nx-X11/config/cf/xorg.cf | 3 ---
nx-X11/config/cf/xorgsite.def | 6 -----
nx-X11/lib/X11/Imakefile | 2 +-
nx-X11/programs/Xserver/Imakefile | 42 ++--------------------------------
nx-X11/programs/Xserver/hw/Imakefile | 6 +----
10 files changed, 7 insertions(+), 76 deletions(-)
diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index c4c5f59..762dce4 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -461,7 +461,6 @@ The following variables are used by some part of the tree:
SvgaConfig default SVGA configuration
HasGetReturnAddress util/memleak
HasShadowPasswd system has getspnam() function
- XnestServer build X server with Xlib-based ddx
XVirtualFramebufferServer build X server with virtual memory framebuffer
WebServer host:port of your Web server (see programs/xrx)
HtmlDir path used by Web server for HTML and RX docs
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 4600f18..7321843 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -386,7 +386,7 @@ XORGRELSTRING = XorgManVersionString
#else
#define BuildFontLib (BuildLibraries || \
(BuildServer && !DoLoadableServer) || \
- XnestServer || XVirtualFramebufferServer || \
+ XVirtualFramebufferServer || \
XprtServer || XdmxServer)
#endif
#endif
@@ -420,7 +420,7 @@ XORGRELSTRING = XorgManVersionString
#endif
#ifndef BuildXKBlib
#define BuildXKBlib (BuildXKB && (!BuildServersOnly || \
- XnestServer || XdmxServer || \
+ XdmxServer || \
BuildXkbcomp ))
#endif
#ifndef BuildXKBuilib
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 1d03cf0..1f70509 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 disable building the Xnest server, uncomment this.
- *
-#define XnestServer NO
- */
-#define XnestServer NO
-
-/*
* To disable building Xvfb, uncomment this.
*
#define XVirtualFramebufferServer NO
@@ -167,7 +160,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*
#define BuildLibrariesForXServers YES
*/
-#if XnestServer || NXAgentServer
+#if NXAgentServer
#define BuildLibraries YES
#endif
@@ -972,7 +965,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define DefaultRGBDatabase /usr/NX/share/rgb
#define XprtServer NO
#define BuildXprint NO
-#define XnestServer NO
#define XVirtualFramebufferServer NO
#define BuildFontServer NO
#define BuildFreeType NO
diff --git a/nx-X11/config/cf/xf86site.def b/nx-X11/config/cf/xf86site.def
index d445c1c..6fc5e66 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 disable building the Xnest server, uncomment this.
- *
-#define XnestServer NO
- */
-
-/*
* To disable building Xvfb, uncomment this.
*
#define XVirtualFramebufferServer NO
diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf
index f7c151c..306586d 100644
--- a/nx-X11/config/cf/xfree86.cf
+++ b/nx-X11/config/cf/xfree86.cf
@@ -1876,9 +1876,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
# define UseServerLock YES
#endif
-#ifndef XnestServer
-# define XnestServer YES
-#endif
#ifndef XVirtualFramebufferServer
# define XVirtualFramebufferServer YES
#endif
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 71dab56..17fcb7a 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -1441,9 +1441,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
# define UseServerLock YES
#endif
-#ifndef XnestServer
-# define XnestServer YES
-#endif
#ifndef XVirtualFramebufferServer
# define XVirtualFramebufferServer YES
#endif
diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def
index dea5ceb..db4a1e4 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 disable building the Xnest server, uncomment this.
- *
-#define XnestServer NO
- */
-
-/*
* To disable building Xvfb, uncomment this.
*
#define XVirtualFramebufferServer NO
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 0437af1..ca6ce96 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -27,7 +27,7 @@ XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.52 2003/05/27 16:53:15 tsi Exp $
HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \
Xcms.h Xlocale.h XKBlib.h XlibConf.h Xregion.h ImUtil.h
-#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer && !NXAgentServer
+#if BuildServersOnly && !BuildGLXLibrary && !BuildClients && !XdmxServer && !NXAgentServer
all::
BuildIncludes($(HEADERS),IncSubdir,..)
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 3e9f001..7cf4386 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -542,9 +542,6 @@ XF86SERVER = XFree86
#if defined(XorgServer) && XorgServer
XF86SERVER = Xorg
#endif
-#if defined(XnestServer) && XnestServer
-XNEST = Xnext
-#endif
#if defined(XVirtualFramebufferServer) && XVirtualFramebufferServer
XVFB = Xvfb
#endif
@@ -559,12 +556,11 @@ NXWIN = NXWin
#endif
#if (defined(XF86Server) && XF86Server) || \
(defined(XorgServer) && XorgServer) || \
- (defined(XnestServer) && XnestServer) || \
(defined(NXAgentServer) && NXAgentServer) || \
(defined(XVirtualFramebufferServer) && XVirtualFramebufferServer) || \
(defined(XdmxServer) && XdmxServer) || \
(!MakeDllModules && defined(NXWinServer) && NXWinServer)
-MakeMutex($(XF86SERVER) $(XNEST) $(XVFB) $(NXAGENT) $(NXWIN))
+MakeMutex($(XF86SERVER) $(XVFB) $(NXAGENT) $(NXWIN))
#endif
MakeMutex($(STDDIRS) mfb fb cfb cfb16 cfb24 cfb32)
#endif
@@ -879,40 +875,6 @@ ServerTarget(Xprt,$(XPSUBDIRS),$(XPOBJS), \
$(LIBCWRAPPER) $(XPLIBS) $(LOADABLEEXTS),$(XPSYSLIBS))
#endif /* XprtServer */
-#if defined(XnestServer) && XnestServer
-XCOMM
-XCOMM Server with Xlib-based ddx
-XCOMM
-#ifndef Win32Architecture
-XNESTDDXDIR = hw/xnest
-#else
-XNESTDDXDIR = hw
-#endif
-#if BuildDPMS
-XNESTDPMSSTUBOBJS = $(XNESTDDXDIR)/dpmsstubs.o
-#endif
-XNESTDIRS = $(STDDIRS) $(XNESTDDXDIR) $(DEPDIRS)
-#if !defined(LynxOSArchitecture) && \
- !defined(Win32Architecture) && \
- !defined(QNX4Architecture)
-XNESTOBJS = hw/xnest/miinitext.o $(XNESTDPMSSTUBOBJS)
-#else
-XNESTOBJS = hw/xnest/miinitext.o dix/main.o $(XNESTDPMSSTUBOBJS)
-#endif
-XNEST = hw/xnest/LibraryTargetName(xnest)
-XNESTLIBS = PreFbLibs $(XNEST) NoMfbPostFbLibs $(XNEST)
-XNESTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XNESTDIRS) $(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS))
-#endif
-#if ForceServerRemake
-$(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS):: $(XNESTDIRS)
- @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
-#endif
-ServerTarget(Xnest,$(XNESTDIRS),$(XNESTOBJS) $(XNESTDEFFILE), \
- $(LIBCWRAPPER) $(XNESTLIBS) $(LOADABLEEXTS),$(XNESTSYSLIBS))
-#endif /* XnestServer */
-
#if defined(NXAgentServer) && NXAgentServer
XCOMM
XCOMM Nested server with NXlib-based ddx and compressed transport.
@@ -1448,7 +1410,7 @@ MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR)
IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) $(LYNXDDXDIR) \
$(HPDDXDIR) $(XFREE86DDXDIR) $(DARWINDDXDIR) \
- $(XVFBDDXDIR) $(XNESTDDXDIR) $(XDMXDDXDIR) $(NXAGENTDDXDIR) $(NXWINDDXDIR)
+ $(XVFBDDXDIR) $(XDMXDDXDIR) $(NXAGENTDDXDIR) $(NXWINDDXDIR)
SUBDIRS = $(STDDIRS) $(MFBSUBDIR) $(CFBSUBDIRS) \
$(IPLANDIRS) $(ILBMDIR) $(AFBSUBDIR) \
$(DDXDIRS) $(FBSUBDIR) $(KDRIVEDIRS) $(MIEXTDIRS)
diff --git a/nx-X11/programs/Xserver/hw/Imakefile b/nx-X11/programs/Xserver/hw/Imakefile
index 6ea7f00..465b2d2 100644
--- a/nx-X11/programs/Xserver/hw/Imakefile
+++ b/nx-X11/programs/Xserver/hw/Imakefile
@@ -6,10 +6,6 @@ XCOMM This is only used on NT where we do not know how to jump over this dir
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
-#if XnestServer
-XNESTDIR = xnest
-#endif
-
#if XVirtualFramebufferServer
XVFBDIR = vfb
#endif
@@ -18,7 +14,7 @@ XVFBDIR = vfb
XDMXDIR = dmx
#endif
-SUBDIRS= $(XNESTDIR) $(XVFBDIR) $(XDMXDIR)
+SUBDIRS= $(XVFBDIR) $(XDMXDIR)
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list