aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-09-21 18:28:22 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-09-21 18:28:22 +0200
commit8d4d2bc20e06ee255d2ca07b9e003b02276047c0 (patch)
tree986d5945729641052affcab6defe43c9c7868bff /nx-X11/config/cf
parent43f135be01f520ddcebae94723d5cbbe74259526 (diff)
downloadnx-libs-8d4d2bc20e06ee255d2ca07b9e003b02276047c0.tar.gz
nx-libs-8d4d2bc20e06ee255d2ca07b9e003b02276047c0.tar.bz2
nx-libs-8d4d2bc20e06ee255d2ca07b9e003b02276047c0.zip
move xkblib to xserver
Upstream does not use xkbfile but has own copies of the required files. It was not used elsewhere.
Diffstat (limited to 'nx-X11/config/cf')
-rw-r--r--nx-X11/config/cf/X11.tmpl48
-rw-r--r--nx-X11/config/cf/lnxLib.tmpl2
-rw-r--r--nx-X11/config/cf/xorg.cf1
3 files changed, 0 insertions, 51 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 2b43ca562..4ae57252a 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -180,9 +180,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXKBlib
#define BuildXKBlib (BuildXKB && !BuildServersOnly)
#endif
-#ifndef BuildXKBfilelib
-#define BuildXKBfilelib (BuildXKB && !BuildServersOnly)
-#endif
/*
* WARNING: Setting UseXKBInClients to YES cause incompatibilities
@@ -1235,56 +1232,11 @@ MOTIFINCLUDES = -I$(MOTIFINCDIR)
#endif
#if BuildXKBlib
-# ifndef SharedLibxkbfile
-# define SharedLibxkbfile HasSharedLibraries
-# endif
-# ifndef NormalLibxkbfile
-# define NormalLibxkbfile (!SharedLibxkbfile | ForceNormalLib)
-# endif
-# ifndef DebugLibxkbfile
-# define DebugLibxkbfile NO
-# endif
-# ifndef ProfileLibxkbfile
-# define ProfileLibxkbfile NO
-# endif
-#else
-# ifndef SharedLibxkbfile
-# define SharedLibxkbfile NO
-# endif
-# ifndef NormalLibxkbfile
-# define NormalLibxkbfile NO
-# endif
-# ifndef DebugLibxkbfile
-# define DebugLibxkbfile NO
-# endif
-# ifndef ProfileLibxkbfile
-# define ProfileLibxkbfile NO
-# endif
-#endif
- XKBFILELIBSRC = $(LIBSRC)/xkbfile
-#if SharedLibxkbfile
-# ifndef SharedxkbfileRev
-# define SharedxkbfileRev 1.0
-# endif
-SharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev)
-#else
-ProjectUnsharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILELIBSRC),XBuildLibDir)
-#endif
-
-#if BuildXKBlib
# ifndef XkbClientDepLibs
-# if UseXKBInClients
-# define XkbClientDepLibs $(DEPXKBFILELIB)
-# else
# define XkbClientDepLibs /**/
-# endif
# endif
# ifndef XkbClientLibs
-# if UseXKBInClients
-# define XkbClientLibs $(XKBFILELIB)
-# else
# define XkbClientLibs /**/
-# endif
# endif
#else /* !BuildXKBlib */
diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl
index 3f9c65813..a6e7f48d3 100644
--- a/nx-X11/config/cf/lnxLib.tmpl
+++ b/nx-X11/config/cf/lnxLib.tmpl
@@ -9,6 +9,4 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
#define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
-#define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB)
-
#define NoMessageCatalog
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 3a391b152..b05ed5fd0 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -193,7 +193,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString
#if BuildXFree86ConfigTools && BuildLibrariesForConfigTools
#define BuildLibraries YES
#define BuildXKBlib YES
-#define BuildXKBfilelib YES
#endif
/*