Merge branch 'sunweaver-pr/imake-cleanup-nonpresent-buildlogic' into arctica-3.6.x

Attributes GH PR #17: https://github.com/ArcticaProject/nx-libs/pull/17

Merge branch 'sunweaver-pr/imake-cleanup-nonpresent-buildlogic' into arctica-3.6.x
7b7ba944 · Mihai Moldovan · cbf4e4db · 662a8954 · 7b7ba944 · 7b7ba944
Unverified Commit 7b7ba944 authored Apr 28, 2015 by Mihai Moldovan
24 changed files
--- a/doc/nx-X11_vs_XOrg69_patches/host.def.NX.patch
+++ b/doc/nx-X11_vs_XOrg69_patches/host.def.NX.patch
@@ -787,7 +787,7 @@
 +/*
 + * To build static and shared libraries with debugging information, uncomment
 + * this. Assumes you have Gcc2.
-+ * (If you don't have Gcc2, you can use the DebugLib{X11,Xt,Xaw,...} variables
+ * (If you don't have Gcc2, you can use the DebugLib{X11,...} variables
 + * to build debugging versions of the libraries separately.)
 + *
 +#define DebuggableLibraries	YES

--- a/nx-X11/config/Imakefile
+++ b/nx-X11/config/Imakefile
@@ -6,7 +6,13 @@ XCOMM $XFree86: xc/config/Imakefile,v 1.3 2001/01/17 16:22:29 dawes Exp $
 #undef BootstrapCleanSubdirs
 #define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)"

-BOOTSTRAPSUBDIRS = imake makedepend
+NULL =
+
+BOOTSTRAPSUBDIRS = \
+	imake \
+	makedepend \
+	$(NULL)
+
 SUBDIRS = cf $(BOOTSTRAPSUBDIRS)

 #if (defined(XFree86VersionString) || defined(XorgVersionString)) \

--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -588,24 +588,9 @@ X_BYTE_ORDER = ByteOrder
 #ifndef HasFfs
 #define HasFfs			YES
 #endif
-#ifndef HasZlib
-#define HasZlib			YES
-#endif
-#ifndef OsNeedZlibHeaders
-#define OsNeedZlibHeaders	!HasZlib
-#endif
-#if !HasZlib		/* if OS doesn't have it, we'll build it */
-XCOMM Building your own zlib can be a harmful security risk and is
-XCOMM deprecated; please strongly consider using vendor-supplied packages.
-#undef GzipLibrary	/* GzipLibrary was valid only if HasZlib */
-#endif
 #ifndef GzipLibrary	/* if OS config didn't define it, assume it's -lz */
 #define GzipLibrary -lz
 #endif
-/* If the system has the PNG library - if NO, xcursorgen is not built */
-#ifndef HasLibpng
-#define HasLibpng		NO
-#endif
 #if HasKrbIV
 #ifndef KrbIVIncludes
 #define KrbIVIncludes /**/

--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -93,7 +93,6 @@ Imake.tmpl provides defaults for the following variables:
 	HasVarDirectory		boolean for system has /var
 	HasVFork		boolean for system has vfork()
 	HasVoidSignalReturn	boolean for POSIX signal() procs
-	HasZlib			boolean for system has libz
 	IncludeSharedObjectInNormalLib define for static libs to include
 				       -fPIC objects on relevant archs
 	IncRoot			parent of X11 include directory
@@ -181,35 +180,23 @@ X11.tmpl provides defaults for the following variables:
 	BuildIncRoot		relative path to location of headers in build
 	BuildIncTop		path from build includes directory to top
 	BuildEVI		build EVI server extension
-	BuildLBX		build LBX (aka X.fast) server extension
 	BuildMultibuffer	build Multibuffer extension (obsolete)
 	BuildPlugin		build xrx plug-in for web browsers
 	BuildRECORD		Build RECORD extension
 	BuildServer		build X server
-	BuildXAudio		build Audio 
-	BuildXAServer		build Audio server
 	BuildXCSecurity		Build Security Extension
 	BuildXInputExt		build X Input extension (requires ddx support,
 					which exists only in Xhp and XFree86)
-	BuildXInputLib		build X Input library
 	BuildXKB		build X Keyboard Extension?
 	BuildXKBlib		build X Keyboard Extension into Xlib?
 	UseXKBInClients		Use XKB functions in normal clients?
 	ConfigDir		install directory for config files
 	ConnectionFlags		-D's for supported transports
 	ContribDir		location of user-contributed sources
-	DebugLibFS		build libFS_d.a
-	DebugLibICE		build libICE_d.a
-	DebugLibSM		build libSM_d.a
 	DebugLibX11		build libX11_d.a
 	DebugLibXau		build libXau_d.a
-	DebugLibXaw		build libXaw_d.a
 	DebugLibXext		build libXext_d.a
-	DebugLibXi		build libXi_d.a
-	DebugLibXmu		build libXmu_d.a
-	DebugLibXt		build libXt_d.a
 	DebugLibXtst		build libXtst_d.a
-	DebugLibXag		build libXag_d.a
 	DebugOldX		build liboldX_d.a
 	DefaultCursorTheme      name of default cursor theme
 	DefaultFontPath		default server font path
@@ -226,12 +213,8 @@ X11.tmpl provides defaults for the following variables:
 	ForceNormalLib		force building of .a in addition to shared lib
 	HasXdmAuth		boolean for using XDM-AUTHORIZATION-1;
 					needs Wraphelp.c, see Release Notes
-	InstallAppDefFiles	install new app defaults files over old?
-	InstallFSConfig		install fs config file over old?
 	InstallLibManPages	boolean for installing library man pages
 	InstallSecurityConfig	install server security policy file over old?
-	InstallXdmConfig	install xdm config files over old?
-	InstallXinitConfig	install xinit config files over old?
 	KrbIVDefines		defines for use with KerberosIV
 	LibDir			directory in which to install X11 support files
 	LibManSuffix		man suffix for library pages
@@ -246,33 +229,17 @@ X11.tmpl provides defaults for the following variables:
 	MiscManDir		directory in which to install misc man pages
 	NeedDefaultDepLibs	boolean for enabling default DEPLIBS
 	NlsDir			directory in which to install nls files
-	NormalLibFS		build libFS.a
-	NormalLibICE		build libICE.a
-	NormalLibSM		build libSM.a
 	NormalLibX11		build libX11.a
 	NormalLibXau		build libXau.a
-	NormalLibXaw		build libXaw.a
 	NormalLibXext		build libXext.a
-	NormalLibXi		build libXi.a
-	NormalLibXmu		build libXmu.a
-	NormalLibXt		build libXt.a
 	NormalLibXtst		build libXtst.a
-	NormalLibXag		build libXag.a
 	NormalOldX		build liboldX.a
 	OsNameDefines		If uname(2) unavailable, set to -DOS_NAME=OSName
 	PrimaryScreenResolution	resolution of default server screen
-	ProfileLibFS		build libFS_p.a
-	ProfileLibICE		build libICE_p.a
-	ProfileLibSM		build libSM_p.a
 	ProfileLibX11		build libX11_p.a
 	ProfileLibXau		build libXau_p.a
-	ProfileLibXaw		build libXaw_p.a
 	ProfileLibXext		build libXext_p.a
-	ProfileLibXi		build libXi_p.a
-	ProfileLibXmu		build libXmu_p.a
-	ProfileLibXt		build libXt_p.a
 	ProfileLibXtst		build libXtst_p.a
-	ProfileLibXag		build libXag_p.a
 	ProfileOldX		build liboldX_p.a
 	ProjectX		version indicating this is the X Window System
 	RemoveTargetProgramByMoving	boolean for rm -f that doesn't
@@ -282,18 +249,10 @@ X11.tmpl provides defaults for the following variables:
 	ServerExtraDefines	special -D's for server
 	ServerOSDefines		OS -D's for server
 	ServerAssertDefines	-DNDEBUG for no assertions, /**/ for assertions
-	SharedLibFS		boolean for making sharable libFS.so
-	SharedLibICE		boolean for making sharable libICE.so
-	SharedLibSM		boolean for making sharable libSM.so
 	SharedLibX11		boolean for making sharable libX11.so
 	SharedLibXau		boolean for making sharable libXau.so
-	SharedLibXaw		boolean for making sharable libXaw.so
 	SharedLibXext		boolean for making sharable libXext.so
-	SharedLibXi		boolean for making sharable libXi.so
-	SharedLibXmu		boolean for making sharable libXmu.so
-	SharedLibXt		boolean for making sharable libXt.so
 	SharedLibXtst		boolean for making sharable libXtst.so
-	SharedLibXag		boolean for making sharable libXag.so
 	SharedOldX		boolean for making sharable liboldX.so
 	ShmDefines		MIT-SHM define
 	TwmDir			directory in which to install twm config files
@@ -306,11 +265,8 @@ X11.tmpl provides defaults for the following variables:
 	XFileSearchPathDefault	default path to search for app defaults files
 	XInputDefines		XINPUT define
 	XMalloc0ReturnsNullDefines -D's specifically for libX11
-	XawClientDepLibs	DEPLIBS for clients that use Xaw
-	XawClientLibs		LOCAL_LIBRARIES for clients that use Xaw
 	XdmConfigurationSubdirectory	name of default xdm configuration
 	XdmDir			directory in which to install xdm files
-	XdmServersType		type of xdm Xservers file to install
 	XinitDir		directory in which to install xinit files
 	XmanLocalSearchPath	non-standard path for man pages
 	XtErrorPrefix		leading text in XtError() msg; eg. 'X Toolkit '
@@ -366,54 +322,16 @@ An <os>Lib.rules file provides defaults for the following variables:

 An <os>Lib.tmpl file provides defaults for the following variables:

-	SharedFSReqs		required libs for libFS.so
-	SharedFSRev		version number for libFS.so
-	SharedICEReqs		required libs for libICE.so
-	SharedICERev		version number for libICE.so
 	SharedOldXReqs		required libs for liboldX.so
 	SharedOldXRev		version number for liboldX.so
-	SharedSMReqs		required libs for libSM.so
-	SharedSMRev		version number for libSM.so
 	SharedX11Reqs		required libs for libX11.so
 	SharedX11Rev		version number for libX11.so
 	SharedXauReqs		required libs for libXau.so
 	SharedXauRev		version number for libXau.so
-	SharedXawReqs		required libs for libXaw.so
-	SharedXawRev		version number for libXaw.so
 	SharedXextReqs		required libs for libXext.so
 	SharedXextRev		version number for libXext.so
-	SharedXiReqs		required libs for libXi.so
-	SharedXiRev		version number for libXi.so
-	SharedXmuReqs		required libs for libXmu.so
-	SharedXmuRev		version number for libXmu.so
-	SharedXtReqs		required libs for libXt.so
-	SharedXtRev		version number for libXt.so
 	SharedXtstReqs		required libs for libXtst.so
 	SharedXtstRev		version number for libXtst.so
-	SharedXmReqs		required libs for libXm.so
-	SharedXmRev		version number for libXm.so
-	SharedMrmReqs		required libs for libMrm.so
-	SharedMrmRev		version number for libMrm.so
-	SharedUilReqs		required libs for libUil.so
-	SharedUilRev		version number for libUil.so
-	SharedTtReqs		required libs for libtt.so
-	SharedTtRev		version number for libtt.so
-	SharedPamReqs		required libs for libpam.so
-	SharedPamRev		version number for libpam.so
-	SharedDtSvcReqs		required libs for libDtSvc.so
-	SharedDtSvcRev		version number for libDtSvc.so
-	SharedDtSearchReqs	required libs for libDtSearch.so
-	SharedDtSearchRev	version number for libDtSearch.so
-	SharedDtWidgetReqs	required libs for libDtWidget.so
-	SharedDtWidgetRev	version number for libDtWidget.so
-	SharedDtHelpReqs	required libs for libDtHelp.so
-	SharedDtHelpRev		version number for libDtHelp.so
-	SharedDtPrintReqs	required libs for libDtPrint.so
-	SharedDtPrintRev	version number for libDtPrint.so
-	SharedDtTermReqs	required libs for libDtTerm.so
-	SharedDtTermRev		version number for libDtTerm.so
-	SharedDtMrmReqs		required libs for libDtMrm.so
-	SharedDtMrmRev		version number for libDtMrm.so

 Vendor.cf files and/or site/host specific .def files may define the
 following variables:
@@ -434,7 +352,6 @@ The following variables are used by some part of the tree:
 	DvipsCmd		command to turn .dvi file into PostScript
 	MotifBC			using Motif 1.1.1, 1.1.2, or 1.1.3?
 	GetValuesBC		compat GetValues behavior for broken apps?
-	NeedBerklib		application needs libXbsd?
 	SvgaConfig		default SVGA configuration
 	HasGetReturnAddress	util/memleak
 	HasShadowPasswd		system has getspnam() function

--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -136,18 +136,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 #define BuildComposite			YES

 /*
- * If you only run the X server under xdm the X servers don't need to be
- * installed SetUID, and you may comment out the lines below.  If you run
- * the servers by hand (with xinit or startx), then they do need to be
- * installed SetUID on most platforms.
- *
- * Consult your system administrator before making the X server setuid.
- *
-#define InstallXserverSetUID	NO
- */
-
-
-/*
 * Server configuration parameters.  The defaults are shown here:
 */

@@ -196,48 +184,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 */

 /*
- * There are three parameters that determine where and how the Matrox HAL
- * library is used:
- *
- *   HaveMatroxHal  -- You have the HALlib.a binary library installed
- *                     in xfree86/drivers/mga/HALlib, and you want it to
- *                     be used.
- *                     Default: NO
- *
- *   BuildMatroxHal -- You have the source for the HALlib library (installed
- *                     in xfree86/drivers/mga/hallib), and want to build and
- *                     use it.
- *                     Default: NO
- *
- *   UseMatroxHal   -- You want to build support for loading/using the HAL
- *                     library into the mga driver.  For module server builds
- *                     you don't need to have the HALlib library to do this.
- *                     but you want to build support for loading it and using
- *                     it into the mga driver module.
- *                     Default: YES for loadable server build
- *                              (HaveMatroxHal || BuildMatroxHal) for static
- */
-
-/*
- * To disable use of the Matrox HAL library, uncomment this:
- *
-#define UseMatroxHal		NO
- */
-
-/*
- * If you have the HALlib.a binary installed in xfree86/drivers/mga/HALlib,
- * uncomment this:
- *
-#define HaveMatroxHal		YES
- */
-
-/*
- * If you have the HALlib source code installed in xfree86/drivers/mga/hallib,
- * uncomment this:
-#define BuildMatroxHal		YES
- */
-
-/*
 * Include True Type Fonts to default font path. It is safe to do
 * this by default as NX intaller carries only misc and TTF in the
 * basic set of fonts installed under Windows.
@@ -263,24 +209,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 #define BuildServersOnly	YES

 /*
- * By default, the sample config files for xinit, xdm and xfs are installed
- * only when there is no pre-existing version installed.  Uncommenting the
- * following lines will force the sample versions to be installed even if
- * it means over-writing existing versions.
- *
-#define InstallXinitConfig	YES
-#define InstallXdmConfig	YES
- */
-
-/*
- * By default the application defaults files are always installed.
- * Uncommenting the the following will prevent exising application
- * defaults files from being over-written.
- *
-#define InstallAppDefFiles	NO
- */
-
-/*
 * Undefine the following if you don't want to have config files and
 * app-defaults installed in a separate directory (i.e. /etc/X11).
 *
@@ -558,13 +486,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 */
 #define BuildXF86RushLibrary	NO

-/*
- * We should never need LBX in a NX enabled environment...
- *
-#define BuildLBX		NO
- */
-#define BuildLBX		NO
-
 #define BuildXKB		YES
 #define BuildXKBlib		YES

@@ -619,7 +540,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 /*
 * To build static and shared libraries with debugging information, uncomment
 * this. Assumes you have Gcc2.
- * (If you don't have Gcc2, you can use the DebugLib{X11,Xt,Xaw,...} variables
+ * (If you don't have Gcc2, you can use the DebugLib{X11,...} variables
 * to build debugging versions of the libraries separately.)
 *
 #define DebuggableLibraries	YES
@@ -720,51 +641,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 #define X86EMU_LIBPATH /usr/local/lib
 */ 

-
-/*
- * Most platforms default to using an already installed Expat library.
- * To use the one included in this release instead, uncomment the following.
- *
-#define HasExpat NO
- */
-#define HasExpat YES
-
-/* 
- * To use a Expat library already installed outside the default search
- * paths, uncomment the following and set the path as needed.
-#define HasExpat YES
-#define ExpatDir /usr/local
- */
-
-
-/*
- * Most platforms default to using an already installed PNG library.
- * To use the one included in this release instead, uncomment the following.
- *
-#define HasLibpng NO
- */
-
-/* 
- * To use a PNG library already installed outside the default search
- * paths, uncomment the following and set the path as needed.
-#define HasLibpng YES
-#define LibpngDir /usr/local
- */
-
-
-/*
- * Most platforms default to using an already installed xterm program.
- * To use the one included in this release instead, uncomment the following.
- *
-#define BuildXterm YES
- */
-
 #define SharedLibXau           YES

-#define SharedLibXdmcp         YES
-
-#define BuildXaw7              NO
-
 #define BuildRman NO
-#define BuildXcursorLibrary NO
 #define BuildLoadableXlibI18n NO
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -105,19 +105,10 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #  define XAppLoadDir		EtcX11Directory/app-defaults
 # define XFileSearchPathDefault	Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
 /* the relative symlink created by this rule causes problems for us */
-# if defined(InstallAppDefFiles) && InstallAppDefFiles
-#  define InstallAppDefaultsLong(file,class)				@@\
-InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-# else
-#  define InstallAppDefaultsLong(file,class)				@@\
-InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-# endif /* InstallAppDefFiles */
 # endif /* !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot */
 # define SharedLibXdmGreet	NO
 # define LinkGLToUsrInclude	NO
 # define LinkGLToUsrLib		NO
-# define SharedLibGlu		YES
-# define NormalLibGlu		YES
 # define FSUseSyslog		YES

 # define BuildLibGlxWithoutPIC  NO
@@ -145,9 +136,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  endif
 #  define XFree86Devel			YES
 #  define BuildAllSpecsDocs		YES
-#  define InstallXinitConfig		YES
-#  define InstallXdmConfig		YES
-#  define InstallFSConfig		YES
 #  define DebuggableLibraries		YES
 #  define ForceNormalLib		YES
 #  define BuildSpecsDocs		YES
@@ -232,7 +220,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
                                -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
 				LinuxAdditionalIncludes LinuxGnuSourceDefines \
 				LinuxLocaleDefines
-# define XawI18nDefines		-DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
 # define HasPosixThreads	YES
 # define ThreadedX		YES
 # define HasThreadSafeAPI	YES
@@ -249,7 +236,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 # define LinuxSourceDefines	-D_POSIX_SOURCE -D_POSIX_C_SOURCE=2 \
 				-D_BSD_SOURCE -D_SVID_SOURCE \
 				LinuxGnuSourceDefines LinuxLocaleDefines
-# define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
 # ifndef HasLibCrypt
 #  define HasLibCrypt		NO
 # endif
@@ -262,10 +248,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 # endif
 #endif

-#ifndef InstallXloadSetGID
-#define InstallXloadSetGID	NO
-#endif
-
 /*
 * XXX Check which versions of Linux really have IPv6.  glibc 2.0 on
 * Red Hat 5.2 doesn't.
@@ -523,18 +505,6 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #define HasGroff		YES
 #endif

-#ifndef HasZlib
-#define HasZlib			YES
-#endif
-
-#ifndef HasLibpng
-#define HasLibpng		YES
-#endif
-
-#ifndef HasExpat
-# define HasExpat		YES
-#endif
-
 #define AvoidNullMakeCommand	YES
 #ifndef DebuggableLibraries
 #define DebuggableLibraries	NO

--- a/nx-X11/config/cf/lnxLib.rules
+++ b/nx-X11/config/cf/lnxLib.rules
@@ -405,90 +405,18 @@ JUMP_STUBS_IMPORT_X11 = $(LIBC_SA)
 JUMP_SIBARS_X11 = jump/libNX_SM.a~ jump/libNX_ICE.a~
 JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc)

-XCOMM libSM (part of libX11.so)
-JUMP_ROOT_SM = $(SMSRC)
-JUMP_IS_HOST_SM = NO
-JUMP_HOST_SM = $(JUMP_ROOT_X11)
-JUMP_DIR_SM = $(JUMP_DIR_X11)
-
-XCOMM libICE (part of libX11.so)
-JUMP_ROOT_ICE = $(ICESRC)
-JUMP_IS_HOST_ICE = NO
-JUMP_HOST_ICE = $(JUMP_ROOT_X11)
-JUMP_DIR_ICE = $(JUMP_DIR_X11)
-
-XCOMM libXt.so (Xt, Xmu, Xext, Xi, Xtst, Xp)
-JUMP_ROOT_Xt = $(TOOLKITSRC)
-JUMP_IS_HOST_Xt = YES
-JUMP_STUBLIBS_Xt = libXt.sa libXmu.sa libXext.sa libXi.sa libXtst.sa libXp.sa
-JUMP_SUBDIRS_Xt = $(JUMP_ROOT_X11)
-JUMP_SIBDIRS_Xt = $(JUMP_ROOT_Xmu) $(JUMP_ROOT_Xext) \
-	$(JUMP_ROOT_Xi) $(JUMP_ROOT_Xtst) $(JUMP_ROOT_Xp)
-JUMP_DIR_Xt = $(JUMP_ROOT_Xt)/shared
-JUMP_VARS_Xt = $(JUMP_ROOT_Xt)/jump_vars
-JUMP_FUNCS_Xt = $(JUMP_ROOT_Xt)/jump_funcs
-JUMP_IGNORE_Xt = $(JUMP_ROOT_Xt)/jump_ignore
-JUMP_EXPORT_Xt = $(JUMP_DIR_Xt)/jump.vars
-JUMP_IMPORT_Xt = $(JUMP_EXPORT_X11)
-JUMP_ADDRESS_Xt = 0x602a0000
-JUMP_JUMPTABLESIZE_Xt = 0x4000
-JUMP_GOTSIZE_Xt = 4096
-JUMP_STUBNAMES_Xt = libXt libXmu libXext libXi libXtst libXp
-JUMP_STUBS_IMPORT_Xt = $(JUMP_STUBS_IMPORT_X11)
-JUMP_SIBARS_Xt = jump/libNX_Xmu.a~ jump/libNX_Xext.a~ jump/libNX_Xi.a~ jump/libNX_Xtst.a~ jump/libNX_Xp.a~
-JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libNX_ICE.sa \
-	$(JUMP_ROOT_SM)/libNX_SM.sa $(JUMP_ROOT_X11)/libNX_X11.sa $(JUMP_LDLIBS_libc)
-
-XCOMM libXmu (part of libXt.so)
-JUMP_ROOT_Xmu = $(XMUSRC)
-JUMP_IS_HOST_Xmu = NO
-JUMP_HOST_Xmu = $(JUMP_ROOT_Xt)
-JUMP_DIR_Xmu = $(JUMP_DIR_Xt)
-
 XCOMM libXext (part of libXt.so)
 JUMP_ROOT_Xext = $(XEXTLIBSRC)
 JUMP_IS_HOST_Xext = NO
 JUMP_HOST_Xext = $(JUMP_ROOT_Xt)
 JUMP_DIR_Xext = $(JUMP_DIR_Xt)

-XCOMM libXi (part of libXt.so)
-JUMP_ROOT_Xi = $(XILIBSRC)
-JUMP_IS_HOST_Xi = NO
-JUMP_HOST_Xi = $(JUMP_ROOT_Xt)
-JUMP_DIR_Xi = $(JUMP_DIR_Xt)
-
 XCOMM libXtst (part of libXt.so)
 JUMP_ROOT_Xtst = $(XTESTLIBSRC)
 JUMP_IS_HOST_Xtst = NO
 JUMP_HOST_Xtst = $(JUMP_ROOT_Xt)
 JUMP_DIR_Xtst = $(JUMP_DIR_Xt)

-XCOMM libXp (part of libXt.so)
-JUMP_ROOT_Xp = $(XPLIBSRC)
-JUMP_IS_HOST_Xp = NO
-JUMP_HOST_Xp = $(JUMP_ROOT_Xt)
-JUMP_DIR_Xp = $(JUMP_DIR_Xt)
-
-XCOMM libXaw.so (Xaw)
-JUMP_ROOT_Xaw = $(AWIDGETSRC)
-JUMP_IS_HOST_Xaw = YES
-JUMP_STUBLIBS_Xaw = libXaw.sa
-JUMP_SUBDIRS_Xaw = $(JUMP_ROOT_Xt)
-JUMP_DIR_Xaw = $(JUMP_ROOT_Xaw)/shared
-JUMP_VARS_Xaw = $(JUMP_ROOT_Xaw)/jump_vars
-JUMP_FUNCS_Xaw = $(JUMP_ROOT_Xaw)/jump_funcs
-JUMP_IGNORE_Xaw = $(JUMP_ROOT_Xaw)/jump_ignore
-JUMP_EXPORT_Xaw = $(JUMP_DIR_Xaw)/jump.vars
-JUMP_IMPORT_Xaw = $(JUMP_EXPORT_Xt) $(JUMP_EXPORT_X11)
-JUMP_ADDRESS_Xaw = 0x60300000
-JUMP_JUMPTABLESIZE_Xaw = 0x4000
-JUMP_GOTSIZE_Xaw = 4096
-JUMP_STUBNAMES_Xaw = libXaw
-JUMP_STUBS_IMPORT_Xaw = $(JUMP_STUBS_IMPORT_X11)
-JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libNX_Xt.sa $(JUMP_ROOT_Xt)/libNX_Xmu.sa \
-	$(JUMP_ROOT_Xt)/libNX_Xext.sa $(JUMP_ROOT_X11)/libNX_X11.sa \
-	$(JUMP_LDLIBS_libc)
-
 # endif /* !UseInstalled */

 /*

--- a/nx-X11/config/cf/lnxLib.tmpl
+++ b/nx-X11/config/cf/lnxLib.tmpl
@@ -5,38 +5,13 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
 * Linux shared library template
 */

-#if UseElfFormat
-
-#ifndef FixupLibReferences
-#define FixupLibReferences()						@@\
-XMULIBONLY = -lNX_Xmu							@@\
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
-#endif
-
 #define SharedX11Reqs     $(LDPRELIB) -ldl -lXdmcp
 #define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
 #define SharedOldXReqs	  $(LDPRELIB) $(XONLYLIB)
-#define SharedXtReqs	  $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
-#define SharedXaw6Reqs	  $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXaw7Reqs	  $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXawReqs	  $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
-#define SharedXmuReqs	  $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXmuuReqs	  $(LDPRELIB) $(XONLYLIB)
 #define SharedXextReqs	  $(LDPRELIB) $(XONLYLIB)
-#define SharedXiReqs	  $(LDPRELIB) $(XLIB)
-#define SharedXpReqs	  $(LDPRELIB) $(XLIB)
-#define SharedXpmReqs	  $(LDPRELIB) $(XLIB)
 #define SharedXrandrReqs  $(LDPRELIB) $(XRENDERLIB) $(XLIB)
 #define SharedXrenderReqs $(LDPRELIB) $(XLIB)
 #define SharedXtstReqs	  $(LDPRELIB) $(XLIB)
-#define SharedXvReqs	  $(LDPRELIB) $(XLIB)
-#define SharedSMReqs	  $(LDPRELIB) $(ICELIB)
-#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedFontencReqs $(LDPRELIB) GzipLibrary

 #if GlxUseBuiltInDRIDriver
 #define ExtraSharedGLReqs /**/
@@ -44,18 +19,9 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
 #define ExtraSharedGLReqs -ldl
 #endif
 #define SharedGLReqs	  $(LDPRELIB) $(XLIB) ExtraSharedGLReqs
-#ifndef SharedGLUReqs
-#define SharedGLUReqs	  $(LDPRELIB) $(XLIB) $(GLXLIB)
-#endif
-#define SharedDPSReqs	  $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-#define SharedDPSTKReqs	  $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
-#define SharedpsresReqs	  $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)

 #define SharedXResReqs	  $(LDPRELIB) $(XLIB)
-#define SharedXfontcacheReqs	$(LDPRELIB) $(XLIB)
 #define SharedXineramaReqs	$(LDPRELIB) $(XLIB)
-#define SharedXssReqs	$(LDPRELIB) $(XLIB)
-#define SharedXvMCReqs	$(LDPRELIB) $(XLIB)
 #define SharedXxf86dgaReqs	$(LDPRELIB) $(XLIB)
 #define SharedXxf86miscReqs	$(LDPRELIB) $(XLIB)
 #define SharedXxf86vmReqs	$(LDPRELIB) $(XLIB)
@@ -65,25 +31,4 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
 #define SharedXdamageReqs	$(LDPRELIB) $(XLIB)
 #define SharedXcompositeReqs	$(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB)

-#else	/* UseElfFormat */
-
-#ifndef FixupLibReferences
-#define FixupLibReferences()						@@\
-XMULIB = -lNX_Xmu $(XLIB)
-#endif
-
-#endif	/* UseElfFormat */
-
-#ifndef SharedXReqs
-# define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS)
-#endif
-
-#ifndef SharedXmReqs
-# define SharedXmReqs $(LDPRELIBS) SharedXReqs -lc
-#endif
-
-#ifndef SharedTtReqs
-# define SharedTtReqs $(LDPRELIBS) SharedXReqs $(CXXLIB)
-#endif
-
 #define NoMessageCatalog
--- a/nx-X11/config/cf/site.def
+++ b/nx-X11/config/cf/site.def
@@ -124,25 +124,6 @@ XCOMM site:  $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Ex
 #define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
 */

-
-/* You do NOT need SetUID if you only run the server under xdm */
-/* You MAY need SetUID if users run the server by hand or under xinit */
-/* Consult your system administrator before making the X server setuid */
-/*
-#if defined(SunArchitecture) && OSMajorVersion > 4
-#define InstallXserverSetUID YES
-#endif
-*/
-
-/* You do NOT need SetUID if you only run the server under xdm */
-/* You MAY need SetUID if users run the server by hand or under xinit */
-/* Consult your system administrator before making the X server setuid */
-/*
-#if defined(XFree86Version) || defined (XorgVersion)
-#define InstallXserverSetUID YES
-#endif
-*/
-
 #include <host.def>

 #endif /* AfterVendorCF */
--- a/nx-X11/config/cf/xf86site.def
+++ b/nx-X11/config/cf/xf86site.def
@@ -51,18 +51,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 */

 /*
- * If you only run the X server under xdm the X servers don't need to be
- * installed SetUID, and you may comment out the lines below.  If you run
- * the servers by hand (with xinit or startx), then they do need to be
- * installed SetUID on most platforms.
- *
- * Consult your system administrator before making the X server setuid.
- *
-#define InstallXserverSetUID	NO
- */
-
-
-/*
 * Server configuration parameters.  The defaults are shown here:
 */

@@ -97,48 +85,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 */

 /*
- * There are three parameters that determine where and how the Matrox HAL
- * library is used:
- *
- *   HaveMatroxHal  -- You have the HALlib.a binary library installed
- *                     in xfree86/drivers/mga/HALlib, and you want it to
- *                     be used.
- *                     Default: NO
- *
- *   BuildMatroxHal -- You have the source for the HALlib library (installed
- *                     in xfree86/drivers/mga/hallib), and want to build and
- *                     use it.
- *                     Default: NO
- *
- *   UseMatroxHal   -- You want to build support for loading/using the HAL
- *                     library into the mga driver.  For module server builds
- *                     you don't need to have the HALlib library to do this.
- *                     but you want to build support for loading it and using
- *                     it into the mga driver module.
- *                     Default: YES for loadable server build
- *                              (HaveMatroxHal || BuildMatroxHal) for static
- */
-
-/*
- * To disable use of the Matrox HAL library, uncomment this:
- *
-#define UseMatroxHal		NO
- */
-
-/*
- * If you have the HALlib.a binary installed in xfree86/drivers/mga/HALlib,
- * uncomment this:
- *
-#define HaveMatroxHal		YES
- */
-
-/*
- * If you have the HALlib source code installed in xfree86/drivers/mga/hallib,
- * uncomment this:
-#define BuildMatroxHal		YES
- */
-
-/*
 * To build only the servers with a cut-down source tree, uncomment
 * this.
 *
@@ -146,25 +92,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 */

 /*
- * By default, the sample config files for xinit, xdm and xfs are installed
- * only when there is no pre-existing version installed.  Uncommenting the
- * following lines will force the sample versions to be installed even if
- * it means over-writing existing versions.
- *
-#define InstallXinitConfig	YES
-#define InstallXdmConfig	YES
-#define InstallFSConfig		YES
- */
-
-/*
- * By default the application defaults files are always installed.
- * Uncommenting the the following will prevent exising application
- * defaults files from being over-written.
- *
-#define InstallAppDefFiles	NO
- */
-
-/*
 * Undefine the following if you don't want to have config files and
 * app-defaults installed in a separate directory (i.e. /etc/X11).
 *
@@ -450,7 +377,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 /*
 * To build static and shared libraries with debugging information, uncomment
 * this. Assumes you have Gcc2.
- * (If you don't have Gcc2, you can use the DebugLib{X11,Xt,Xaw,...} variables
+ * (If you don't have Gcc2, you can use the DebugLib{X11,...} variables
 * to build debugging versions of the libraries separately.)
 *
 #define DebuggableLibraries	YES

--- a/nx-X11/config/cf/xfree86.cf
+++ b/nx-X11/config/cf/xfree86.cf
@@ -234,45 +234,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 #endif

 /*
- * There are three parameters that determine where and how the Matrox HAL
- * library is used:
- *
- *   HaveMatroxHal  -- You have the HALlib.a binary library installed
- *                     in xfree86/drivers/mga/HALlib, and you want it to
- *                     be used.
- *                     Default: NO
- *
- *   BuildMatroxHal -- You have the source for the HALlib library (installed
- *                     in xfree86/drivers/mga/hallib), and want to build and
- *                     use it.
- *                     Default: NO
- *
- *   UseMatroxHal   -- You want to build support for loading/using the HAL
- *                     library into the mga driver.  For module server builds
- *                     you don't need to have the HALlib library to do this.
- *                     but you want to build support for loading it and using
- *                     it into the mga driver module.
- *                     Default: YES for loadable server build
- *                              (HaveMatroxHal || BuildMatroxHal) for static
- */
-
-#ifndef HaveMatroxHal
-#define HaveMatroxHal NO
-#endif
-
-#ifndef BuildMatroxHal
-#define BuildMatroxHal NO
-#endif
-
-#ifndef UseMatroxHal
-#if DoLoadableServer
-#define UseMatroxHal YES
-#else
-#define UseMatroxHal (HaveMatroxHal || BuildMatroxHal)
-#endif
-#endif
-
-/*
 * For Intel platforms, the default is to build all modules which
 * are supported on this platform.
 */
@@ -1304,16 +1265,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif

 /*
- * The default is to install the X servers setuid-root on most OSs.
- * It the servers are only started by xdm, they should not be setuid-root.
- */
-#if !defined(i386MachArchitecture) && !defined(OS2Architecture)
-# ifndef InstallXserverSetUID
-#  define InstallXserverSetUID	YES
-# endif
-#endif
-
-/*
 * Build GLX server interface
 *   --- Doesn't work for 1-bit and 4-bit servers
 */
@@ -1538,10 +1489,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 # define BuildXF86RushExt	NO
 #endif

-#ifndef BuildDBElib
-# define BuildDBElib	YES
-#endif
-
 #ifndef BuildRECORDlib
 # define BuildRECORDlib	YES
 #endif
@@ -1582,9 +1529,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 * Build the extra extension libs even when not including the extra extensions
 * in the servers
 */
-#ifndef BuildScreenSaverLibrary
-# define BuildScreenSaverLibrary   YES
-#endif
 #ifndef BuildXF86MiscLibrary
 # define BuildXF86MiscLibrary	YES
 #endif
@@ -1594,12 +1538,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #ifndef BuildXF86VidModeLibrary
 # define BuildXF86VidModeLibrary YES
 #endif
-#ifndef BuildXvLibrary
-# define BuildXvLibrary		YES
-#endif
-#ifndef BuildXvMCLibrary
-# define BuildXvMCLibrary	YES
-#endif
 #ifndef BuildGLXLibrary
 # define BuildGLXLibrary	YES
 #endif

--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -288,45 +288,6 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
 #endif

 /*
- * There are three parameters that determine where and how the Matrox HAL
- * library is used:
- *
- *   HaveMatroxHal  -- You have the HALlib.a binary library installed
- *                     in xfree86/drivers/mga/HALlib, and you want it to
- *                     be used.
- *                     Default: NO
- *
- *   BuildMatroxHal -- You have the source for the HALlib library (installed
- *                     in xfree86/drivers/mga/hallib), and want to build and
- *                     use it.
- *                     Default: NO
- *
- *   UseMatroxHal   -- You want to build support for loading/using the HAL
- *                     library into the mga driver.  For module server builds
- *                     you don't need to have the HALlib library to do this.
- *                     but you want to build support for loading it and using
- *                     it into the mga driver module.
- *                     Default: YES for loadable server build
- *                              (HaveMatroxHal || BuildMatroxHal) for static
- */
-
-#ifndef HaveMatroxHal
-#define HaveMatroxHal NO
-#endif
-
-#ifndef BuildMatroxHal
-#define BuildMatroxHal NO
-#endif
-
-#ifndef UseMatroxHal
-#if DoLoadableServer
-#define UseMatroxHal YES
-#else
-#define UseMatroxHal (HaveMatroxHal || BuildMatroxHal)
-#endif
-#endif
-
-/*
 * Many architectures share common X Server pieces.  List them here.
 */
 #if defined(i386Architecture) || defined(ia64Architecture) || \
@@ -860,16 +821,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif

 /*
- * The default is to install the X servers setuid-root on most OSs.
- * It the servers are only started by xdm, they should not be setuid-root.
- */
-#if !defined(i386MachArchitecture) && !defined(OS2Architecture)
-# ifndef InstallXserverSetUID
-#  define InstallXserverSetUID	YES
-# endif
-#endif
-
-/*
 * Build GLX server interface
 *   --- Doesn't work for 1-bit and 4-bit servers
 */
@@ -1102,10 +1053,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 # define BuildXF86RushExt	NO
 #endif

-#ifndef BuildDBElib
-# define BuildDBElib	YES
-#endif
-
 #ifndef BuildRECORDlib
 # define BuildRECORDlib	YES
 #endif
@@ -1146,9 +1093,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 * Build the extra extension libs even when not including the extra extensions
 * in the servers
 */
-#ifndef BuildScreenSaverLibrary
-# define BuildScreenSaverLibrary   YES
-#endif
 #ifndef BuildXF86MiscLibrary
 # define BuildXF86MiscLibrary	YES
 #endif
@@ -1158,12 +1102,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #ifndef BuildXF86VidModeLibrary
 # define BuildXF86VidModeLibrary YES
 #endif
-#ifndef BuildXvLibrary
-# define BuildXvLibrary		YES
-#endif
-#ifndef BuildXvMCLibrary
-# define BuildXvMCLibrary	YES
-#endif
 #ifndef BuildGLXLibrary
 # define BuildGLXLibrary	YES
 #endif

--- a/nx-X11/config/cf/xorgsite.def
+++ b/nx-X11/config/cf/xorgsite.def
@@ -51,18 +51,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 */

 /*
- * If you only run the X server under xdm the X servers don't need to be
- * installed SetUID, and you may comment out the lines below.  If you run
- * the servers by hand (with xinit or startx), then they do need to be
- * installed SetUID on most platforms.
- *
- * Consult your system administrator before making the X server setuid.
- *
-#define InstallXserverSetUID	NO
- */
-
-
-/*
 * Server configuration parameters.  The defaults are shown here:
 */

@@ -111,48 +99,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 */

 /*
- * There are three parameters that determine where and how the Matrox HAL
- * library is used:
- *
- *   HaveMatroxHal  -- You have the HALlib.a binary library installed
- *                     in xfree86/drivers/mga/HALlib, and you want it to
- *                     be used.
- *                     Default: NO
- *
- *   BuildMatroxHal -- You have the source for the HALlib library (installed
- *                     in xfree86/drivers/mga/hallib), and want to build and
- *                     use it.
- *                     Default: NO
- *
- *   UseMatroxHal   -- You want to build support for loading/using the HAL
- *                     library into the mga driver.  For module server builds
- *                     you don't need to have the HALlib library to do this.
- *                     but you want to build support for loading it and using
- *                     it into the mga driver module.
- *                     Default: YES for loadable server build
- *                              (HaveMatroxHal || BuildMatroxHal) for static
- */
-
-/*
- * To disable use of the Matrox HAL library, uncomment this:
- *
-#define UseMatroxHal		NO
- */
-
-/*
- * If you have the HALlib.a binary installed in xfree86/drivers/mga/HALlib,
- * uncomment this:
- *
-#define HaveMatroxHal		YES
- */
-
-/*
- * If you have the HALlib source code installed in xfree86/drivers/mga/hallib,
- * uncomment this:
-#define BuildMatroxHal		YES
- */
-
-/*
 * To build only the servers with a cut-down source tree, uncomment
 * this.
 *
@@ -160,25 +106,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 */

 /*
- * By default, the sample config files for xinit, xdm and xfs are installed
- * only when there is no pre-existing version installed.  Uncommenting the
- * following lines will force the sample versions to be installed even if
- * it means over-writing existing versions.
- *
-#define InstallXinitConfig	YES
-#define InstallXdmConfig	YES
-#define InstallFSConfig		YES
- */
-
-/*
- * By default the application defaults files are always installed.
- * Uncommenting the the following will prevent exising application
- * defaults files from being over-written.
- *
-#define InstallAppDefFiles	NO
- */
-
-/*
 * Undefine the following if you don't want to have config files and
 * app-defaults installed in a separate directory (i.e. /etc/X11).
 *
@@ -463,7 +390,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 /*
 * To build static and shared libraries with debugging information, uncomment
 * this. Assumes you have Gcc2.
- * (If you don't have Gcc2, you can use the DebugLib{X11,Xt,Xaw,...} variables
+ * (If you don't have Gcc2, you can use the DebugLib{X11,...} variables
 * to build debugging versions of the libraries separately.)
 *
 #define DebuggableLibraries	YES
@@ -561,41 +488,3 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 *
 #define X86EMU_LIBPATH /usr/local/lib
 */ 
-
-
-/*
- * Most platforms default to using an already installed Expat library.
- * To use the one included in this release instead, uncomment the following.
- *
-#define HasExpat NO
- */
-
-/* 
- * To use a Expat library already installed outside the default search
- * paths, uncomment the following and set the path as needed.
-#define HasExpat YES
-#define ExpatDir /usr/local
- */
-
-
-/*
- * Most platforms default to using an already installed PNG library.
- * To use the one included in this release instead, uncomment the following.
- *
-#define HasLibpng NO
- */
-
-/* 
- * To use a PNG library already installed outside the default search
- * paths, uncomment the following and set the path as needed.
-#define HasLibpng YES
-#define LibpngDir /usr/local
- */
-
-
-/*
- * Most platforms default to using an already installed xterm program.
- * To use the one included in this release instead, uncomment the following.
- *
-#define BuildXterm YES
- */
--- a/nx-X11/include/Imakefile
+++ b/nx-X11/include/Imakefile
@@ -4,6 +4,9 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $


 XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $
+
+NULL =
+
 #define IHaveSubdirs
 #define PassCDebugFlags /**/

@@ -11,11 +14,7 @@ XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $
 GLXDIR = GL
 #endif

-#if BuildDPSLibrary
-DPSDIR = DPS
-#endif
-
-SUBDIRS = extensions $(GLXDIR) $(DPSDIR)
+SUBDIRS = extensions $(GLXDIR)

 #ifdef Win32Architecture
 EXTRA_HEADERS = Xw32defs.h Xwinsock.h Xwindows.h
@@ -23,7 +22,8 @@ EXTRA_HEADERS = Xw32defs.h Xwinsock.h Xwindows.h
 EXTRA_HEADERS = Xwindows.h
 #endif

-HEADERS = DECkeysym.h \
+HEADERS = \
+	DECkeysym.h \
 	HPkeysym.h \
 	Sunkeysym.h \
 	X.h \
@@ -46,7 +46,8 @@ HEADERS = DECkeysym.h \
 	ap_keysym.h \
 	keysym.h \
 	keysymdef.h \
-	$(EXTRA_HEADERS)
+	$(EXTRA_HEADERS) \
+	$(NULL)

 all::


--- a/nx-X11/include/extensions/Imakefile
+++ b/nx-X11/include/extensions/Imakefile
@@ -6,7 +6,9 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $

 XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.55 2003/04/21 12:32:06 sven Exp $

-#if BuildScreenSaverExt || BuildScreenSaverLibrary
+NULL =
+
+#if BuildScreenSaverExt
 SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
 #endif

@@ -22,11 +24,11 @@ XF86VIDMODEHEADERS = xf86vmode.h xf86vmstr.h
 #if BuildXF86DGA || BuildXF86DGALibrary
 XF86DGAHEADERS = xf86dga.h xf86dgastr.h xf86dga1.h xf86dga1str.h
 #endif
-#if BuildLBX || BuildXextLib
+#if BuildXextLib
 LBXHEADERS = XLbx.h lbxbuf.h lbxbufstr.h lbxdeltastr.h lbximage.h lbxopts.h \
 	     lbxstr.h lbxzlib.h
 #endif
-#if BuildXvExt || BuildXvLibrary
+#if BuildXvExt
 XVHEADERS = Xv.h Xvlib.h Xvproto.h
 XVMCHEADERS = XvMC.h XvMClib.h XvMCproto.h vldXvMC.h
 #endif
@@ -54,26 +56,38 @@ COMPOSITEHEADERS = composite.h compositeproto.h
 #if BuildRandR || BuildRandRLibrary
 RANDRHEADERS = randr.h randrproto.h
 #endif
-#if BuildXTrap || BuildXTrapLibrary
+#if BuildXTrap
 XTRAPHEADERS = xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \
 	xtraplibp.h xtrapproto.h
 #endif
 #if BuildXResExt || BuildXResLibrary
 XRESHEADERS = XRes.h XResproto.h
 #endif
-#if BuildXevie || BuildXevieLibrary
+#if BuildXevie
 XEVIEHEADERS = Xevie.h Xeviestr.h
 #endif

-EXTRAHEADERS = $(SCREENSAVERHEADERS) $(XF86MISCHEADERS) $(XF86BIGFONTHEADERS) \
-	       $(XF86VIDMODEHEADERS) $(XF86DGAHEADERS) $(XINERAMAHEADERS) \
-	       $(LBXHEADERS) $(XVHEADERS) $(XVMCHEADERS) $(XF86RUSHHEADERS) \
-	       $(FONTCACHEHEADERS) $(RENDERHEADERS) $(RANDRHEADERS) \
-	       $(XFIXESHEADERS) $(DAMAGEHEADERS) $(COMPOSITEHEADERS) \
+EXTRAHEADERS = \
+	$(SCREENSAVERHEADERS) \
+	$(XF86MISCHEADERS) \
+	$(XF86BIGFONTHEADERS) \
+	$(XF86VIDMODEHEADERS) \
+	$(XF86DGAHEADERS) \
+	$(XINERAMAHEADERS) \
+	$(LBXHEADERS) \
+	$(XVHEADERS) \
+	$(XVMCHEADERS) \
+	$(XF86RUSHHEADERS) \
+	$(FONTCACHEHEADERS) \
+	$(RENDERHEADERS) \
+	$(RANDRHEADERS) \
+	$(XFIXESHEADERS) \
+	$(DAMAGEHEADERS) \
+	$(COMPOSITEHEADERS) \
 	$(XEVIEHEADERS) \
-	       $(XTRAPHEADERS) $(XRESHEADERS)
-
-
+	$(XTRAPHEADERS) \
+	$(XRESHEADERS) \
+	$(NULL)

 HEADERS = Xext.h \
 	xcmiscstr.h \
@@ -94,7 +108,8 @@ HEADERS = Xext.h \
 	sync.h syncstr.h \
 	Xcup.h Xcupstr.h \
 	dpms.h dpmsstr.h \
-	XEVI.h XEVIstr.h
+	XEVI.h XEVIstr.h \
+	$(NULL)

 all::


--- a/nx-X11/lib/GL/GL/Imakefile
+++ b/nx-X11/lib/GL/GL/Imakefile
@@ -242,5 +242,3 @@ InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
 ProfiledLibraryTarget($(LIBNAME),$(POBJS))
 InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
 #endif
-
-
--- a/nx-X11/lib/GL/Imakefile
+++ b/nx-X11/lib/GL/Imakefile
@@ -50,7 +50,7 @@ XCOMM Server-side tokens:
 XCOMM    BuildGlxExt 
 XCOMM    GlxUseSGISI

-
+NULL =

 #include <Threads.tmpl>

@@ -108,9 +108,23 @@ LIBGLBUILDDIR = GL
 * the drivers, and in the latter case, it needs to be built after the driver.
 */
 #if BuildXF86DRI && GlxUseBuiltInDRIDriver
-SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
+SUBDIRS = \
+	$(MESADIRS) \
+	$(DRIDIRS) \
+	$(DRIVERDIRS) \
+	$(GLXDIRS) \
+	$(LIBGLBUILDDIR) \
+	$(OSMESADIRS) \
+	$(NULL)
 #else
-SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS)
+SUBDIRS = \
+	$(MESADIRS) \
+	$(GLXDIRS) \
+	$(DRIDIRS) \
+	$(LIBGLBUILDDIR) \
+	$(OSMESADIRS) \
+	$(DRIVERDIRS) \
+	$(NULL)
 #endif

 MakeSubdirs($(SUBDIRS))

--- a/nx-X11/lib/GL/mesa/Imakefile
+++ b/nx-X11/lib/GL/mesa/Imakefile
@@ -12,6 +12,8 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $
 * driver modules.
 */

+NULL =
+
 #if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
 #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
 #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
@@ -63,8 +65,17 @@ LibraryObjectRule()
 #define IHaveSubdirs
 #define PassCDebugFlags

-SUBDIRS = $(ASM_SUBDIRS) array_cache main math swrast swrast_setup tnl tnl_dd shader
-
+SUBDIRS = \
+	$(ASM_SUBDIRS) \
+	array_cache \
+	main \
+	math \
+	swrast \
+	swrast_setup \
+	tnl \
+	tnl_dd \
+	shader \
+	$(NULL)

 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))

--- a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile
+++ b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile
@@ -29,7 +29,7 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/common/Imakefile,v 1.6 2001/04/03 02:29:3

      DEFINES = $(ALLOC_DEFINES) $(COMMON_DRI_DEFINES) $(MESA_ASM_DEFINES)
     INCLUDES = $(COMMON_X_INCLUDES) $(COMMON_MESA_INCLUDES) \
-		$(COMMON_DRI_INCLUDES) $(EXPATINCLUDES)
+		$(COMMON_DRI_INCLUDES)

         SRCS = $(COMMONSRCS)
         OBJS = $(COMMONOBJS)

--- a/nx-X11/lib/Imakefile
+++ b/nx-X11/lib/Imakefile
@@ -9,25 +9,7 @@ XCOMM $XFree86: xc/lib/Imakefile,v 3.74 2003/04/14 20:37:07 herrb Exp $
 #define IHaveSubdirs
 #define PassCDebugFlags

-#if BuildXaw6 && BuildLibraries
-XAW6LIBDIR = Xaw6
-#endif
-
-#if BuildXaw7 && BuildLibraries
-XAW7LIBDIR = Xaw7
-#endif
-
-#if BuildXaw && BuildLibraries
-XAWLIBDIR = Xaw
-#endif
-
-#ifndef NeedBerklib
-#define NeedBerklib NO
-#endif
-
-#if NeedBerklib
-BERKDIR = Xbsd
-#endif
+NULL =

 #if BuildXKBfilelib || BuildXKB
 XKBLIBDIR = xkbfile
@@ -37,14 +19,6 @@ XKBLIBDIR = xkbfile
 XKBUILIBDIR = xkbui
 #endif

-#if BuildXInputLib
-XINPUTLIBDIR = Xi
-#endif
-
-#if BuildScreenSaverLibrary
-SSLIBDIR = Xss
-#endif
-
 #if BuildXF86MiscLibrary
 XF86MISCLIBDIR = Xxf86misc
 #endif
@@ -61,11 +35,6 @@ XF86DGALIBDIR = Xxf86dga
 XF86RUSHLIBDIR = Xxf86rush
 #endif

-#if BuildXvLibrary
-XVLIBDIR = Xv
-XVMCLIBDIR = XvMC
-#endif
-
 #if BuildXineramaLibrary
 XINERAMADIR=Xinerama
 #endif
@@ -78,42 +47,14 @@ XRESLIBDIR = XRes
 GLXLIBDIR = GL
 #endif

-#if BuildGLwLibrary
-GLWLIBDIR = GLw
-#endif
-
-#if BuildGLULibrary
-GLULIBDIR = GLU
-#endif
-
-#if BuildDPSLibrary
-DPSLIBDIR = dps
-#endif
-
-#if BuildDPSTkLibrary
-DPSTKLIBDIR = dpstk
-#endif
-
-#if BuildPSResLibrary
-PSRESLIBDIR = psres
-#endif
-
 #if BuildRenderLibrary
 RENDERLIBDIR = Xrender
 #endif

-#if BuildExpatLibrary
-EXPATBUILDDIR = expat
-#endif
-
 #if BuildRandRLibrary
 RANDRLIBDIR = Xrandr
 #endif

-#if BuildXevieLibrary
-XEVIELIBDIR = Xevie
-#endif
-
 #if BuildXfixesLibrary
 XFIXESLIBDIR = Xfixes
 #endif
@@ -126,40 +67,12 @@ DAMAGELIBDIR = Xdamage
 COMPOSITELIBDIR = Xcomposite
 #endif

-#if BuildXcursorLibrary
-XCURSORLIBDIR = Xcursor
-#endif
-
-#if BuildXTrapLibrary
-XTRAPLIBDIR = XTrap
-#endif
-
-#if BuildAppleWMLibrary
-APPLELIBDIR = apple
-#endif
-
-#if BuildWindowsWMLibrary
-WINDOWSLIBDIR = windows
-#endif
-
-XF86EXTLIBS = $(XF86MISCLIBDIR) $(XF86VMLIBDIR) \
-		$(XF86DGALIBDIR) $(XF86RUSHLIBDIR)
-
-#if BuildLBX
-LBXUTILDIR = lbxutil
-#endif
-
-#if BuildLBX && !HasZlib
-ZLIBDIR = zlib
-#endif
-
-#if (defined(XFree86Version) || defined(XorgVersion)) && !HasPosixRegex
-REGEXDIR = regex
-#endif
-
-#if BuildXAudio
-XALIBDIR = Xa
-#endif
+XF86EXTLIBS = \
+	$(XF86MISCLIBDIR) \
+	$(XF86VMLIBDIR) \
+	$(XF86DGALIBDIR) \
+	$(XF86RUSHLIBDIR) \
+	$(NULL)

 #if BuildXauLib
 XAULIBDIR = Xau
@@ -179,22 +92,29 @@ XTSTLIBDIR = Xtst
 #endif


-LINTSUBDIRS = $(XAULIBDIR) $(X11LIBDIR) \
-             $(OLDXLIBDIR) $(ICELIBDIR) $(SMLIBDIR) $(XEXTLIBDIR) $(XTLIBDIR) \
-             $(SSLIBDIR) $(XF86MISCLIBDIR) $(XF86VMLIBDIR) $(XF86DGALIBDIR) \
-             $(XF86RUSHLIBDIR) $(XMULIBDIR) $(XMUULIBDIR) $(XPMLIBDIR) \
-             $(XAW6LIBDIR) $(XAW7LIBDIR) $(XAWLIBDIR) \
-             $(XINPUTLIBDIR) $(XTSTLIBDIR) $(FSLIBDIR) $(XKBLIBDIR) \
-             $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(EXPATBUILDDIR) \
-             $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \
-             $(DPSLIBDIR) $(PSRESLIBDIR) $(DPSTKLIBDIR) $(XINERAMADIR) \
-             $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) \
-	     $(XVMCLIBDIR) $(RANDRLIBDIR) $(XTRAPLIBDIR) \
-	     $(XRESLIBDIR) $(APPLELIBDIR) $(DMXLIBDIR) $(WINDOWSLIBDIR) \
-	     $(XEVIELIBDIR) $(XFIXESLIBDIR) $(DAMAGELIBDIR) \
-	     $(XCURSORLIBDIR) $(COMPOSITELIBDIR)
-
-SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS)
+LINTSUBDIRS = \
+	$(XAULIBDIR) \
+	$(X11LIBDIR) \
+	$(OLDXLIBDIR) \
+	$(XEXTLIBDIR) \
+	$(XF86MISCLIBDIR) \
+	$(XF86VMLIBDIR) \
+	$(XF86DGALIBDIR) \
+	$(XF86RUSHLIBDIR) \
+	$(XTSTLIBDIR) \
+	$(XKBLIBDIR) \
+	$(XKBUILIBDIR) \
+	$(GLXLIBDIR) \
+	$(XINERAMADIR) \
+	$(RENDERLIBDIR) \
+	$(RANDRLIBDIR) \
+	$(XRESLIBDIR) \
+	$(XFIXESLIBDIR) \
+	$(DAMAGELIBDIR) \
+	$(COMPOSITELIBDIR) \
+	$(NULL)
+
+SUBDIRS = xtrans $(LINTSUBDIRS)

 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))

--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -22,11 +22,6 @@ XCOMM $Xorg: Imakefile,v 1.4 2001/03/14 18:42:02 pookie Exp $
 */
 XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.296 2003/11/23 06:47:00 torrey Exp $

-#ifndef InstallXserverSetUID
-#define InstallXserverSetUID NO
-#endif
-#define InstallServerSetUID InstallXserverSetUID
-
 #include <Server.tmpl>

 /* On most systems the linker requires the libraries in dependency order. 
@@ -122,15 +117,10 @@ INSTPGMFLAGS =
    XF86XKBOBJS = xkb/xf86KillSrv.o xkb/xf86VT.o xkb/xf86Private.o
 #endif
 #endif
-#if BuildLBX
-         LBXEXT = lbx/LibraryTargetName(lbx) \
-                  $(TOP)/lib/lbxutil/LibraryTargetName(lbxutil)
-        LBXDIRS = lbx
-#endif
 #if BuildDBE
         DBEEXT = dbe/LibraryTargetName(dbe)
 #endif
-#if BuildDBE || BuildDBElib
+#if BuildDBE
         DBEDIR = dbe
 #endif
 #if BuildRECORD
@@ -190,20 +180,17 @@ INSTPGMFLAGS =
   LOADABLEEXTS = $(MISCEXT) $(DBEEXT) $(RECORDEXT) $(GLXEXT) $(XTRAPEXT)
        MISCEXT = Xext/LibraryTargetName(ext)
      OTHEREXTS = Xext/LibraryTargetName(exts) $(XKBEXT) $(XINPUTEXT) \
-                  $(LBXEXT) $(SITEEXTS)
+                  $(SITEEXTS)
 #else
     EXTENSIONS = $(COMPOSITELIB) $(DAMAGELIB) $(DAMAGE) $(FIXESLIB) $(CW) \
 		  $(OTHEREXTS) $(GLXEXT) $(RANDRLIB) $(RENDERLIB)
      OTHEREXTS = Xext/LibraryTargetName(ext) $(XKBEXT) $(XINPUTEXT) \
-                  $(LBXEXT) $(DBEEXT) $(RECORDEXT) $(SITEEXTS) $(XTRAPEXT)
+                  $(DBEEXT) $(RECORDEXT) $(SITEEXTS) $(XTRAPEXT)
 #endif
        EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(GLXDIR) \
-                  $(LBXDIRS) $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) \
+                  $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) \
                  $(RANDRDIR) $(RENDERDIR) $(XTRAPDIR) $(XPCONFIGDIR) \
 		  $(FIXESDIR) $(DAMAGEDIR) $(CWDIR) $(COMPOSITEDIR)
-#if BuildLBX
-           ZLIB = GzipLibrary
-#endif
             OS = os/LibraryTargetName(os) $(DEPXAUTHLIB)
        BSDEMUL = $(DEPXBSDLIB)
 #if DoLoadableServer

--- a/nx-X11/programs/Xserver/os/Imakefile
+++ b/nx-X11/programs/Xserver/os/Imakefile
@@ -91,14 +91,6 @@ KRB5SRCS = k5auth.c k5encode.c
   IFADDRS_DEFINES = -DHAS_GETIFADDRS
 #endif

-#if BuildLBX
-   LBX_SRCS = lbxio.c
-   LBX_OBJS = lbxio.o
-#else
-   LBX_SRCS =
-   LBX_OBJS =
-#endif
-
 #if !defined(DDXOsColor)
 COLOR_SRCS=oscolor.c
 COLOR_OBJS=oscolor.o
@@ -132,12 +124,12 @@ BOOTSTRAPCFLAGS =
                  osinit.c utils.c log.c auth.c mitauth.c secauth.c \
                  $(XDMAUTHSRCS) $(RPCSRCS) $(KRB5SRCS) xdmcp.c OtherSources \
                  transport.c $(SNPRINTF_SRCS) $(STRLCAT_SRCS) \
-		  $(MALLOC_SRCS) $(LBX_SRCS) xprintf.c
+		  $(MALLOC_SRCS) xprintf.c
           OBJS = WaitFor.o access.o connection.o io.o $(COLOR_OBJS) \
                  osinit.o utils.o log.o auth.o mitauth.o secauth.o \
                  $(XDMAUTHOBJS) $(RPCOBJS) $(KRB5OBJS) xdmcp.o OtherObjects \
                  transport.o $(SNPRINTF_OBJS) $(STRLCAT_OBJS) \
-		  $(MALLOC_OBJS) $(LBX_OBJS) xprintf.o
+		  $(MALLOC_OBJS) xprintf.o

 #if SpecialMalloc
     MEM_DEFINES = -DSPECIAL_MALLOC
@@ -166,7 +158,7 @@ BOOTSTRAPCFLAGS =
 		  $(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES) $(NX_DEFINES)
       INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
 		  -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \
-		  -I$(TOP)/lib/Xau -I../lbx Krb5Includes $(NX_INCLUDES)
+		  -I$(TOP)/lib/Xau Krb5Includes $(NX_INCLUDES)
 DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
 		  $(TRANS_INCLUDES) $(CONNECTION_FLAGS) $(GETPEER_DEFINES) \
 		  DependDefines
@@ -201,9 +193,6 @@ LinkSourceFile(transport.c,$(TRANSCOMMSRC))
 SpecialCObjectRule(osinit,$(ICONFIGFILES),$(ADM_DEFINES))
 SpecialCObjectRule(WaitFor,$(ICONFIGFILES),$(EXT_DEFINES))
 SpecialCObjectRule(io,$(ICONFIGFILES),$(EXT_DEFINES))
-#if BuildLBX
-SpecialCObjectRule(lbxio,$(ICONFIGFILES),$(EXT_DEFINES))
-#endif
 SpecialCObjectRule(utils,$(ICONFIGFILES),$(XDMCP_DEFINES) $(EXT_DEFINES) $(ERROR_DEFINES) $(PAM_DEFINES))
 SpecialCObjectRule(xalloc,$(ICONFIGFILES),$(XALLOC_DEFINES))
 #if defined(SparcArchitecture) && HasGcc && !HasGcc2

--- a/nx-X11/programs/Xserver/os/lbxio.c
+++ b/nx-X11/programs/Xserver/os/lbxio.c