aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf/X11.tmpl
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-09-22 08:41:24 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-09-22 08:41:24 +0200
commita906bf0f24c540d5d17d89d5292d2bcfe7f52468 (patch)
tree939e4c6e80fabe67d006b753f4f9cd0d4da1fad3 /nx-X11/config/cf/X11.tmpl
parent43f135be01f520ddcebae94723d5cbbe74259526 (diff)
parent09d5e073a1f9deb9089f614e8385ad9799808b5b (diff)
downloadnx-libs-a906bf0f24c540d5d17d89d5292d2bcfe7f52468.tar.gz
nx-libs-a906bf0f24c540d5d17d89d5292d2bcfe7f52468.tar.bz2
nx-libs-a906bf0f24c540d5d17d89d5292d2bcfe7f52468.zip
Merge branch 'uli42-remove-misc' into 3.6.x
Attributes GH PR #199: https://github.com/ArcticaProject/nx-libs/pull/199
Diffstat (limited to 'nx-X11/config/cf/X11.tmpl')
-rw-r--r--nx-X11/config/cf/X11.tmpl48
1 files changed, 0 insertions, 48 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 */