aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-06-21 18:12:11 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-29 19:11:59 +0100
commitbd592c2e7edb7cd3dd06dd6c13b559bd6c498596 (patch)
tree2b33c92ce02ed89726cd32d0e46ff578aad1361f /nx-X11/config/cf
parentb768e8124b8c76a7617a51fee56bc85c1d54e8c5 (diff)
downloadnx-libs-bd592c2e7edb7cd3dd06dd6c13b559bd6c498596.tar.gz
nx-libs-bd592c2e7edb7cd3dd06dd6c13b559bd6c498596.tar.bz2
nx-libs-bd592c2e7edb7cd3dd06dd6c13b559bd6c498596.zip
library clean-up: Don't build libNX_Xtst anymore. Use system's libXtst shared library. (Fixes ArcticaProject/nx-libs#32).
Diffstat (limited to 'nx-X11/config/cf')
-rw-r--r--nx-X11/config/cf/README6
-rw-r--r--nx-X11/config/cf/X11.tmpl22
2 files changed, 0 insertions, 28 deletions
diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index 66d9639f9..3e1fe95a3 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -196,7 +196,6 @@ X11.tmpl provides defaults for the following variables:
DebugLibX11 build libX11_d.a
DebugLibXau build libXau_d.a
DebugLibXext build libXext_d.a
- DebugLibXtst build libXtst_d.a
DebugOldX build liboldX_d.a
DefaultCursorTheme name of default cursor theme
DefaultFontPath default server font path
@@ -232,14 +231,12 @@ X11.tmpl provides defaults for the following variables:
NormalLibX11 build libX11.a
NormalLibXau build libXau.a
NormalLibXext build libXext.a
- NormalLibXtst build libXtst.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
- ProfileLibXtst build libXtst_p.a
ProfileOldX build liboldX_p.a
ProjectX version indicating this is the X Window System
RemoveTargetProgramByMoving boolean for rm -f that doesn't
@@ -252,7 +249,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
- SharedLibXtst boolean for making sharable libXtst.so
SharedOldX boolean for making sharable liboldX.so
ShmDefines MIT-SHM define
TwmDir directory in which to install twm config files
@@ -330,8 +326,6 @@ An <os>Lib.tmpl file provides defaults for the following variables:
SharedXauRev version number for libXau.so
SharedXextReqs required libs for libXext.so
SharedXextRev version number for libXext.so
- SharedXtstReqs required libs for libXtst.so
- SharedXtstRev version number for libXtst.so
Vendor.cf files and/or site/host specific .def files may define the
following variables:
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index f32cdadbf..af466b47f 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -1463,28 +1463,6 @@ SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev)
ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir)
#endif
-#ifndef SharedLibXtst
-#define SharedLibXtst HasSharedLibraries
-#endif
-#ifndef NormalLibXtst
-#define NormalLibXtst (!SharedLibXtst | ForceNormalLib)
-#endif
-#ifndef DebugLibXtst
-#define DebugLibXtst NO /* debugged Xtst library */
-#endif
-#ifndef ProfileLibXtst
-#define ProfileLibXtst NO /* profiled Xtst library */
-#endif
- XTESTLIBSRC = $(LIBSRC)/Xtst
-#if SharedLibXtst
-#ifndef SharedXtstRev
-#define SharedXtstRev 6.1
-#endif
-SharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev)
-#else
-ProjectUnsharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),XBuildLibDir)
-#endif
-
#if HasMotif
#ifndef MotifDir