diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 13:13:48 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 13:13:48 +0200 |
| commit | 4b3081c4814891c22c6a881dde0c0b3e6ceced1d (patch) | |
| tree | 0b6ee56508568472a72210d76631920aa194eeb7 /nx-X11/config/cf | |
| parent | b666a3776df04e6d2712b04ab4ca9b582aa3c6cc (diff) | |
| parent | f0bf303c8f97c05dc4c2e6479bbf97e2b17d8cab (diff) | |
| download | nx-libs-4b3081c4814891c22c6a881dde0c0b3e6ceced1d.tar.gz nx-libs-4b3081c4814891c22c6a881dde0c0b3e6ceced1d.tar.bz2 nx-libs-4b3081c4814891c22c6a881dde0c0b3e6ceced1d.zip | |
Merge branch 'sunweaver-pr/drop-really-old-X10-API-code' into 3.6.x
Attributes GH PR #148: https://github.com/ArcticaProject/nx-libs/pull/148
Reviewed by Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 03:12:26 -0700
Diffstat (limited to 'nx-X11/config/cf')
| -rw-r--r-- | nx-X11/config/cf/README | 6 | ||||
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 22 | ||||
| -rw-r--r-- | nx-X11/config/cf/lnxLib.rules | 4 | ||||
| -rw-r--r-- | nx-X11/config/cf/lnxLib.tmpl | 1 |
4 files changed, 0 insertions, 33 deletions
diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README index 0faa34ae7..826682314 100644 --- a/nx-X11/config/cf/README +++ b/nx-X11/config/cf/README @@ -191,7 +191,6 @@ X11.tmpl provides defaults for the following variables: DebugLibX11 build libX11_d.a DebugLibXau build libXau_d.a DebugLibXext build libXext_d.a - DebugOldX build liboldX_d.a DefaultCursorTheme name of default cursor theme DefaultFontPath default server font path DefaultRGBDatabase default server rgb color database @@ -226,13 +225,11 @@ X11.tmpl provides defaults for the following variables: NormalLibX11 build libX11.a NormalLibXau build libXau.a NormalLibXext build libXext.a - NormalOldX build liboldX.a OsNameDefines If uname(2) unavailable, set to -DOS_NAME=OSName PrimaryScreenResolution resolution of default server screen ProfileLibX11 build libX11_p.a ProfileLibXau build libXau_p.a ProfileLibXext build libXext_p.a - ProfileOldX build liboldX_p.a ProjectX version indicating this is the X Window System RemoveTargetProgramByMoving boolean for rm -f that doesn't SHELLPATH -D for /bin/sh @@ -244,7 +241,6 @@ X11.tmpl provides defaults for the following variables: SharedLibX11 boolean for making sharable libX11.so SharedLibXau boolean for making sharable libXau.so SharedLibXext boolean for making sharable libXext.so - SharedOldX boolean for making sharable liboldX.so ShmDefines MIT-SHM define TwmDir directory in which to install twm config files UseCCMakeDepend boolean for using alternate makedepend script @@ -313,8 +309,6 @@ An <os>Lib.rules file provides defaults for the following variables: An <os>Lib.tmpl file provides defaults for the following variables: - SharedOldXReqs required libs for liboldX.so - SharedOldXRev version number for liboldX.so SharedX11Reqs required libs for libX11.so SharedX11Rev version number for libX11.so SharedXauReqs required libs for libXau.so diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 89b069772..60693afd5 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -1263,28 +1263,6 @@ ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR)) #endif #endif -#ifndef SharedOldX -#define SharedOldX HasSharedLibraries -#endif -#ifndef NormalOldX -#define NormalOldX (!SharedOldX | ForceNormalLib) -#endif -#ifndef DebugOldX -#define DebugOldX NO /* debugged old X library */ -#endif -#ifndef ProfileOldX -#define ProfileOldX NO /* profiled old X library */ -#endif - OLDXLIBSRC = $(LIBSRC)/oldX -#if SharedOldX -#ifndef SharedOldXRev -#define SharedOldXRev 6.0 -#endif -SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) -#else -ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir) -#endif - #if HasMotif #ifndef MotifDir diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules index 60ecd3f9e..f6f5f8d0b 100644 --- a/nx-X11/config/cf/lnxLib.rules +++ b/nx-X11/config/cf/lnxLib.rules @@ -15,10 +15,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ #define UseRpath NO #endif -#ifndef SharedOldX -# define SharedOldX NO -#endif - #if UseElfFormat # if (LinuxCLibMajorVersion >= 5 && LinuxCLibMinorVersion >= 4) || LinuxCLibMajorVersion >= 6 diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl index d1bda0a50..3f9c65813 100644 --- a/nx-X11/config/cf/lnxLib.tmpl +++ b/nx-X11/config/cf/lnxLib.tmpl @@ -7,7 +7,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ #define SharedX11Reqs $(LDPRELIB) -ldl -lXdmcp #define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB) -#define SharedOldXReqs $(LDPRELIB) $(XONLYLIB) #define SharedXextReqs $(LDPRELIB) $(XONLYLIB) #define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB) |