From b1fc73ad4d6042b1213aa9e28c9fca05e7b0409e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 3 Mar 2015 12:30:51 +0100 Subject: imake cleanup: Drop all references to XVirtualFramebufferServer. --- nx-X11/config/cf/README | 1 - nx-X11/config/cf/X11.tmpl | 1 - nx-X11/config/cf/host.def | 8 ------- nx-X11/config/cf/xf86site.def | 6 ------ nx-X11/config/cf/xfree86.cf | 3 --- nx-X11/config/cf/xorg.cf | 4 ---- nx-X11/config/cf/xorgsite.def | 6 ------ nx-X11/programs/Xserver/Imakefile | 42 ++---------------------------------- nx-X11/programs/Xserver/hw/Imakefile | 6 +----- 9 files changed, 3 insertions(+), 74 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README index 762dce44c..8317ef4f0 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 - 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 CgiBinDir path used by Web server for CGI programs diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 7321843a7..38e627181 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -386,7 +386,6 @@ XORGRELSTRING = XorgManVersionString #else #define BuildFontLib (BuildLibraries || \ (BuildServer && !DoLoadableServer) || \ - XVirtualFramebufferServer || \ XprtServer || XdmxServer) #endif #endif diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 1f70509dd..28f0e3ada 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -75,13 +75,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 Xvfb, uncomment this. - * -#define XVirtualFramebufferServer NO - */ -#define XVirtualFramebufferServer NO - /* * To enable building Xdmx, uncomment this. * @@ -965,7 +958,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 XVirtualFramebufferServer NO #define BuildFontServer NO #define BuildFreeType NO #define BuildXTrueType NO diff --git a/nx-X11/config/cf/xf86site.def b/nx-X11/config/cf/xf86site.def index 6fc5e66b6..4cdf0d893 100644 --- a/nx-X11/config/cf/xf86site.def +++ b/nx-X11/config/cf/xf86site.def @@ -44,12 +44,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define XF86Server NO */ -/* - * To disable building Xvfb, uncomment this. - * -#define XVirtualFramebufferServer NO - */ - /* * To enable building Xdmx, uncomment this. * diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf index 306586d92..ea82a9d22 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 XVirtualFramebufferServer -# define XVirtualFramebufferServer YES -#endif #ifndef XprtServer # define XprtServer YES #endif diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 17fcb7aad..6b482420b 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -1441,10 +1441,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define UseServerLock YES #endif -#ifndef XVirtualFramebufferServer -# define XVirtualFramebufferServer YES -#endif - #ifndef ServerExtraDefines # define ServerExtraDefines XFree86ServerDefines #endif diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def index db4a1e490..ad9bfd8c9 100644 --- a/nx-X11/config/cf/xorgsite.def +++ b/nx-X11/config/cf/xorgsite.def @@ -44,12 +44,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 Xvfb, uncomment this. - * -#define XVirtualFramebufferServer NO - */ - /* * To enable building Xdmx, uncomment this. * diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 7cf43861a..b39b0b985 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(XVirtualFramebufferServer) && XVirtualFramebufferServer -XVFB = Xvfb -#endif #if XdmxServer XDMX = Xdmx #endif @@ -557,10 +554,9 @@ NXWIN = NXWin #if (defined(XF86Server) && XF86Server) || \ (defined(XorgServer) && XorgServer) || \ (defined(NXAgentServer) && NXAgentServer) || \ - (defined(XVirtualFramebufferServer) && XVirtualFramebufferServer) || \ (defined(XdmxServer) && XdmxServer) || \ (!MakeDllModules && defined(NXWinServer) && NXWinServer) -MakeMutex($(XF86SERVER) $(XVFB) $(NXAGENT) $(NXWIN)) +MakeMutex($(XF86SERVER) $(NXAGENT) $(NXWIN)) #endif MakeMutex($(STDDIRS) mfb fb cfb cfb16 cfb24 cfb32) #endif @@ -1054,40 +1050,6 @@ Xnon: $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS) #endif /* XnonServer */ -#if defined(XVirtualFramebufferServer) && XVirtualFramebufferServer -XCOMM -XCOMM server with Virtual (malloced) framebuffer -XCOMM -MFBSUBDIR = mfb -FBSUBDIR = fb -#if defined(Win32Architecture) -XVFBDDXDIR = hw -#else -XVFBDDXDIR = hw/vfb -#endif -XVFBDIRS = $(STDDIRS) $(MFBDIR) $(FBDIR) $(XVFBDDXDIR) $(DEPDIRS) -#ifndef Win32Architecture -#if BuildDPMS -XVFBDPMSSTUBOBJS = $(XVFBDDXDIR)/dpmsstubs.o -#endif -XVFBOBJS = $(XVFBDDXDIR)/stubs.o $(XVFBDDXDIR)/miinitext.o $(XVFBDPMSSTUBOBJS) -#else -XVFBOBJS = dix/main.o hw/vfb/stubs.o hw/vfb/miinitext.o -#endif -XVFB = $(XVFBDDXDIR)/LibraryTargetName(vfb) -XVFBLIBS = PreFbLibs $(XVFB) $(FB) PostFbLibs $(MI) -XVFBSYSLIBS = $(FONTLIBS) $(SYSLIBS) -#if HasParallelMake -MakeMutex($(XVFBDIRS) $(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(XVFBSYSLIBS)) -#endif -#if ForceServerRemake -$(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(XVFBSYSLIBS):: $(XVFBDIRS) - @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi -#endif -ServerTarget(Xvfb,$(XVFBDIRS),$(XVFBOBJS) $(XVFBDEFFILE), \ - $(LIBCWRAPPER) $(XVFBLIBS) $(LOADABLEEXTS),$(XVFBSYSLIBS)) -#endif /* XVirtualFramebufferServer */ - #if defined(XdmxServer) && XdmxServer XCOMM XCOMM distribued multihead Server @@ -1410,7 +1372,7 @@ MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR) IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR) DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) $(LYNXDDXDIR) \ $(HPDDXDIR) $(XFREE86DDXDIR) $(DARWINDDXDIR) \ - $(XVFBDDXDIR) $(XDMXDDXDIR) $(NXAGENTDDXDIR) $(NXWINDDXDIR) + $(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 465b2d241..e01dca4d9 100644 --- a/nx-X11/programs/Xserver/hw/Imakefile +++ b/nx-X11/programs/Xserver/hw/Imakefile @@ -6,15 +6,11 @@ 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 XVirtualFramebufferServer -XVFBDIR = vfb -#endif - #if XdmxServer XDMXDIR = dmx #endif -SUBDIRS= $(XVFBDIR) $(XDMXDIR) +SUBDIRS= $(XDMXDIR) MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) -- cgit v1.2.3