aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-05-01 15:57:02 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-05-20 12:16:15 +0200
commite9dcab679cb686b25df921c2c233198cb9dcfbb8 (patch)
tree622e3dc0cf971d4962eecac6dc27ae3a245afb72 /nx-X11/config
parent24903c921fcab7143d48ca9ba1f47cd8d6696fb5 (diff)
downloadnx-libs-e9dcab679cb686b25df921c2c233198cb9dcfbb8.tar.gz
nx-libs-e9dcab679cb686b25df921c2c233198cb9dcfbb8.tar.bz2
nx-libs-e9dcab679cb686b25df921c2c233198cb9dcfbb8.zip
library clean-up: Don't build libNX_Xrandr anymore. Use system's libXrandr shared library.
Diffstat (limited to 'nx-X11/config')
-rw-r--r--nx-X11/config/cf/X11.tmpl37
-rw-r--r--nx-X11/config/cf/host.def2
-rw-r--r--nx-X11/config/cf/lnxLib.tmpl1
3 files changed, 0 insertions, 40 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index de60cecaa..37f89696d 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -325,9 +325,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildRandR
#define BuildRandR YES
#endif
-#ifndef BuildRandRLibrary
-#define BuildRandRLibrary !BuildServersOnly
-#endif
#ifndef BuildXfixes
#define BuildXfixes YES
@@ -1529,30 +1526,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
#define ProfileLibXrender NO
#endif
-#if BuildRandRLibrary
-# ifndef SharedLibXrandr
-# define SharedLibXrandr HasSharedLibraries
-# endif
-# ifndef NormalLibXrandr
-# define NormalLibXrandr (!SharedLibXrandr || ForceNormalLib)
-# endif
-# ifndef DebugLibXrandr
-# define DebugLibXrandr NO
-# endif
-# ifndef ProfileLibXrandr
-# define ProfileLibXrandr NO
-# endif
-#else
-# undef SharedLibXrandr
-# define SharedLibXrandr NO
-# undef NormalLibXrandr
-# define NormalLibXrandr NO
-# undef DebugLibXrandr
-# define DebugLibXrandr NO
-# undef ProfileLibXrandr
-# define ProfileLibXrandr NO
-#endif
-
#if BuildXfixesLibrary
#ifndef SharedLibXfixes
#define SharedLibXfixes HasSharedLibraries
@@ -1753,16 +1726,6 @@ SharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrend
ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir)
#endif
- XRANDRLIBSRC = $(LIBSRC)/Xrandr
-#if SharedLibXrandr
-#ifndef SharedXrandrRev
-#define SharedXrandrRev 2.0
-#endif
-SharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev)
-#else
-ProjectUnsharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
-#endif
-
XFIXESLIBSRC = $(LIBSRC)/Xfixes
#if SharedLibXfixes
#ifndef SharedXfixesRev
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 0566befdd..02eabbb9f 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -127,8 +127,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define BuildCompositeLibrary YES
-#define BuildRandRLibrary YES
-
#define BuildDocs NO
#define BuildComposite YES
diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl
index 23fdf0fe3..33c89e102 100644
--- a/nx-X11/config/cf/lnxLib.tmpl
+++ b/nx-X11/config/cf/lnxLib.tmpl
@@ -9,7 +9,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
#define SharedOldXReqs $(LDPRELIB) $(XONLYLIB)
#define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
#define SharedXrenderReqs $(LDPRELIB) $(XLIB)
#define SharedXtstReqs $(LDPRELIB) $(XLIB)