From 27e06a5e2999e4c68d0292c3f4213c956625593d Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 28 Dec 2015 19:55:38 +0100
Subject: library clean-up: Don't build libNX_Xcomposite anymore. Use system's
 libXcomposite shared library.

---
 nx-X11/config/cf/X11.tmpl | 34 ----------------------------------
 nx-X11/config/cf/host.def |  2 --
 2 files changed, 36 deletions(-)

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

diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index f54ff84cc..6f226c3fa 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -1396,30 +1396,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
 #define ProfileLibXfixes	NO
 #endif
 
-#if BuildCompositeLibrary
-#ifndef SharedLibXcomposite
-#define SharedLibXcomposite	HasSharedLibraries
-#endif
-#ifndef NormalLibXcomposite
-#define NormalLibXcomposite	(!SharedLibXcomposite || ForceNormalLib)
-#endif
-#ifndef DebugLibXcomposite
-#define DebugLibXcomposite	NO
-#endif
-#ifndef ProfileLibXcomposite
-#define ProfileLibXcomposite	NO
-#endif
-#else
-#undef  SharedLibXcomposite
-#define SharedLibXcomposite	NO
-#undef  NormalLibXcomposite
-#define NormalLibXcomposite	NO
-#undef  DebugLibXcomposite
-#define DebugLibXcomposite	NO
-#undef  ProfileLibXcomposite
-#define ProfileLibXcomposite	NO
-#endif
-
 #ifndef SharedLibXext
 #define SharedLibXext HasSharedLibraries
 #endif
@@ -1476,16 +1452,6 @@ SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev
 ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir)
 #endif
 
-XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite
-#if SharedLibXcomposite
-#ifndef SharedXcompositeRev
-#define SharedXcompositeRev 1.0
-#endif
-SharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev)
-#else
-ProjectUnsharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),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 1edf85de9..9e017d189 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -125,8 +125,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 
 #define BuildXfixesLibrary              YES
 
-#define BuildCompositeLibrary           YES
-
 #define BuildDocs                       NO
 
 #define BuildComposite			YES
-- 
cgit v1.2.3