diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 19:09:42 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 20:16:14 +0100 |
| commit | 6217812c8bf7a7806b776c6e2d28be082cd3e902 (patch) | |
| tree | 09e5c9e296aa4f34064dc6ba80a1939adffd4856 /nx-X11/config/cf | |
| parent | 27e06a5e2999e4c68d0292c3f4213c956625593d (diff) | |
| download | nx-libs-6217812c8bf7a7806b776c6e2d28be082cd3e902.tar.gz nx-libs-6217812c8bf7a7806b776c6e2d28be082cd3e902.tar.bz2 nx-libs-6217812c8bf7a7806b776c6e2d28be082cd3e902.zip | |
library clean-up: Don't build libNX_Xfixes anymore. Use system's libXfixes shared library.
Diffstat (limited to 'nx-X11/config/cf')
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 37 | ||||
| -rw-r--r-- | nx-X11/config/cf/host.def | 2 |
2 files changed, 0 insertions, 39 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 6f226c3fa..f32cdadbf 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -295,9 +295,6 @@ XORGRELSTRING = XorgManVersionString #ifndef BuildXfixes #define BuildXfixes YES #endif -#ifndef BuildXfixesLibrary -#define BuildXfixesLibrary !BuildServersOnly -#endif #ifndef BuildDamage #define BuildDamage BuildXfixes @@ -1372,30 +1369,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) #define ProfileLibXrender NO #endif -#if BuildXfixesLibrary -#ifndef SharedLibXfixes -#define SharedLibXfixes HasSharedLibraries -#endif -#ifndef NormalLibXfixes -#define NormalLibXfixes (!SharedLibXfixes || ForceNormalLib) -#endif -#ifndef DebugLibXfixes -#define DebugLibXfixes NO -#endif -#ifndef ProfileLibXfixes -#define ProfileLibXfixes NO -#endif -#else -#undef SharedLibXfixes -#define SharedLibXfixes NO -#undef NormalLibXfixes -#define NormalLibXfixes NO -#undef DebugLibXfixes -#define DebugLibXfixes NO -#undef ProfileLibXfixes -#define ProfileLibXfixes NO -#endif - #ifndef SharedLibXext #define SharedLibXext HasSharedLibraries #endif @@ -1442,16 +1415,6 @@ SharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrend ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir) #endif - XFIXESLIBSRC = $(LIBSRC)/Xfixes -#if SharedLibXfixes -#ifndef SharedXfixesRev -#define SharedXfixesRev 3.0 -#endif -SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) -#else -ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir) -#endif - #ifndef SharedLibXau #define SharedLibXau YES #endif diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 9e017d189..f1737a998 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -123,8 +123,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildLibraries YES #endif -#define BuildXfixesLibrary YES - #define BuildDocs NO #define BuildComposite YES |