library clean-up: Don't compile (i.e., remove) libNX_Xres.a anymore.

nx-X11/config/cf/X11.tmpl

@@ -281,9 +281,6 @@ XORGRELSTRING = XorgManVersionString
 #ifndef BuildXResExt
 #define BuildXResExt            NO
 #endif
-#ifndef BuildXResLibrary
-#define BuildXResLibrary        (BuildXResExt && !BuildServersOnly)
-#endif
 #ifndef BuildXvExt
 #define BuildXvExt		NO
 #endif
@@ -1478,30 +1475,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
 #define ProfileLibXinerama	NO
 #endif
 
-#if BuildXResLibrary
-#ifndef SharedLibXRes
-#define SharedLibXRes           HasSharedLibraries
-#endif
-#ifndef NormalLibXRes
-#define NormalLibXRes           (!SharedLibXRes || ForceNormalLib)
-#endif
-#ifndef DebugLibXRes
-#define DebugLibXRes            NO
-#endif
-#ifndef ProfileLibXRes
-#define ProfileLibXRes          NO
-#endif
-#else
-#undef  SharedLibXRes
-#define SharedLibXRes		NO
-#undef  NormalLibXRes
-#define NormalLibXRes		NO
-#undef  DebugLibXRes
-#define DebugLibXRes		NO
-#undef  ProfileLibXRes
-#define ProfileLibXRes		NO
-#endif
-
 #if BuildRenderLibrary
 #ifndef SharedLibXrender
 #define SharedLibXrender	HasSharedLibraries
@@ -1694,16 +1667,6 @@ ProjectUnsharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLib
 SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev)
 #else
 ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir)
-#endif
-
-    XRESLIBSRC = $(LIBSRC)/XRes
-#if SharedLibXRes
-#ifndef SharedXResRev
-#define SharedXResRev 1.0
-#endif
-SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev)
-#else
-ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir)
 #endif
 
     GLXLIBSRC = $(LIBSRC)/GL

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 $
 #endif
 #define SharedGLReqs	  $(LDPRELIB) $(XLIB) ExtraSharedGLReqs
 
-#define SharedXResReqs	  $(LDPRELIB) $(XLIB)
 #define SharedXineramaReqs	$(LDPRELIB) $(XLIB)
 #define SharedXxf86dgaReqs	$(LDPRELIB) $(XLIB)
 #define SharedXxf86miscReqs	$(LDPRELIB) $(XLIB)

nx-X11/config/cf/xfree86.cf

@@ -1541,9 +1541,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #ifndef BuildGLXLibrary
 # define BuildGLXLibrary	YES
 #endif
-#ifndef BuildXResLibrary
-# define BuildXResLibrary       YES
-#endif
 #endif
 
 /*

nx-X11/config/cf/xorg.cf

@@ -1105,9 +1105,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #ifndef BuildGLXLibrary
 # define BuildGLXLibrary	YES
 #endif
-#ifndef BuildXResLibrary
-# define BuildXResLibrary       YES
-#endif
 #endif
 
 /*

nx-X11/include/extensions/Imakefile

@@ -54,8 +54,8 @@ COMPOSITEHEADERS = composite.h compositeproto.h
 XTRAPHEADERS = xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \
 	xtraplibp.h xtrapproto.h
 #endif
-#if BuildXResExt || BuildXResLibrary
-XRESHEADERS = XRes.h XResproto.h
+#if BuildXResExt
+XRESHEADERS = XResproto.h
 #endif
 #if BuildXevie
 XEVIEHEADERS = Xevie.h Xeviestr.h

nx-X11/lib/Imakefile

@@ -39,10 +39,6 @@ XF86RUSHLIBDIR = Xxf86rush
 XINERAMADIR=Xinerama
 #endif
 
-#if BuildXResLibrary
-XRESLIBDIR = XRes
-#endif
-
 #if BuildGLXLibrary
 GLXLIBDIR = GL
 #endif
@@ -99,7 +95,6 @@ LINTSUBDIRS = \
 	$(GLXLIBDIR) \
 	$(XINERAMADIR) \
 	$(RENDERLIBDIR) \
-	$(XRESLIBDIR) \
 	$(XFIXESLIBDIR) \
 	$(COMPOSITELIBDIR) \
 	$(NULL)