From 9c46d3ddb4394126408a557af98ea9766c554059 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 3 Mar 2015 12:09:06 +0100 Subject: imake cleanup: Drop all references to XWinServer. --- nx-X11/config/cf/host.def | 1 - 1 file changed, 1 deletion(-) (limited to 'nx-X11/config') diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 9b482c620..1d03cf03f 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -149,7 +149,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ */ #if defined(cygwinArchitecture) #define NXWinServer NO -#define XWinServer NO #endif /* -- cgit v1.2.3 From 6471f66c99864dd95a7c4f866825fcb9f8fd3a33 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 3 Mar 2015 12:13:59 +0100 Subject: 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 ------ 7 files changed, 3 insertions(+), 30 deletions(-) (limited to 'nx-X11/config') diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README index c4c5f59ab..762dce44c 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 4600f1824..7321843a7 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 1d03cf03f..1f70509dd 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 the Xnest server, uncomment this. - * -#define XnestServer NO - */ -#define XnestServer NO - /* * To disable building Xvfb, uncomment this. * @@ -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 d445c1c72..6fc5e66b6 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 the Xnest server, uncomment this. - * -#define XnestServer NO - */ - /* * To disable building Xvfb, uncomment this. * diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf index f7c151c41..306586d92 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 71dab5631..17fcb7aad 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 dea5ceb92..db4a1e490 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 the Xnest server, uncomment this. - * -#define XnestServer NO - */ - /* * To disable building Xvfb, uncomment this. * -- cgit v1.2.3 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 ------ 7 files changed, 29 deletions(-) (limited to 'nx-X11/config') 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. * -- cgit v1.2.3 From ebe00df38f264ef71dac3c73d416a74685c8cbd2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 4 Mar 2015 08:35:50 +0100 Subject: imake cleanup: Drop all references to XdmxServer and BuildXdmx*. --- nx-X11/config/cf/README | 1 - nx-X11/config/cf/X11.tmpl | 65 ++++--------------------------------------- nx-X11/config/cf/host.def | 7 ----- nx-X11/config/cf/xf86site.def | 6 ---- nx-X11/config/cf/xorgsite.def | 6 ---- 5 files changed, 5 insertions(+), 80 deletions(-) (limited to 'nx-X11/config') 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 @@ -2590,16 +2545,6 @@ ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) #else 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 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 @@ -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 enable building Xdmx, uncomment this. - * -#define XdmxServer YES - */ -#define XdmxServer NO - /* * To disable building Xprt, uncomment this. * 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 @@ -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 enable building Xdmx, uncomment this. - * -#define XdmxServer YES - */ - /* * To disable building Xprt, uncomment this. * 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 @@ -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 enable building Xdmx, uncomment this. - * -#define XdmxServer YES - */ - /* * To disable building Xprt, uncomment this. * -- cgit v1.2.3 From f5f280417cb0af489406c8c3234e4ad69b008c74 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 4 Mar 2015 13:29:02 +0100 Subject: imake cleanup: Drop all references to XprtServer and BuildXprint*. --- nx-X11/config/cf/README | 8 -------- nx-X11/config/cf/X11.tmpl | 35 +++-------------------------------- nx-X11/config/cf/host.def | 17 ----------------- nx-X11/config/cf/xf86site.def | 6 ------ nx-X11/config/cf/xfree86.cf | 4 ---- nx-X11/config/cf/xorgsite.def | 6 ------ 6 files changed, 3 insertions(+), 73 deletions(-) (limited to 'nx-X11/config') diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README index 051d58748..e1b65a378 100644 --- a/nx-X11/config/cf/README +++ b/nx-X11/config/cf/README @@ -325,14 +325,6 @@ X11.tmpl provides defaults for the following variables: XdmDir directory in which to install xdm files XdmServersType type of xdm Xservers file to install XinitDir directory in which to install xinit files - XPrintDir parent of X Print server config directory - XprtServer build the X Print server - XpRasterDDX include the raster print ddx driver - XpColorPclDDX include the color PCL print ddx driver - XpMonoPclDDX include the monochrome PCL print ddx driver - XpPostScriptDDX include the PostScript print ddx driver - XpPdfDDX include the PDF print ddx driver - XpSvgDDX include the SVG print ddx driver XmanLocalSearchPath non-standard path for man pages XtErrorPrefix leading text in XtError() msg; eg. 'X Toolkit ' XtWarningPrefix leading text in XtWarning()msg, same as above diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 09dbc8f70..71a5d26e7 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -373,8 +373,7 @@ XORGRELSTRING = XorgManVersionString #if (!defined(XF86Server) || !XF86Server) && (!defined (XorgServer) || !XorgServer) #define BuildFontLib (BuildLibraries || BuildServer) #else -#define BuildFontLib (BuildLibraries || \ - (BuildServer && !DoLoadableServer) || XprtServer) +#define BuildFontLib (BuildLibraries || (BuildServer && !DoLoadableServer)) #endif #endif #ifndef BuildFontCache @@ -486,19 +485,6 @@ XORGRELSTRING = XorgManVersionString #define XpSvgDDX YES #endif -#ifndef BuildXprint -#define BuildXprint YES -#endif -#ifndef XprtServer -#define XprtServer (BuildServer && BuildXprint) -#endif -#ifndef BuildXprintLib -#define BuildXprintLib (!BuildServersOnly && BuildXprint) -#endif -#ifndef BuildXprintClients -#define BuildXprintClients BuildXprintLib -#endif - #ifndef BuildScreenSaverExt #define BuildScreenSaverExt NO #endif @@ -978,17 +964,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #ifndef PrintOnlyServer #define PrintOnlyServer YES #endif -#ifndef XprintDefines -#if BuildXprint -#if PrintOnlyServer -#define XprintDefines -DXPRINT -DPIXPRIV -#else -#define XprintDefines -DXPRINT -DLOADABLEPRINTDDX -DPIXPRIV -#endif -#else -#define XprintDefines /**/ -#endif -#endif #ifndef XkbDefines #if BuildXKB #define XkbDefines -DXKB @@ -1221,7 +1196,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN ShapeDefines XInputDefines XkbDefines LbxDefines AppgroupDefines \ XCSecurityDefines CupDefines PervasiveDBEDefines \ XF86BigfontExtensionDefines DPMSDefines \ - XprintDefines XineramaDefines \ + XineramaDefines \ SitePervasiveExtensionDefines RenderDefines RandRDefines \ XfixesDefines XDamageDefines CompositeDefines XevieDefines \ RootlessDefines @@ -1522,9 +1497,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #ifndef ServerConfigDir #define ServerConfigDir $(LIBDIR)/xserver #endif -#ifndef XPrintDir -#define XPrintDir ServerConfigDir -#endif #ifndef EtcX11Directory #define EtcX11Directory /etc/X11 #endif @@ -1657,7 +1629,6 @@ XCOMM X Window System make variables; these need to be coordinated with rules XLOCALEDIR = XLocaleDir /* locale files */ LBXPROXYDIR = LbxproxyDir /* lbxproxy files */ PROXYMANAGERDIR = ProxyManagerDir /* proxy manager config files */ - XPRINTDIR = XPrintDir /* print config file root */ XAPPLOADDIR = XAppLoadDir /* application default resource dir */ FONTCFLAGS = FontCompilerFlags @@ -2908,7 +2879,7 @@ UnsharedLibReferences(XA,NX_Xa,$(XALIBSRC)) #endif #ifndef BuildXaw -#define BuildXaw (BuildXprintLib && !BuildServersOnly) +#define BuildXaw !BuildServersOnly #endif /* AWIDGETSRC is needed by libXaw6 and libXaw7 */ diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 4a5f4b21a..cae87f153 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -75,21 +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 Xprt, uncomment this. - * -#define XprtServer NO - */ -#define XprtServer NO - -/* - * Xprint is needed by Xprt. You can disable it if - * you are not going to build Xprt. - * -#define BuildXprint NO - */ -#define BuildXprint NO - /* * Building libraries with NX enhancements is disabled * by default. You should enable this in your host.def. @@ -949,8 +934,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildServersOnly YES #define DefaultFontPath /usr/NX/share/fonts/misc/,/usr/NX/share/fonts/TTF/ #define DefaultRGBDatabase /usr/NX/share/rgb -#define XprtServer NO -#define BuildXprint 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 ca429c9b9..db89ffe4c 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 Xprt, uncomment this. - * -#define XprtServer NO - */ - /* * Set the default server (ie the one that gets the sym-link to "X") * diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf index ea82a9d22..5832096ec 100644 --- a/nx-X11/config/cf/xfree86.cf +++ b/nx-X11/config/cf/xfree86.cf @@ -1876,10 +1876,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define UseServerLock YES #endif -#ifndef XprtServer -# define XprtServer 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 ee0c5db98..6083ce5b3 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 Xprt, uncomment this. - * -#define XprtServer NO - */ - /* * Set the default server (ie the one that gets the sym-link to "X") * -- cgit v1.2.3 From 78ac4396a61f784e571fe77155ae9b27065beb08 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 4 Mar 2015 13:34:21 +0100 Subject: imake cleanup: Drop all references to BuildFontServer. --- nx-X11/config/cf/README | 1 - nx-X11/config/cf/X11.tmpl | 6 +----- nx-X11/config/cf/host.def | 8 -------- nx-X11/config/cf/xf86site.def | 6 ------ nx-X11/config/cf/xfree86.cf | 7 ------- nx-X11/config/cf/xorg.cf | 7 ------- nx-X11/config/cf/xorgsite.def | 6 ------ 7 files changed, 1 insertion(+), 40 deletions(-) (limited to 'nx-X11/config') diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README index e1b65a378..a31490377 100644 --- a/nx-X11/config/cf/README +++ b/nx-X11/config/cf/README @@ -178,7 +178,6 @@ X11.tmpl provides defaults for the following variables: BuildDBE build DOUBLE-BUFFER extension BuildDmx build Distributed Multihead X server and extension BuildDPMS build Display Power Management Signaling extension - BuildFontServer build font server BuildFonts build pcf fonts BuildIncRoot relative path to location of headers in build BuildIncTop path from build includes directory to top diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 71a5d26e7..b6ff72e1f 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -144,9 +144,6 @@ XORGRELSTRING = XorgManVersionString #ifndef BuildLibrariesForXServers #define BuildLibrariesForXServers BuildServer #endif -#ifndef BuildFontServer -#define BuildFontServer YES -#endif #ifndef XserverStaticFontLib #define XserverStaticFontLib YES #endif @@ -166,7 +163,7 @@ XORGRELSTRING = XorgManVersionString #define BuildBuiltinFonts NO #endif #ifndef BuildFonts -#define BuildFonts (BuildServer | BuildFontServer) +#define BuildFonts BuildServer #endif #ifndef Build75DpiFonts #define Build75DpiFonts YES @@ -1688,7 +1685,6 @@ XCOMM X Window System make variables; these need to be coordinated with rules RGBSRC = $(XTOP)/programs/rgb BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir - FONTSERVERSRC = $(PROGRAMSRC)/xfs FONTINCSRC = $(XTOP)/include/fonts EXTINCSRC = $(XTOP)/include/extensions FTSOURCEDIR = FreeTypeSrcDir diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index cae87f153..1bd3289ab 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -249,13 +249,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildMatroxHal YES */ -/* - * To disable building the font server, uncomment this. - * -#define BuildFontServer NO - */ -#define BuildFontServer NO - /* * Speedo fonts have been disabled by default in this release. * To re-enable support for Speedo fonts, uncomment this. @@ -934,7 +927,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildServersOnly YES #define DefaultFontPath /usr/NX/share/fonts/misc/,/usr/NX/share/fonts/TTF/ #define DefaultRGBDatabase /usr/NX/share/rgb -#define BuildFontServer NO #define BuildFreeType NO #define BuildXTrueType NO #define FontLibSharedFreeType YES diff --git a/nx-X11/config/cf/xf86site.def b/nx-X11/config/cf/xf86site.def index db89ffe4c..39d8980b6 100644 --- a/nx-X11/config/cf/xf86site.def +++ b/nx-X11/config/cf/xf86site.def @@ -138,12 +138,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildMatroxHal YES */ -/* - * To disable building the font server, uncomment this. - * -#define BuildFontServer NO - */ - /* * To disable support for Speedo fonts, uncomment this. * diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf index 5832096ec..0348c0302 100644 --- a/nx-X11/config/cf/xfree86.cf +++ b/nx-X11/config/cf/xfree86.cf @@ -1683,13 +1683,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define HasMTRRSupport NO #endif -/* - * Build the font server - */ -#ifndef BuildFontServer -# define BuildFontServer YES -#endif - /* * Include fonts support */ diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 6b482420b..3f922359e 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -1247,13 +1247,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define HasMTRRSupport NO #endif -/* - * Build the font server - */ -#ifndef BuildFontServer -# define BuildFontServer YES -#endif - /* * Include fonts support */ diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def index 6083ce5b3..eeaffa496 100644 --- a/nx-X11/config/cf/xorgsite.def +++ b/nx-X11/config/cf/xorgsite.def @@ -152,12 +152,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildMatroxHal YES */ -/* - * To disable building the font server, uncomment this. - * -#define BuildFontServer NO - */ - /* * Speedo fonts have been disabled by default in this release. * To re-enable support for Speedo fonts, uncomment this. -- cgit v1.2.3 From d280fa15e571f568125786c216f168bcbfc1d15a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 4 Mar 2015 14:08:50 +0100 Subject: imake clean: Remove (probably incomplete) support for NXZaurusXServer, NXiPAQXServer. --- nx-X11/config/cf/host.def | 54 ----------------------------------------------- 1 file changed, 54 deletions(-) (limited to 'nx-X11/config') diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 1bd3289ab..a7ae46431 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -46,8 +46,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ /* */ /**************************************************************************/ -#if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) - #if defined(SunArchitecture) #define ProjectRoot /usr/openwin #endif @@ -920,58 +918,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildXaw7 NO -#else /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */ - -#if defined(DarwinArchitecture) && !defined(NXZaurusXServer) && !defined(NXiPAQXServer) -#define NXDarwinServer NO -#define BuildServersOnly YES -#define DefaultFontPath /usr/NX/share/fonts/misc/,/usr/NX/share/fonts/TTF/ -#define DefaultRGBDatabase /usr/NX/share/rgb -#define BuildFreeType NO -#define BuildXTrueType NO -#define FontLibSharedFreeType YES -#endif - -#if !defined(NXZaurusXServer) && defined(NXiPAQXServer) -#define KDriveXServer YES -#define XiPAQH3500Server YES -#define BuildServersOnly YES -#define NXEmbeddedXServer YES -#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=1 -#define TinyXServer YES -#define CrossCompiling YES -#define TouchScreen YES -#define ItsyCompilerBug YES -#undef BuildRandR -#define BuildRandR YES -#define BuildXInputLib YES -#define BuildXTrueType YES -#define ServerXdmcpDefines -#define XipaqServer YES -#endif - -#if !defined(NXiPAQXServer) && defined(NXZaurusXServer) -#define KDriveXServer YES -#define XiPAQH3500Server YES -#define BuildServersOnly YES -#define ZaurusXServer YES -#define NXEmbeddedXServer YES -#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=1 -#define TinyXServer YES -#define CrossCompiling YES -#define TouchScreen YES -#define ItsyCompilerBug YES -#undef BuildRandR -#define BuildRandR YES -#define BuildXInputLib YES -#define BuildXTrueType YES -#define ServerXdmcpDefines -#define XipaqServer YES -#define XfbdevServer YES -#endif - -#endif /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */ - #define BuildRman NO #define BuildFontEncLib NO #define BuildXcursorLibrary NO -- cgit v1.2.3