From 8d4d2bc20e06ee255d2ca07b9e003b02276047c0 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Wed, 21 Sep 2016 18:28:22 +0200
Subject: move xkblib to xserver

Upstream does not use xkbfile but has own copies of the required
files. It was not used elsewhere.
---
 nx-X11/config/cf/X11.tmpl    | 48 --------------------------------------------
 nx-X11/config/cf/lnxLib.tmpl |  2 --
 nx-X11/config/cf/xorg.cf     |  1 -
 3 files changed, 51 deletions(-)

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

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
@@ -179,9 +179,6 @@ XORGRELSTRING = XorgManVersionString
 #endif
 #ifndef BuildXKBlib
 #define BuildXKBlib		(BuildXKB && !BuildServersOnly)
-#endif
-#ifndef BuildXKBfilelib
-#define BuildXKBfilelib		(BuildXKB && !BuildServersOnly)
 #endif
 
 	/*
@@ -1234,57 +1231,12 @@ MOTIFINCLUDES = -I$(MOTIFINCDIR)
 #define LdLibraryPath LD_LIBRARY_PATH
 #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
 
 /*
-- 
cgit v1.2.3