aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-05-26 12:30:48 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-06-02 05:50:07 +0200
commit6a74e671af51a2afdade8d1fc8ca0ca2ad5c536c (patch)
treefa9bf0f9a89f08cab2557b8752d723f85badd9bd /nx-X11/config/cf
parent4ed85e8ef572130d7862b155d3ee9c1e52743230 (diff)
downloadnx-libs-6a74e671af51a2afdade8d1fc8ca0ca2ad5c536c.tar.gz
nx-libs-6a74e671af51a2afdade8d1fc8ca0ca2ad5c536c.tar.bz2
nx-libs-6a74e671af51a2afdade8d1fc8ca0ca2ad5c536c.zip
library clean-up: Don't compile (i.e., remove) libNX_Xres.a anymore. It is not used anywhere.
Diffstat (limited to 'nx-X11/config/cf')
-rw-r--r--nx-X11/config/cf/X11.tmpl37
-rw-r--r--nx-X11/config/cf/lnxLib.tmpl1
-rw-r--r--nx-X11/config/cf/xfree86.cf3
-rw-r--r--nx-X11/config/cf/xorg.cf3
4 files changed, 0 insertions, 44 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 37f89696d..c1b278e67 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -281,9 +281,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXResExt
#define BuildXResExt NO
#endif
-#ifndef BuildXResLibrary
-#define BuildXResLibrary (BuildXResExt && !BuildServersOnly)
-#endif
#ifndef BuildXvExt
#define BuildXvExt NO
#endif
@@ -1478,30 +1475,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
#define ProfileLibXinerama NO
#endif
-#if BuildXResLibrary
-#ifndef SharedLibXRes
-#define SharedLibXRes HasSharedLibraries
-#endif
-#ifndef NormalLibXRes
-#define NormalLibXRes (!SharedLibXRes || ForceNormalLib)
-#endif
-#ifndef DebugLibXRes
-#define DebugLibXRes NO
-#endif
-#ifndef ProfileLibXRes
-#define ProfileLibXRes NO
-#endif
-#else
-#undef SharedLibXRes
-#define SharedLibXRes NO
-#undef NormalLibXRes
-#define NormalLibXRes NO
-#undef DebugLibXRes
-#define DebugLibXRes NO
-#undef ProfileLibXRes
-#define ProfileLibXRes NO
-#endif
-
#if BuildRenderLibrary
#ifndef SharedLibXrender
#define SharedLibXrender HasSharedLibraries
@@ -1696,16 +1669,6 @@ SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedX
ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir)
#endif
- XRESLIBSRC = $(LIBSRC)/XRes
-#if SharedLibXRes
-#ifndef SharedXResRev
-#define SharedXResRev 1.0
-#endif
-SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev)
-#else
-ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir)
-#endif
-
GLXLIBSRC = $(LIBSRC)/GL
#if SharedLibGlx
#ifndef SharedGlxRev
diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl
index 33c89e102..ee372709a 100644
--- a/nx-X11/config/cf/lnxLib.tmpl
+++ b/nx-X11/config/cf/lnxLib.tmpl
@@ -19,7 +19,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
#endif
#define SharedGLReqs $(LDPRELIB) $(XLIB) ExtraSharedGLReqs
-#define SharedXResReqs $(LDPRELIB) $(XLIB)
#define SharedXineramaReqs $(LDPRELIB) $(XLIB)
#define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB)
#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf
index dea9b74b5..673902129 100644
--- a/nx-X11/config/cf/xfree86.cf
+++ b/nx-X11/config/cf/xfree86.cf
@@ -1541,9 +1541,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
#ifndef BuildGLXLibrary
# define BuildGLXLibrary YES
#endif
-#ifndef BuildXResLibrary
-# define BuildXResLibrary YES
-#endif
#endif
/*
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index d4ef89fd4..1ef1260b4 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -1105,9 +1105,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
#ifndef BuildGLXLibrary
# define BuildGLXLibrary YES
#endif
-#ifndef BuildXResLibrary
-# define BuildXResLibrary YES
-#endif
#endif
/*