From 1cd7e35cbdd348f6a383ad4b5149c1f8d2ece0cf Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 1 Jul 2016 13:54:11 +0200 Subject: finally drop libNX_Xext --- nx-X11/config/cf/README | 4 ---- nx-X11/config/cf/X11.tmpl | 28 ---------------------------- 2 files changed, 32 deletions(-) (limited to 'nx-X11/config/cf') diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README index 0cd37245a..75fa4767c 100644 --- a/nx-X11/config/cf/README +++ b/nx-X11/config/cf/README @@ -183,7 +183,6 @@ X11.tmpl provides defaults for the following variables: ConnectionFlags -D's for supported transports ContribDir location of user-contributed sources DebugLibX11 build libX11_d.a - DebugLibXext build libXext_d.a DefaultCursorTheme name of default cursor theme DefaultFontPath default server font path DefaultRGBDatabase default server rgb color database @@ -215,11 +214,9 @@ X11.tmpl provides defaults for the following variables: NeedDefaultDepLibs boolean for enabling default DEPLIBS NlsDir directory in which to install nls files NormalLibX11 build libX11.a - NormalLibXext build libXext.a OsNameDefines If uname(2) unavailable, set to -DOS_NAME=OSName PrimaryScreenResolution resolution of default server screen ProfileLibX11 build libX11_p.a - ProfileLibXext build libXext_p.a ProjectX version indicating this is the X Window System RemoveTargetProgramByMoving boolean for rm -f that doesn't SHELLPATH -D for /bin/sh @@ -229,7 +226,6 @@ X11.tmpl provides defaults for the following variables: ServerOSDefines OS -D's for server ServerAssertDefines -DNDEBUG for no assertions, /**/ for assertions SharedLibX11 boolean for making sharable libX11.so - SharedLibXext boolean for making sharable libXext.so ShmDefines MIT-SHM define TwmDir directory in which to install twm config files UseCCMakeDepend boolean for using alternate makedepend script diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index ce952fb68..a6c410512 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -150,9 +150,6 @@ XORGRELSTRING = XorgManVersionString #ifndef BuildLoadableXlibXcursor #define BuildLoadableXlibXcursor (HasDlopen && SharedLibX11) #endif -#ifndef BuildXextLib -#define BuildXextLib BuildLibraries -#endif #ifndef BuildTestExt #define BuildTestExt YES #endif @@ -1194,31 +1191,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) DEPXLIBONLY = $(DEPXONLYLIB) XLIBONLY = $(XONLYLIB) LINTXONLYLIB = $(LINTXONLY) -#ifndef SharedLibXext -#define SharedLibXext HasSharedLibraries -#endif -#ifndef NormalLibXext -#define NormalLibXext (!SharedLibXext | ForceNormalLib) -#endif -#ifndef DebugLibXext -#define DebugLibXext NO /* debugged Xext library */ -#endif -#ifndef ProfileLibXext -#define ProfileLibXext NO /* profiled Xext library */ -#endif - XEXTLIBSRC = $(LIBSRC)/Xext -#if SharedLibXext -#ifndef SharedXextRev -#define SharedXextRev 6.4 -#endif -SharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) -#else -ProjectUnsharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),XBuildLibDir) -#endif -LINTEXTENSIONLIB = $(LINTEXTENSION) - DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) - XLIB = $(EXTENSIONLIB) $(XONLYLIB) - LINTXLIB = $(LINTXONLYLIB) #if HasMotif -- cgit v1.2.3