diff options
Diffstat (limited to 'nx-X11/config/cf')
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 47 | ||||
| -rw-r--r-- | nx-X11/config/cf/lnxLib.tmpl | 1 | ||||
| -rw-r--r-- | nx-X11/config/cf/xfree86.cf | 1 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 1 |
4 files changed, 0 insertions, 50 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 diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl index 7096ee150..53f4bd87e 100644 --- a/nx-X11/config/cf/lnxLib.tmpl +++ b/nx-X11/config/cf/lnxLib.tmpl @@ -19,7 +19,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ #define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) #define SharedXxf86vmReqs $(LDPRELIB) $(XLIB) #define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB) -#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB) #define SharedXfixesReqs $(LDPRELIB) $(XLIB) #define SharedXdamageReqs $(LDPRELIB) $(XLIB) #define SharedXcompositeReqs $(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB) diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf index 367835170..9065ce68c 100644 --- a/nx-X11/config/cf/xfree86.cf +++ b/nx-X11/config/cf/xfree86.cf @@ -160,7 +160,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ #define BuildXF86VidModeLibrary YES #define BuildXKBlib YES #define BuildXKBfilelib YES -#define BuildXKBuilib YES #endif /* diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index c92162ef0..05b82f885 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -196,7 +196,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString #define BuildXF86VidModeLibrary YES #define BuildXKBlib YES #define BuildXKBfilelib YES -#define BuildXKBuilib YES #endif /* |