From 4693c32031d72929dcc86eb1e98c3fbf1b04e066 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 23 Jun 2016 09:58:54 +0200
Subject: nx-X11/lib/X10: Drop really ancient X10 API code. Not used within
 nxagent.

---
 nx-X11/config/cf/README       |  6 ------
 nx-X11/config/cf/X11.tmpl     | 22 ----------------------
 nx-X11/config/cf/lnxLib.rules |  4 ----
 nx-X11/config/cf/lnxLib.tmpl  |  1 -
 4 files changed, 33 deletions(-)

(limited to 'nx-X11/config/cf')

diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index 0faa34ae7..826682314 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -191,7 +191,6 @@ X11.tmpl provides defaults for the following variables:
 	DebugLibX11		build libX11_d.a
 	DebugLibXau		build libXau_d.a
 	DebugLibXext		build libXext_d.a
-	DebugOldX		build liboldX_d.a
 	DefaultCursorTheme      name of default cursor theme
 	DefaultFontPath		default server font path
 	DefaultRGBDatabase	default server rgb color database
@@ -226,13 +225,11 @@ X11.tmpl provides defaults for the following variables:
 	NormalLibX11		build libX11.a
 	NormalLibXau		build libXau.a
 	NormalLibXext		build libXext.a
-	NormalOldX		build liboldX.a
 	OsNameDefines		If uname(2) unavailable, set to -DOS_NAME=OSName
 	PrimaryScreenResolution	resolution of default server screen
 	ProfileLibX11		build libX11_p.a
 	ProfileLibXau		build libXau_p.a
 	ProfileLibXext		build libXext_p.a
-	ProfileOldX		build liboldX_p.a
 	ProjectX		version indicating this is the X Window System
 	RemoveTargetProgramByMoving	boolean for rm -f that doesn't
 	SHELLPATH		-D for /bin/sh
@@ -244,7 +241,6 @@ X11.tmpl provides defaults for the following variables:
 	SharedLibX11		boolean for making sharable libX11.so
 	SharedLibXau		boolean for making sharable libXau.so
 	SharedLibXext		boolean for making sharable libXext.so
-	SharedOldX		boolean for making sharable liboldX.so
 	ShmDefines		MIT-SHM define
 	TwmDir			directory in which to install twm config files
 	UseCCMakeDepend		boolean for using alternate makedepend script
@@ -313,8 +309,6 @@ An <os>Lib.rules file provides defaults for the following variables:
 
 An <os>Lib.tmpl file provides defaults for the following variables:
 
-	SharedOldXReqs		required libs for liboldX.so
-	SharedOldXRev		version number for liboldX.so
 	SharedX11Reqs		required libs for libX11.so
 	SharedX11Rev		version number for libX11.so
 	SharedXauReqs		required libs for libXau.so
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 89b069772..60693afd5 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -1263,28 +1263,6 @@ ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR))
 #endif
 #endif
 
-#ifndef SharedOldX
-#define SharedOldX HasSharedLibraries
-#endif
-#ifndef NormalOldX
-#define NormalOldX (!SharedOldX | ForceNormalLib)
-#endif
-#ifndef DebugOldX
-#define DebugOldX		NO	/* debugged old X library */
-#endif
-#ifndef ProfileOldX
-#define ProfileOldX		NO	/* profiled old X library */
-#endif
-       OLDXLIBSRC = $(LIBSRC)/oldX
-#if SharedOldX
-#ifndef SharedOldXRev
-#define SharedOldXRev 6.0
-#endif
-SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev)
-#else
-ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir)
-#endif
-
 #if HasMotif
 
 #ifndef MotifDir
diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules
index 60ecd3f9e..f6f5f8d0b 100644
--- a/nx-X11/config/cf/lnxLib.rules
+++ b/nx-X11/config/cf/lnxLib.rules
@@ -15,10 +15,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
 #define UseRpath NO
 #endif
 
-#ifndef SharedOldX
-# define SharedOldX NO
-#endif
-
 #if UseElfFormat
 
 # if (LinuxCLibMajorVersion >= 5 && LinuxCLibMinorVersion >= 4) || LinuxCLibMajorVersion >= 6
diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl
index d1bda0a50..3f9c65813 100644
--- a/nx-X11/config/cf/lnxLib.tmpl
+++ b/nx-X11/config/cf/lnxLib.tmpl
@@ -7,7 +7,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
 
 #define SharedX11Reqs     $(LDPRELIB) -ldl -lXdmcp
 #define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedOldXReqs	  $(LDPRELIB) $(XONLYLIB)
 #define SharedXextReqs	  $(LDPRELIB) $(XONLYLIB)
 
 #define SharedxkbfileReqs	$(LDPRELIB) $(XONLYLIB)
-- 
cgit v1.2.3