aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf/X11.tmpl
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-06-20 14:39:56 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-06-20 14:39:56 +0200
commit905c74da378fab32bde9131dd26a4ef6bf5845ee (patch)
treef6891d4af42db2238486bc652b75cf6cc27dad61 /nx-X11/config/cf/X11.tmpl
parent4674a4ae46aec7c104aed2090e57fd36c2cbbef2 (diff)
parenta287e9dbecb5bcd4690b2b36fd538dd1b57a4fc4 (diff)
downloadnx-libs-905c74da378fab32bde9131dd26a4ef6bf5845ee.tar.gz
nx-libs-905c74da378fab32bde9131dd26a4ef6bf5845ee.tar.bz2
nx-libs-905c74da378fab32bde9131dd26a4ef6bf5845ee.zip
Merge pull request #52 from woglinde/3.6.x
Library clean-up: Drop libxkbui, has been built previously but none of its symbols have been used in NX.
Diffstat (limited to 'nx-X11/config/cf/X11.tmpl')
-rw-r--r--nx-X11/config/cf/X11.tmpl47
1 files changed, 0 insertions, 47 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 8b3cf33a1..106293565 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -199,9 +199,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXKBlib
#define BuildXKBlib (BuildXKB && !BuildServersOnly)
#endif
-#ifndef BuildXKBuilib
-#define BuildXKBuilib (BuildXKB && !BuildServersOnly)
-#endif
#ifndef BuildXKBfilelib
#define BuildXKBfilelib (BuildXKB && !BuildServersOnly)
#endif
@@ -1823,50 +1820,6 @@ ProjectUnsharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILELIBSRC),XBuildLibDir)
# endif
#endif /* BuildXKBlib */
-#if BuildXKBlib
-# ifndef SharedLibxkbui
-# define SharedLibxkbui HasSharedLibraries
-# endif
-# ifndef NormalLibxkbui
-# define NormalLibxkbui (!SharedLibxkbui || ForceNormalLib)
-# endif
-# ifndef DebugLibxkbui
-# define DebugLibxkbui NO
-# endif
-# ifndef ProfileLibxkbui
-# define ProfileLibxkbui NO
-# endif
-#else
-# ifndef SharedLibxkbui
-# define SharedLibxkbui NO
-# endif
-# ifndef NormalLibxkbui
-# define NormalLibxkbui NO
-# endif
-# ifndef DebugLibxkbui
-# define DebugLibxkbui NO
-# endif
-# ifndef ProfileLibxkbui
-# define ProfileLibxkbui NO
-# endif
-#endif
- XKBUILIBSRC = $(LIBSRC)/xkbui
-#if SharedLibxkbui
-# ifndef SharedxkbuiRev
-# define SharedxkbuiRev 1.0
-# endif
-SharedLibReferences(XKBUI,NX_xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev)
-#else
-ProjectUnsharedLibReferences(XKBUI,NX_xkbui,$(XKBUILIBSRC),XBuildLibDir)
-#endif
-
-#ifndef XkbuiLibs
-# define XkbuiLibs $(XKBUILIB)
-#endif
-#ifndef XkbuiDepLibs
-# define XkbuiDepLibs $(DEPXKBFILELIB)
-#endif
-
#ifndef NeedDefaultDepLibs
#define NeedDefaultDepLibs YES
#endif