Skip to content

N
nx-libs
Unverified Commit 7b7ba944 authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files
Options

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
parents cbf4e4db 662a8954
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 2685 deletions
doc/nx-X11_vs_XOrg69_patches/host.def.NX.patch
View file @ 7b7ba944
......@@ -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
......
nx-X11/config/Imakefile
View file @ 7b7ba944
......@@ -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)) \
......
nx-X11/config/cf/Imake.tmpl
View file @ 7b7ba944
......@@ -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 /**/
......
nx-X11/config/cf/README
View file @ 7b7ba944
......@@ -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
......
nx-X11/config/cf/X11.tmpl
View file @ 7b7ba944
......@@ -22,8 +22,6 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
/* The following project-specific rules are defined at the end of this file:
*
* InstallAppDefaults (class)
* InstallAppDefaultsLong (file,class)
* MakeXkbDir (basedir,subdir)
*/
/* X.Org release string */
......@@ -130,18 +128,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildLibrariesForXServers
#define BuildLibrariesForXServers BuildServer
#endif
#ifndef HasXAudio
#define HasXAudio NO
#endif
#ifndef BuildXAudio
#define BuildXAudio (HasXAudio & HasCplusplus)
#endif
#ifndef HasXAServer
#define HasXAServer NO
#endif
#ifndef BuildXAServer
#define BuildXAServer (HasXAServer & HasCplusplus)
#endif
#ifndef BuildX11Lib
#define BuildX11Lib BuildLibraries
#endif
......@@ -192,18 +178,12 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXInputExt
#define BuildXInputExt NO
#endif
#ifndef BuildXInputLib
#define BuildXInputLib (BuildXInputExt && !BuildServersOnly)
#endif
#ifndef BuildEVI
#define BuildEVI YES
#endif
#ifndef BuildDBE
#define BuildDBE YES
#endif
#ifndef BuildDBElib
#define BuildDBElib BuildDBE
#endif
#ifndef BuildDIS
#define BuildDIS NO
#endif
......@@ -213,29 +193,21 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildFontCache
#define BuildFontCache NO
#endif
#ifndef BuildLBX
#define BuildLBX YES
#endif
#ifndef BuildXKB
#define BuildXKB YES
#endif
#ifndef BuildXKBlib
#define BuildXKBlib (BuildXKB && (!BuildServersOnly || \
BuildXkbcomp ))
#define BuildXKBlib (BuildXKB && !BuildServersOnly)
#endif
#ifndef BuildXKBuilib
#define BuildXKBuilib (BuildXKB && !BuildServersOnly)
#endif
#ifndef BuildXKBfilelib
#define BuildXKBfilelib (BuildXKB && (!BuildServersOnly || \
BuildXkbcomp ))
#define BuildXKBfilelib (BuildXKB && !BuildServersOnly)
#endif
#ifndef BuildXTrap
#define BuildXTrap YES
#endif
#ifndef BuildXTrapLibrary
#define BuildXTrapLibrary (BuildXTrap && !BuildServersOnly)
#endif
/*
* WARNING: Setting UseXKBInClients to YES cause incompatibilities
......@@ -281,31 +253,10 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildPlugin
#define BuildPlugin HasPlugin
#endif
#ifndef XpRasterDDX
#define XpRasterDDX YES
#endif
#ifndef XpColorPclDDX
#define XpColorPclDDX YES
#endif
#ifndef XpMonoPclDDX
#define XpMonoPclDDX YES
#endif
#ifndef XpPostScriptDDX
#define XpPostScriptDDX YES
#endif
#ifndef XpPdfDDX
#define XpPdfDDX YES
#endif
#ifndef XpSvgDDX
#define XpSvgDDX YES
#endif
#ifndef BuildScreenSaverExt
#define BuildScreenSaverExt NO
#endif
#ifndef BuildScreenSaverLibrary
#define BuildScreenSaverLibrary (BuildScreenSaverExt && !BuildServersOnly)
#endif
#ifndef BuildXF86VidModeExt
#define BuildXF86VidModeExt NO
#endif
......@@ -336,15 +287,9 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXvExt
#define BuildXvExt NO
#endif
#ifndef BuildXvLibrary
#define BuildXvLibrary (BuildXvExt && !BuildServersOnly)
#endif
#ifndef BuildXvMCExt
#define BuildXvMCExt NO
#endif
#ifndef BuildXvMCLibrary
#define BuildXvMCLibrary (BuildXvMCExt && !BuildServersOnly)
#endif
#ifndef BuildGlxExt
#define BuildGlxExt NO
#else
......@@ -361,13 +306,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildOSMesaLib
#define BuildOSMesaLib BuildGlxExt
#endif
#ifndef BuildGLULibrary
#define BuildGLULibrary (BuildGLXLibrary && BuildLibraries && \
HasCplusplus)
#endif
#ifndef BuildGLwLibrary
#define BuildGLwLibrary (BuildGLXLibrary && BuildLibraries)
#endif
#ifndef BuildXDriInfo
#define BuildXDriInfo (BuildGLXLibrary && !BuildServersOnly)
#endif
......@@ -377,21 +315,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXF86RushLibrary
#define BuildXF86RushLibrary (BuildXF86RushExt && !BuildServersOnly)
#endif
#ifndef BuildDPSLibraries
#define BuildDPSLibraries NO
#endif
#ifndef BuildDPSLibrary
#define BuildDPSLibrary BuildDPSLibraries
#endif
#ifndef BuildDPSTkLibrary
#define BuildDPSTkLibrary BuildDPSLibraries
#endif
#ifndef BuildPSResLibrary
#define BuildPSResLibrary BuildDPSLibraries
#endif
#ifndef BuildDPSClients
#define BuildDPSClients BuildDPSLibraries
#endif
#ifndef BuildRender
#define BuildRender YES
#endif
......@@ -399,16 +322,6 @@ XORGRELSTRING = XorgManVersionString
#define BuildRenderLibrary !BuildServersOnly
#endif
#ifndef HasExpat
#define HasExpat YES
#endif
#ifndef UseExpat
#define UseExpat BuildXF86DRI
#endif
#ifndef BuildExpatLibrary
#define BuildExpatLibrary (UseExpat && !HasExpat)
#endif
#ifndef BuildRandR
#define BuildRandR YES
#endif
......@@ -441,42 +354,15 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXevie
#define BuildXevie YES
#endif
#ifndef BuildXevieLibrary
#define BuildXevieLibrary !BuildServersOnly
#endif
#ifndef BuildRootless
#define BuildRootless NO
#endif
#ifndef BuildXterm
#define BuildXterm NO
#endif
#ifndef BuildXkbcomp
#define BuildXkbcomp BuildClients
#endif
#ifndef BuildXcursorLibrary
#define BuildXcursorLibrary BuildRenderLibrary
#endif
#ifndef BuildXcursorgen
#define BuildXcursorgen HasLibpng
#endif
#ifndef DefaultCursorTheme
#define DefaultCursorTheme core
#endif
#ifndef BuildAppleWMLibrary
#define BuildAppleWMLibrary NO
#endif
#ifndef BuildWindowsWMLibrary
#define BuildWindowsWMLibrary NO
#endif
#ifndef BuildMiscDocs
#define BuildMiscDocs NO
#endif
......@@ -502,34 +388,7 @@ XORGRELSTRING = XorgManVersionString
#ifndef InstallLibManPages
#define InstallLibManPages YES
#endif
#ifndef InstallXtermSetUID
#define InstallXtermSetUID YES /* xterm needs to be set uid */
#endif
#ifndef InstallXloadSetGID
#define InstallXloadSetGID YES /* xload often needs set gid kmem */
#endif
#ifndef InstallXinitConfig
#define InstallXinitConfig NO /* install sample xinit config */
#endif
#ifndef InstallXdmConfig
#define InstallXdmConfig NO /* install sample xdm config */
#endif
#ifndef XdmServersType /* what Xservers files to use */
#if BuildServer
#define XdmServersType ws
#else
#define XdmServersType fs
#endif
#endif
#ifndef InstallFSConfig
#define InstallFSConfig NO /* install sample fs config */
#endif
#ifndef InstallAppDefFiles
#define InstallAppDefFiles YES /* install application defaults */
#endif
#ifndef UseConfDirForAppDefaults
#define UseConfDirForAppDefaults YES
#endif
#ifndef UseConfDirForXkb
#define UseConfDirForXkb YES
#endif
......@@ -637,13 +496,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#ifndef ProjectThreadsDefines
#define ProjectThreadsDefines -DXTHREADS
#endif
#ifndef XawI18nDefines
#if SystemV4
#define XawI18nDefines -DHAS_WCTYPE_H
#else
#define XawI18nDefines -DUSE_XWCHAR_STRING
#endif
#endif
#if Malloc0ReturnsNull
#ifndef XMalloc0ReturnsNullDefines
#define XMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines
......@@ -740,9 +592,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#define XineramaDefines /**/
#endif
#endif
#ifndef PrintOnlyServer
#define PrintOnlyServer YES
#endif
#ifndef XkbDefines
#if BuildXKB
#define XkbDefines -DXKB
......@@ -766,13 +615,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
# ifndef XkbDefaultRulesFile
# define XkbDefaultRulesFile XVendorStdFilePrefix
#endif
#ifndef LbxDefines
#if BuildLBX
#define LbxDefines -DLBX
#else
#define LbxDefines /**/
#endif
#endif
#ifndef BigReqDefines
#if BuildBigReqsExt
#define BigReqDefines -DBIGREQS
......@@ -972,7 +814,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#ifndef PervasiveExtensionDefines
#define PervasiveExtensionDefines \
ShapeDefines XInputDefines XkbDefines LbxDefines AppgroupDefines \
ShapeDefines XInputDefines XkbDefines AppgroupDefines \
XCSecurityDefines CupDefines PervasiveDBEDefines \
XF86BigfontExtensionDefines DPMSDefines \
XineramaDefines \
......@@ -1264,12 +1106,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#ifndef XLocaleDir
#define XLocaleDir $(LIBDIR)/locale
#endif
#ifndef LbxproxyDir
#define LbxproxyDir $(LIBDIR)/lbxproxy
#endif
#ifndef LbxproxyConfigSubdir /* under lbxproxy sources */
#define LbxproxyConfigSubdir config
#endif
#ifndef ProxyManagerDir
#define ProxyManagerDir $(LIBDIR)/proxymngr
#endif
......@@ -1332,10 +1168,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#define ForceNormalLib (HasGcc && !HasGcc2)
#endif
#ifndef XkbComp
#define XkbComp xkbcomp
#endif
#ifndef PsWrap
# ifndef UseInstalled
# define PsWrap $(PSWRAPSRC)/pswrap
......@@ -1406,7 +1238,6 @@ XCOMM X Window System make variables; these need to be coordinated with rules
XSMDIR = XsmDir /* xsm config files */
NLSDIR = NlsDir /* nls files */
XLOCALEDIR = XLocaleDir /* locale files */
LBXPROXYDIR = LbxproxyDir /* lbxproxy files */
PROXYMANAGERDIR = ProxyManagerDir /* proxy manager config files */
XAPPLOADDIR = XAppLoadDir /* application default resource dir */
......@@ -1415,14 +1246,8 @@ XCOMM X Window System make variables; these need to be coordinated with rules
#if UseInstalledX11
RGB = $(XBINDIR)/rgb
MKHTMLINDEX = $(XBINDIR)/mkhtmlindex
XCURSORGEN = $(XBINDIR)/xcursorgen
#else
RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb
# if !CrossCompiling
XCURSORGEN = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/xcursorgen
# elif UseInstalledOnCrossCompile
XCURSORGEN = $(XBINDIR)/xcursorgen
# endif
# if HasPerl
MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,)
# else
......@@ -1540,30 +1365,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
XLIBONLY = $(XONLYLIB)
LINTXONLYLIB = $(LINTXONLY)
#if BuildScreenSaverLibrary
#ifndef SharedLibXss
#define SharedLibXss HasSharedLibraries
#endif
#ifndef NormalLibXss
#define NormalLibXss (!SharedLibXss || ForceNormalLib)
#endif
#ifndef DebugLibXss
#define DebugLibXss NO
#endif
#ifndef ProfileLibXss
#define ProfileLibXss NO
#endif
#else
#undef SharedLibXss
#define SharedLibXss NO
#undef NormalLibXss
#define NormalLibXss NO
#undef DebugLibXss
#define DebugLibXss NO
#undef ProfileLibXss
#define ProfileLibXss NO
#endif
#if BuildXF86MiscLibrary
#ifndef SharedLibXxf86misc
#define SharedLibXxf86misc HasSharedLibraries
......@@ -1660,54 +1461,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
#define ProfileLibXxf86rush NO
#endif
#if BuildXvLibrary
#ifndef SharedLibXv
#define SharedLibXv HasSharedLibraries
#endif
#ifndef NormalLibXv
#define NormalLibXv (!SharedLibXv || ForceNormalLib)
#endif
#ifndef DebugLibXv
#define DebugLibXv NO
#endif
#ifndef ProfileLibXv
#define ProfileLibXv NO
#endif
#else
#undef SharedLibXv
#define SharedLibXv NO
#undef NormalLibXv
#define NormalLibXv NO
#undef DebugLibXv
#define DebugLibXv NO
#undef ProfileLibXv
#define ProfileLibXv NO
#endif
#if BuildXvMCLibrary
#ifndef SharedLibXvMC
#define SharedLibXvMC HasSharedLibraries
#endif
#ifndef NormalLibXvMC
#define NormalLibXvMC (!SharedLibXvMC || ForceNormalLib)
#endif
#ifndef DebugLibXvMC
#define DebugLibXvMC NO
#endif
#ifndef ProfileLibXvMC
#define ProfileLibXvMC NO
#endif
#else
#undef SharedLibXvMC
#define SharedLibXvMC NO
#undef NormalLibXvMC
#define NormalLibXvMC NO
#undef DebugLibXvMC
#define DebugLibXvMC NO
#undef ProfileLibXvMC
#define ProfileLibXvMC NO
#endif
#if BuildXineramaLibrary
#ifndef SharedLibXinerama
#define SharedLibXinerama HasSharedLibraries
......@@ -1756,78 +1509,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
#define ProfileLibXRes NO
#endif
#if BuildDPSLibrary
#ifndef SharedLibDps
#define SharedLibDps HasSharedLibraries
#endif
#ifndef NormalLibDps
#define NormalLibDps (!SharedLibDps || ForceNormalLib)
#endif
#ifndef DebugLibDps
#define DebugLibDps NO
#endif
#ifndef ProfileLibDps
#define ProfileLibDps NO
#endif
#else
#undef SharedLibDps
#define SharedLibDps NO
#undef NormalLibDps
#define NormalLibDps NO
#undef DebugLibDps
#define DebugLibDps NO
#undef ProfileLibDps
#define ProfileLibDps NO
#endif
#if BuildDPSTkLibrary
#ifndef SharedLibDpsTk
#define SharedLibDpsTk HasSharedLibraries
#endif
#ifndef NormalLibDpsTk
#define NormalLibDpsTk (!SharedLibDpsTk || ForceNormalLib)
#endif
#ifndef DebugLibDpsTk
#define DebugLibDpsTk NO
#endif
#ifndef ProfileLibDpsTk
#define ProfileLibDpsTk NO
#endif
#else
#undef SharedLibDpsTk
#define SharedLibDpsTk NO
#undef NormalLibDpsTk
#define NormalLibDpsTk NO
#undef DebugLibDpsTk
#define DebugLibDpsTk NO
#undef ProfileLibDpsTk
#define ProfileLibDpsTk NO
#endif
#if BuildPSResLibrary
#ifndef SharedLibPSRes
#define SharedLibPSRes HasSharedLibraries
#endif
#ifndef NormalLibPSRes
#define NormalLibPSRes (!SharedLibPSRes || ForceNormalLib)
#endif
#ifndef DebugLibPSRes
#define DebugLibPSRes NO
#endif
#ifndef ProfileLibPSRes
#define ProfileLibPSRes NO
#endif
#else
#undef SharedLibPSRes
#define SharedLibPSRes NO
#undef NormalLibPSRes
#define NormalLibPSRes NO
#undef DebugLibPSRes
#define DebugLibPSRes NO
#undef ProfileLibPSRes
#define ProfileLibPSRes NO
#endif
#if BuildRenderLibrary
#ifndef SharedLibXrender
#define SharedLibXrender HasSharedLibraries
......@@ -1948,126 +1629,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
#define ProfileLibXcomposite NO
#endif
#if BuildXevieLibrary
#ifndef SharedLibXevie
#define SharedLibXevie HasSharedLibraries
#endif
#ifndef NormalLibXevie
#define NormalLibXevie (!SharedLibXevie || ForceNormalLib)
#endif
#ifndef DebugLibXevie
#define DebugLibXevie NO
#endif
#ifndef ProfileLibXevie
#define ProfileLibXevie NO
#endif
#else
#undef SharedLibXevie
#define SharedLibXevie NO
#undef NormalLibXevie
#define NormalLibXevie NO
#undef DebugLibXevie
#define DebugLibXevie NO
#undef ProfileLibXevie
#define ProfileLibXevie NO
#endif
#if BuildXcursorLibrary
#ifndef SharedLibXcursor
#define SharedLibXcursor HasSharedLibraries
#endif
#ifndef NormalLibXcursor
#define NormalLibXcursor (!SharedLibXcursor || ForceNormalLib)
#endif
#ifndef DebugLibXcursor
#define DebugLibXcursor NO
#endif
#ifndef ProfileLibXcursor
#define ProfileLibXcursor NO
#endif
#else
#undef SharedLibXcursor
#define SharedLibXcursor NO
#undef NormalLibXcursor
#define NormalLibXcursor NO
#undef DebugLibXcursor
#define DebugLibXcursor NO
#undef ProfileLibXcursor
#define ProfileLibXcursor NO
#endif
#if BuildAppleWMLibrary
#ifndef SharedLibAppleWM
#define SharedLibAppleWM HasSharedLibraries
#endif
#ifndef NormalLibAppleWM
#define NormalLibAppleWM (!SharedLibAppleWM || ForceNormalLib)
#endif
#ifndef DebugLibAppleWM
#define DebugLibAppleWM NO
#endif
#ifndef ProfileLibAppleWM
#define ProfileLibAppleWM NO
#endif
#else
#undef SharedLibAppleWM
#define SharedLibAppleWM NO
#undef NormalLibAppleWM
#define NormalLibAppleWM NO
#undef DebugLibAppleWM
#define DebugLibAppleWM NO
#undef ProfileLibAppleWM
#define ProfileLibAppleWM NO
#endif
#if BuildWindowsWMLibrary
#ifndef SharedLibWindowsWM
#define SharedLibWindowsWM HasSharedLibraries
#endif
#ifndef NormalLibWindowsWM
#define NormalLibWindowsWM (!SharedLibWindowsWM || ForceNormalLib)
#endif
#ifndef DebugLibWindowsWM
#define DebugLibWindowsWM NO
#endif
#ifndef ProfileLibWindowsWM
#define ProfileLibWindowsWM NO
#endif
#else
#undef SharedLibWindowsWM
#define SharedLibWindowsWM NO
#undef NormalLibWindowsWM
#define NormalLibWindowsWM NO
#undef DebugLibWindowsWM
#define DebugLibWindowsWM NO
#undef ProfileLibWindowsWM
#define ProfileLibWindowsWM NO
#endif
#if BuildGLULibrary
#ifndef SharedLibGlu
#define SharedLibGlu HasSharedLibraries
#endif
#ifndef NormalLibGlu
#define NormalLibGlu (!SharedLibX11 | ForceNormalLib)
#endif
#ifndef DebugLibGlu
#define DebugLibGlu NO
#endif
#ifndef ProfileLibGlu
#define ProfileLibGlu NO
#endif
#else
#undef SharedLibGlu
#define SharedLibGlu NO
#undef NormalLibGlu
#define NormalLibGlu NO
#undef DebugLibGlu
#define DebugLibGlu NO
#undef ProfileLibGlu
#define ProfileLibGlu NO
#endif
#if BuildGLXLibrary
#ifndef SharedLibGlx
#define SharedLibGlx HasSharedLibraries
......@@ -2113,37 +1674,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
#undef ProfileLibGlx
#define ProfileLibGlx NO
#endif
/*
* Only make a shared GLw library on systems with Weak symbols
* because it depends on Motif. See xc/lib/GLw/README.txt for details
*/
#if BuildGLwLibrary
#ifndef SharedLibGLw
#define SharedLibGLw HasSharedLibraries && HasWeakSymbols
#endif
#ifndef NormalLibGLw
#define NormalLibGLw (!SharedLibGLw || ForceNormalLib)
#endif
#ifndef DebugLibGLw
#define DebugLibGLw NO /* debugged widget library */
#endif
#ifndef ProfileLibGLw
#define ProfileLibGLw NO /* profiled widget library */
#endif
#ifndef GLwUseXmStubs
/* create stub (weak) Motif symbols */
#define GLwUseXmStubs SharedLibGLw && HasWeakSymbols
#endif
#else
#undef SharedLibGLw
#define SharedLibGLw NO
#undef NormalLibGLw
#define NormalLibGLw NO
#undef DebugLibGLw
#define DebugLibGLw NO
#undef ProfileLibGLw
#define ProfileLibGLw NO
#endif
#ifndef SharedLibXext
#define SharedLibXext HasSharedLibraries
......@@ -2171,16 +1701,6 @@ LINTEXTENSIONLIB = $(LINTEXTENSION)
XLIB = $(EXTENSIONLIB) $(XONLYLIB)
LINTXLIB = $(LINTXONLYLIB)
XSSLIBSRC = $(LIBSRC)/Xss
#if SharedLibXss
#ifndef SharedXssRev
#define SharedXssRev 1.0
#endif
SharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev)
#else
ProjectUnsharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),XBuildLibDir)
#endif
XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc
#if SharedLibXxf86misc
#ifndef SharedXxf86miscRev
......@@ -2221,28 +1741,6 @@ SharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,Sha
ProjectUnsharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir)
#endif
XVLIBSRC = $(LIBSRC)/Xv
#if SharedLibXv
#ifndef SharedXvRev
#define SharedXvRev 1.0
#endif
SharedLibReferences(XV,NX_Xv,$(XVLIBSRC),SOXVREV,SharedXvRev)
#else
ProjectUnsharedLibReferences(XV,NX_Xv,$(XVLIBSRC),XBuildLibDir)
#endif
XVMCLIBSRC = $(LIBSRC)/XvMC
#if SharedLibXvMC
#ifndef SharedXvMCRev
#define SharedXvMCRev 1.0
#endif
SharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev)
#else
ProjectUnsharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),XBuildLibDir)
#endif
XINERAMALIBSRC = $(LIBSRC)/Xinerama
#if SharedLibXinerama
#ifndef SharedXineramaRev
......@@ -2263,46 +1761,6 @@ SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev)
ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir)
#endif
DPSLIBSRC = $(LIBSRC)/dps
#if SharedLibDps
#ifndef SharedDpsRev
#define SharedDpsRev 1.0
#endif
SharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev)
#else
ProjectUnsharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),XBuildLibDir)
#endif
DPSTKLIBSRC = $(LIBSRC)/dpstk
#if SharedLibDpsTk
#ifndef SharedDpsTkRev
#define SharedDpsTkRev 1.0
#endif
SharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev)
#else
ProjectUnsharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),XBuildLibDir)
#endif
PSRESLIBSRC = $(LIBSRC)/psres
#if SharedLibPSRes
#ifndef SharedPSResRev
#define SharedPSResRev 1.0
#endif
SharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev)
#else
ProjectUnsharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),XBuildLibDir)
#endif
GLULIBSRC = $(LIBSRC)/GLU
#if SharedLibGlu
#ifndef SharedGluRev
#define SharedGluRev 1.3
#endif
SharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev)
#else
ProjectUnsharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),XBuildLibDir)
#endif
GLXLIBSRC = $(LIBSRC)/GL
#if SharedLibGlx
#ifndef SharedGlxRev
......@@ -2312,15 +1770,6 @@ SharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev)
#else
ProjectUnsharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),XBuildLibDir)
#endif
GLWIDGETSRC = $(LIBSRC)/GLw
#if SharedLibGLw
#ifndef SharedGLwRev
#define SharedGLwRev 1.0 /* used to name the shared library */
#endif
SharedDSLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev)
#else
ProjectUnsharedLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),XBuildLibDir)
#endif
XRENDERLIBSRC = $(LIBSRC)/Xrender
#if SharedLibXrender
......@@ -2372,46 +1821,6 @@ SharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV
ProjectUnsharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir)
#endif
XEVIELIBSRC = $(LIBSRC)/Xevie
#if SharedLibXevie
#ifndef SharedXevieRev
#define SharedXevieRev 1.0
#endif
SharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev)
#else
ProjectUnsharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),XBuildLibDir)
#endif
XCURSORLIBSRC = $(LIBSRC)/Xcursor
#if SharedLibXcursor
#ifndef SharedXcursorRev
#define SharedXcursorRev 1.0.2
#endif
SharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev)
#else
ProjectUnsharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),XBuildLibDir)
#endif
APPLEWMLIBSRC = $(LIBSRC)/apple
#if SharedLibAppleWM
#ifndef SharedAppleWMRev
#define SharedAppleWMRev 1.0
#endif
SharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev)
#else
ProjectUnsharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),XBuildLibDir)
#endif
WINDOWSWMLIBSRC = $(LIBSRC)/windows
#if SharedLibWindowsWM
#ifndef SharedWindowsWMRev
#define SharedWindowsWMRev 1.0
#endif
SharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev)
#else
ProjectUnsharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibXau
#define SharedLibXau YES
#endif
......@@ -2438,50 +1847,6 @@ ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR))
#endif
#endif
#ifndef SharedLibXmu
#define SharedLibXmu HasSharedLibraries
#endif
#ifndef NormalLibXmu
#define NormalLibXmu (!SharedLibXmu | ForceNormalLib)
#endif
#ifndef DebugLibXmu
#define DebugLibXmu NO /* debugged Xmu library */
#endif
#ifndef ProfileLibXmu
#define ProfileLibXmu NO /* profiled Xmu library */
#endif
XMUSRC = $(LIBSRC)/Xmu
#if SharedLibXmu
#ifndef SharedXmuRev
#define SharedXmuRev 6.2
#endif
SharedDSLibReferences(XMU,NX_Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev)
#else
ProjectUnsharedLibReferences(XMU,NX_Xmu,$(XMUSRC),XBuildLibDir)
#endif
#ifndef SharedLibXmuu
#define SharedLibXmuu HasSharedLibraries
#endif
#ifndef NormalLibXmuu
#define NormalLibXmuu (!SharedLibXmuu | ForceNormalLib)
#endif
#ifndef DebugLibXmuu
#define DebugLibXmuu NO /* debugged Xmuu library */
#endif
#ifndef ProfileLibXmuu
#define ProfileLibXmuu NO /* profiled Xmuu library */
#endif
XMUUSRC = $(LIBSRC)/Xmuu
#if SharedLibXmuu
#ifndef SharedXmuuRev
#define SharedXmuuRev 1.0
#endif
SharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev)
#else
ProjectUnsharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),XBuildLibDir)
#endif
#ifndef SharedOldX
#define SharedOldX HasSharedLibraries
#endif
......@@ -2504,197 +1869,6 @@ SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev)
ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibXp
#define SharedLibXp HasSharedLibraries
#endif
#ifndef NormalLibXp
#define NormalLibXp (!SharedLibXp | ForceNormalLib)
#endif
#ifndef DebugLibXp
#define DebugLibXp NO /* debugged Xp library */
#endif
#ifndef ProfileLibXp
#define ProfileLibXp NO /* profiled Xp library */
#endif
XPLIBSRC = $(LIBSRC)/Xp
#if SharedLibXp
#ifndef SharedXpRev
#define SharedXpRev 6.2
#endif
SharedLibReferences(XP,NX_Xp,$(XPLIBSRC),SOXPREV,SharedXpRev)
#else
ProjectUnsharedLibReferences(XP,NX_Xp,$(XPLIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibXt
#define SharedLibXt HasSharedLibraries
#endif
#ifndef NormalLibXt
#define NormalLibXt (!SharedLibXt | ForceNormalLib)
#endif
#ifndef DebugLibXt
#define DebugLibXt NO /* debugged toolkit library */
#endif
#ifndef ProfileLibXt
#define ProfileLibXt NO /* profiled toolkit library */
#endif
TOOLKITSRC = $(LIBSRC)/Xt
#if SharedLibXt
#ifndef SharedXtRev
#define SharedXtRev 6.0
#endif
SharedDSLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev)
#else
ProjectUnsharedLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),XBuildLibDir)
#endif
DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB)
XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB)
LINTXTOOLLIB = $(LINTXTOOLONLYLIB)
#ifndef SharedLibXa
#define SharedLibXa (HasSharedLibraries & HasCplusplus)
#endif
#ifndef NormalLibXa
/* #define NormalLibXa ((!SharedLibXa | ForceNormalLib) & HasCplusplus) */
#define NormalLibXa YES /* needed for current tests, will correct later */
#endif
#ifndef DebugLibXa
#define DebugLibXa NO /* debugged audio library */
#endif
#ifndef ProfileLibXa
#define ProfileLibXa NO /* profiled audio library */
#endif
XALIBSRC = $(LIBSRC)/Xa
#if SharedLibXa
#ifndef SharedXaRev
#define SharedXaRev 1.0
#endif
SharedLibReferences(XA,NX_Xa,$(XALIBSRC),SOXAREV,SharedXaRev)
#else
UnsharedLibReferences(XA,NX_Xa,$(XALIBSRC))
#endif
#ifndef BuildXaw
#define BuildXaw !BuildServersOnly
#endif
/* AWIDGETSRC is needed by libXaw6 and libXaw7 */
AWIDGETSRC = $(LIBSRC)/Xaw
#if BuildXaw
#ifndef SharedLibXaw
#define SharedLibXaw HasSharedLibraries
#endif
#ifndef NormalLibXaw
#define NormalLibXaw (!SharedLibXaw | ForceNormalLib)
#endif
#ifndef DebugLibXaw
#define DebugLibXaw NO /* debugged widget library */
#endif
#ifndef ProfileLibXaw
#define ProfileLibXaw NO /* profiled widget library */
#endif
#if SharedLibXaw
#ifndef SharedXawRev
#define SharedXawRev 8.0
#endif
SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev)
#else
ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),XBuildLibDir)
#endif
#endif
#ifndef BuildXaw7
#define BuildXaw7 (HasSharedLibraries && !BuildServersOnly)
#endif
#if BuildXaw7
#ifndef SharedLibXaw7
#define SharedLibXaw7 HasSharedLibraries
#endif
#ifndef NormalLibXaw7
#define NormalLibXaw7 NO
#endif
#ifndef DebugLibXaw7
#define DebugLibXaw7 NO /* debugged widget library */
#endif
#ifndef ProfileLibXaw7
#define ProfileLibXaw7 NO /* profiled widget library */
#endif
AWIDGET7SRC = $(LIBSRC)/Xaw7
#if SharedLibXaw7
#ifndef SharedXaw7Rev
#define SharedXaw7Rev 7.0
#endif
SharedDSLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev)
#if !BuildXaw
SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev)
#endif
#else
ProjectUnsharedLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir)
#if !BuildXaw
ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir)
#endif
#endif
#endif
#ifndef BuildXaw6
#define BuildXaw6 (HasSharedLibraries && !BuildServersOnly)
#endif
#if BuildXaw6
#ifndef SharedLibXaw6
#define SharedLibXaw6 HasSharedLibraries
#endif
#ifndef NormalLibXaw6
#define NormalLibXaw6 NO
#endif
#ifndef DebugLibXaw6
#define DebugLibXaw6 NO /* debugged widget library */
#endif
#ifndef ProfileLibXaw6
#define ProfileLibXaw6 NO /* profiled widget library */
#endif
AWIDGET6SRC = $(LIBSRC)/Xaw6
#if SharedLibXaw6
#ifndef SharedXaw6Rev
#define SharedXaw6Rev 6.1
#endif
SharedDSLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev)
#if !BuildXaw && !BuildXaw7
SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev)
#endif
#else
ProjectUnsharedLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir)
#if !BuildXaw && !BuildXaw7
ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir)
#endif
#endif
#endif
#ifndef SharedLibXi
#define SharedLibXi HasSharedLibraries
#endif
#ifndef NormalLibXi
#define NormalLibXi (!SharedLibXi | ForceNormalLib)
#endif
#ifndef DebugLibXi
#define DebugLibXi NO /* debugged Xi library */
#endif
#ifndef ProfileLibXi
#define ProfileLibXi NO /* profiled Xi library */
#endif
XILIBSRC = $(LIBSRC)/Xi
#if SharedLibXi
#ifndef SharedXiRev
#define SharedXiRev 6.0
#endif
SharedLibReferences(XI,NX_Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev)
#else
ProjectUnsharedLibReferences(XI,NX_Xi,$(XILIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibXtst
#define SharedLibXtst HasSharedLibraries
#endif
......@@ -2717,118 +1891,6 @@ SharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev)
ProjectUnsharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),XBuildLibDir)
#endif
ProjectUnsharedLibReferences(XBSD,NX_Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir)
#ifndef SharedLibICE
#define SharedLibICE HasSharedLibraries
#endif
#ifndef NormalLibICE
#define NormalLibICE (!SharedLibICE | ForceNormalLib)
#endif
#ifndef DebugLibICE
#define DebugLibICE NO /* debugged ICE library */
#endif
#ifndef ProfileLibICE
#define ProfileLibICE NO /* profiled ICE library */
#endif
ICESRC = $(LIBSRC)/ICE
#if SharedLibICE
#ifndef SharedICERev
#define SharedICERev 6.4
#endif
SharedLibReferences(ICE,NX_ICE,$(ICESRC),SOICEREV,SharedICERev)
#else
ProjectUnsharedLibReferences(ICE,NX_ICE,$(ICESRC),XBuildLibDir)
#endif
#ifndef SharedLibSM
#define SharedLibSM HasSharedLibraries
#endif
#ifndef NormalLibSM
#define NormalLibSM (!SharedLibSM | ForceNormalLib)
#endif
#ifndef DebugLibSM
#define DebugLibSM NO /* debugged SM library */
#endif
#ifndef ProfileLibSM
#define ProfileLibSM NO /* profiled SM library */
#endif
SMSRC = $(LIBSRC)/SM
#if SharedLibSM
#ifndef SharedSMRev
#define SharedSMRev 6.0
#endif
SharedLibReferences(SM,NX_SM,$(SMSRC),SOSMREV,SharedSMRev)
#else
ProjectUnsharedLibReferences(SM,NX_SM,$(SMSRC),XBuildLibDir)
#endif
#ifndef SharedLibXkey
#define SharedLibXkey HasSharedLibraries
#endif
#ifndef NormalLibXkey
#define NormalLibXkey (!SharedLibXkey | ForceNormalLib)
#endif
#ifndef DebugLibXkey
#define DebugLibXkey NO /* debugged Xkey library */
#endif
#ifndef ProfileLibXkey
#define ProfileLibXkey NO /* profiled Xkey library */
#endif
XKEYSRC = $(LIBSRC)/Xkey
#if SharedLibXkey
#ifndef SharedXkeyRev
#define SharedXkeyRev 6.0
#endif
SharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev)
#else
ProjectUnsharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),XBuildLibDir)
#endif
#ifndef SharedLibFS
#define SharedLibFS HasSharedLibraries
#endif
#ifndef NormalLibFS
#define NormalLibFS (!SharedLibFS | ForceNormalLib)
#endif
#ifndef DebugLibFS
#define DebugLibFS NO /* debugged FS library */
#endif
#ifndef ProfileLibFS
#define ProfileLibFS NO /* profiled FS library */
#endif
FSLIBSRC = $(LIBSRC)/FS
#if SharedLibFS
#ifndef SharedFSRev
#define SharedFSRev 6.0
#endif
SharedLibReferences(FS,NX_FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
#else
ProjectUnsharedLibReferences(FS,NX_FS,$(FSLIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibXpm
#define SharedLibXpm HasSharedLibraries
#endif
#ifndef NormalLibXpm
#define NormalLibXpm (!SharedLibXpm | ForceNormalLib)
#endif
#ifndef DebugLibXpm
#define DebugLibXpm NO
#endif
#ifndef ProfileLibXpm
#define ProfileLibXpm NO
#endif
XPMLIBSRC = $(LIBSRC)/Xpm
#if SharedLibXpm
#ifndef SharedXpmRev
#define SharedXpmRev 4.11
#endif
SharedLibReferences(XPM,Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev)
#else
ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir)
#endif
#if HasMotif
#ifndef MotifDir
......@@ -2876,185 +1938,6 @@ MOTIFINCLUDES = -I$(MOTIFINCDIR)
#endif /* HasMotif */
#ifndef SharedLibExpat
#define SharedLibExpat HasSharedLibraries
#endif
#ifndef NormalLibExpat
#define NormalLibExpat (!SharedLibExpat | ForceNormalLib)
#endif
#ifndef DebugLibExpat
#define DebugLibExpat NO
#endif
#ifndef ProfileLibExpat
#define ProfileLibExpat NO
#endif
EXPATLIBSRC = $(LIBSRC)/expat
/*
* Expat 1.95.6.
*
* Get the library version information from LIBCURRENT, LIBREVISION and LIBAGE
* in xc/extras/expat/configure.
*
* LIBCURRENT:LIBREVISION:LIBAGE = 4:0:4
*
* The LibtoolMinorVersions revision is "(LIBCURRENT - LIBAGE).LIBAGE".
* The !LibtoolMinorVersions revision is "LIBCURRENT.0".
*/
#ifndef ExpatVersion
#define ExpatVersion 1.95.6
#endif
#if SharedLibExpat
#ifndef SharedLibtoolExpatRev
#define SharedLibtoolExpatRev 4:0:4
#endif
#ifndef SharedExpatRev
#if LibtoolMinorVersions
#define SharedExpatRev 0.4
#else
#define SharedExpatRev 4.0
#endif
#endif
SharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev)
#else
ProjectUnsharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),XBuildLibDir)
#endif
#if UseExpat
#if BuildExpatLibrary
EXPATINCLUDES=$(TOP_X_INCLUDES)
EXPATDEFINES=-DEXPAT
#else /* BuildExpatLibrary */
#if HasExpat
#ifndef ExpatDir
#define ExpatDir /usr
#define ExpatDirStandard YES
#endif
#ifndef ExpatDirStandard
#define ExpatDirStandard NO
#endif
#ifndef ExpatLibDir
#define ExpatLibDir ExpatDir/LibDirName
# if ExpatDirStandard
# define ExpatLibDirStandard YES
# endif
#endif
#ifndef ExpatLibDirStandard
#define ExpatLibDirStandard NO
#endif
#ifndef ExpatIncDir
#define ExpatIncDir ExpatDir/include
# if ExpatDirStandard
# define ExpatIncDirStandard YES
# endif
#endif
#ifndef ExpatIncDirStandard
#define ExpatIncDirStandard NO
#endif
EXPATDIR = ExpatDir
EXPATLIBDIR = ExpatLibDir
EXPATINCDIR = ExpatIncDir
#if ExpatIncDirStandard
EXPATINCLUDES =
#else
EXPATINCLUDES = -I$(EXPATINCDIR)
#endif
#if ExpatLibDirStandard
EXPATLIB = -lexpat
#else
EXPATLIB = -L$(EXPATLIBDIR) LinkerRuntimeLibraryPathFlag($(EXPATLIBDIR)) -lexpat
#endif
EXPATDEFINES = -DEXPAT
#endif /* HasExpat */
#endif /* else BuildExpatLibrary */
#define ExpatClientLibs $(EXPATLIB)
#define ExpatClientDepLibs $(DEPEXPATLIB)
#endif /* UseExpat */
#ifdef HasLibpng
/*
* Libpng controls:
*
* LibpngDir prefix for all libpng files
* LibpngDirStandard Boolean - whether png headers/libs are
* in default compile/link paths
* LibpngLibDir Directory holding png library
* LibpngLibDirStandard Boolean - whether png libs are
* in default link path
* LibpngIncDir Directory holding png includes
* LibpngIncDirStandard Boolean - whether png includes are
* in default compile path
*
* Make sure that *Standard is set correctly, if not, the
* standard compile/link paths will be added *before* the
* local X directorys and installed versions of the standard
* X headers will end up getting used.
*/
#ifndef LibpngDir
#define LibpngDir /usr
#define LibpngDirStandard YES
#endif
#ifndef LibpngDirStandard
#define LibpngDirStandard NO
#endif
#ifndef LibpngLibDir
#define LibpngLibDir LibpngDir/LibDirName
#if LibpngDirStandard
#define LibpngLibDirStandard YES
#endif
#endif
#ifndef LibpngLibDirStandard
#define LibpngLibDirStandard NO
#endif
#ifndef LibpngIncDir
#define LibpngIncDir LibpngDir/include
#if LibpngDirStandard
#define LibpngIncDirStandard YES
#endif
#endif
#ifndef LibpngIncDirStandard
#define LibpngIncDirStandard NO
#endif
LIBPNGINCDIR = LibpngIncDir
#if LibpngIncDirStandard
LIBPNGINC=
#else
LIBPNGINC = -I$(LIBPNGINCDIR)
#endif
LIBPNGDIR = LibpngDir
LIBPNGLIBDIR = LibpngLibDir
LIBPNGINCDIR = LibpngIncDir
#if LibpngLibDirStandard
LIBPNGLIB = -lpng
#else
LIBPNGLIB = -L$(LIBPNGLIBDIR) LinkerRuntimeLibraryPathFlag($(LIBPNGLIBDIR)) -lpng
#endif
#endif
#ifndef XmuuClientDepLibs
#define XmuuClientDepLibs $(DEPXMUULIB) $(DEPXLIB)
#endif
#ifndef XmuuClientLibs
#define XmuuClientLibs $(XMUULIB) $(XLIB)
#endif
#ifndef LdLibraryPath
#define LdLibraryPath LD_LIBRARY_PATH
#endif
......@@ -3112,16 +1995,6 @@ ProjectUnsharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILELIBSRC),XBuildLibDir)
# endif
# endif
# if defined(UseInstalled) || (CrossCompiling && UseInstalledOnCrossCompile)
XKBCOMPCMD = $(XBINDIR)/XkbComp
# else
XKBCOMPSRC = $(PROGRAMSRC)/XkbComp
# if CrossCompiling
XKBCOMPCMD = $(PROGRAMSRC)/XkbComp/cross/XkbComp
# else
XKBCOMPCMD = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/XkbComp
# endif
# endif
#else /* !BuildXKBlib */
# ifndef XkbClientDepLibs
# define XkbClientDepLibs
......@@ -3175,74 +2048,6 @@ ProjectUnsharedLibReferences(XKBUI,NX_xkbui,$(XKBUILIBSRC),XBuildLibDir)
# define XkbuiDepLibs $(DEPXKBFILELIB)
#endif
#ifndef SharedxrxRev
# define SharedxrxRev 6.8
#endif
#ifndef SharedxrxnestRev
# define SharedxrxnestRev 6.8
#endif
#ifndef ExtraXawReqs
# if BuildXaw
# define ExtraXawReqs $(XPLIB)
# else
# define ExtraXawReqs /**/
# endif
#endif
EXTRAXAWREQS = ExtraXawReqs
#ifndef ExtraXawClientDepLibs
# if BuildXaw
# define ExtraXawClientDepLibs $(DEPXPLIB)
# else
# define ExtraXawClientDepLibs /**/
# endif
#endif
EXTRAXAWCLIENTDEPLIBS = ExtraXawClientDepLibs
#ifndef XawClientDepLibs
#define XawClientDepLibs $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXPMLIB) $(EXTRAXAWCLIENTDEPLIBS) $(DEPXLIB)
#endif
#ifndef ExtraXawClientLibs
# if BuildXaw
# define ExtraXawClientLibs $(XPLIB)
# else
# define ExtraXawClientLibs /**/
# endif
#endif
EXTRAXAWCLIENTLIBS = ExtraXawClientLibs
#ifndef XawClientLibs
#define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
#endif
#ifndef SharedLibXTrap
#define SharedLibXTrap HasSharedLibraries
#endif
#ifndef NormalLibXTrap
#define NormalLibXTrap (!SharedLibXTrap | ForceNormalLib)
#endif
#ifndef DebugLibXTrap
#define DebugLibXTrap NO /* debugged XTrap library */
#endif
#ifndef ProfileLibXTrap
#define ProfileLibXTrap NO /* profiled XTrap library */
#endif
XTRAPLIBSRC = $(LIBSRC)/XTrap
#if SharedLibXTrap
#ifndef SharedXTrapRev
#define SharedXTrapRev 6.4
#endif
SharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev)
#else
ProjectUnsharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),XBuildLibDir)
#endif
#ifndef NeedDefaultDepLibs
#define NeedDefaultDepLibs YES
#endif
......@@ -3252,7 +2057,7 @@ ProjectUnsharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),XBuildLibDir)
* Individual libraries should override this
*/
#if HasSharedLibraries || defined(UseInstalled)
DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
DEPLIBS = $(DEPXLIB)
#else
DEPLIBS = $(LOCAL_LIBRARIES)
#endif
......@@ -3277,55 +2082,6 @@ ProjectUnsharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),XBuildLibDir)
#endif /* InstallAppDefaults */
/*
* InstallAppDefaultsLong - general rule to install application default file
* if the InstallAppDefFiles configuration parameter is set.
*/
#ifndef InstallAppDefaultsLong
#if UseConfDirForAppDefaults
#if InstallAppDefFiles
#define InstallAppDefaultsLong(file,class) @@\
LinkConfDirectory(app-defaults,.,app-defaults,.) @@\
InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
#else
#define InstallAppDefaultsLong(file,class) @@\
LinkConfDirectory(app-defaults,.,app-defaults,.) @@\
InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
#endif /* InstallAppDefFiles */
#else /* UseConfDirForAppDefaults */
#if 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 /* UseConfDirForAppDefaults */
#endif /* InstallAppDefaultsLong */
/*
* MakeXkbDir
*/
#ifndef MakeXkbDir
# if !CrossCompiling || UseInstalledOnCrossCompile
# define MakeXkbDir(basedir,subdir) @@\
all:: Concat(subdir,.dir) @@\
@@\
Concat(subdir,.dir): @@\
RemoveFile(Concat(subdir,.dir)) @@\
$(XKBCOMPCMD) -lfhlpR -o Concat(subdir,.dir) '*' @@\
@@\
InstallTarget(install,Concat(subdir,.dir),$(INSTDATFLAGS),basedir) @@\
@@\
clean:: @@\
RemoveFile(Concat(subdir,.dir))
# else
# define MakeXkbDir(basedir,subdir) @@\
clean:: @@\
RemoveFile(Concat(subdir,.dir))
# endif
#endif
/*
* PostProcessTroffPS - by default moves the working output into place,
* but can be a hook for more complicated post-processing.
*/
......
nx-X11/config/cf/host.def
View file @ 7b7ba944
......@@ -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
nx-X11/config/cf/linux.cf
View file @ 7b7ba944
......@@ -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
......
nx-X11/config/cf/lnxLib.rules
View file @ 7b7ba944
......@@ -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 */
/*
......
nx-X11/config/cf/lnxLib.tmpl
View file @ 7b7ba944
......@@ -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
nx-X11/config/cf/site.def
View file @ 7b7ba944
......@@ -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 */
nx-X11/config/cf/xf86site.def
View file @ 7b7ba944
......@@ -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
......
nx-X11/config/cf/xfree86.cf
View file @ 7b7ba944
......@@ -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
......
nx-X11/config/cf/xorg.cf
View file @ 7b7ba944
......@@ -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
......
nx-X11/config/cf/xorgsite.def
View file @ 7b7ba944
......@@ -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
*/
nx-X11/include/Imakefile
View file @ 7b7ba944
......@@ -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::
......
nx-X11/include/extensions/Imakefile
View file @ 7b7ba944
......@@ -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) \
$(XEVIEHEADERS) \
$(XTRAPHEADERS) $(XRESHEADERS)
EXTRAHEADERS = \
$(SCREENSAVERHEADERS) \
$(XF86MISCHEADERS) \
$(XF86BIGFONTHEADERS) \
$(XF86VIDMODEHEADERS) \
$(XF86DGAHEADERS) \
$(XINERAMAHEADERS) \
$(LBXHEADERS) \
$(XVHEADERS) \
$(XVMCHEADERS) \
$(XF86RUSHHEADERS) \
$(FONTCACHEHEADERS) \
$(RENDERHEADERS) \
$(RANDRHEADERS) \
$(XFIXESHEADERS) \
$(DAMAGEHEADERS) \
$(COMPOSITEHEADERS) \
$(XEVIEHEADERS) \
$(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::
......
nx-X11/lib/GL/GL/Imakefile
View file @ 7b7ba944
......@@ -242,5 +242,3 @@ InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
ProfiledLibraryTarget($(LIBNAME),$(POBJS))
InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
#endif
nx-X11/lib/GL/Imakefile
View file @ 7b7ba944
......@@ -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))
......
nx-X11/lib/GL/mesa/Imakefile
View file @ 7b7ba944
......@@ -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))
......
nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile
View file @ 7b7ba944
......@@ -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)
......
nx-X11/lib/Imakefile
View file @ 7b7ba944
......@@ -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))
......
nx-X11/programs/Xserver/Imakefile
View file @ 7b7ba944
......@@ -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
......
nx-X11/programs/Xserver/os/Imakefile
View file @ 7b7ba944
......@@ -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
......
nx-X11/programs/Xserver/os/lbxio.c deleted 100644 → 0
View file @ cbf4e4db
/* $XFree86: xc/programs/Xserver/os/lbxio.c,v 3.17 2002/05/31 18:46:06 dawes Exp $ */
/*
Copyright 1996, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/***********************************************************
Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
All Rights Reserved
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Digital or MIT not be
used in advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $Xorg: lbxio.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include <stdio.h>
#include <X11/Xtrans/Xtrans.h>
#include <X11/Xmd.h>
#include <errno.h>
#ifndef Lynx
#include <sys/param.h>
#ifndef __UNIXOS2__
#include <sys/uio.h>
#endif
#else
#include <uio.h>
#endif
#include <X11/X.h>
#include <X11/Xproto.h>
#include "os.h"
#include <X11/Xpoll.h>
#include "osdep.h"
#include "opaque.h"
#include "dixstruct.h"
#include "misc.h"
#include "colormapst.h"
#include "propertyst.h"
#include "lbxserve.h"
/* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
* systems are broken and return EWOULDBLOCK when they should return EAGAIN
*/
#if defined(EAGAIN) && defined(EWOULDBLOCK)
#define ETEST(err) (err == EAGAIN || err == EWOULDBLOCK)
#else
#ifdef EAGAIN
#define ETEST(err) (err == EAGAIN)
#else
#define ETEST(err) (err == EWOULDBLOCK)
#endif
#endif
#define get_req_len(req,cli) ((cli)->swapped ? \
lswaps((req)->length) : (req)->length)
#define YieldControl() \
{ isItTimeToYield = TRUE; \
timesThisConnection = 0; }
#define YieldControlNoInput() \
{ YieldControl(); \
FD_CLR(fd, &ClientsWithInput); }
void
SwitchClientInput (ClientPtr client, Bool pending)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
#ifndef WIN32
ConnectionTranslation[oc->fd] = client->index;
#else
SetConnectionTranslation(oc->fd, client->index);
#endif
if (pending)
FD_SET(oc->fd, &ClientsWithInput);
else
YieldControl();
}
void
LbxPrimeInput(ClientPtr client, LbxProxyPtr proxy)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
ConnectionInputPtr oci = oc->input;
if (oci && proxy->compHandle) {
char *extra = oci->bufptr + oci->lenLastReq;
int left = oci->bufcnt + oci->buffer - extra;
(*proxy->streamOpts.streamCompStuffInput)(oc->fd,
(unsigned char *)extra,
left);
oci->bufcnt -= left;
AvailableInput = oc;
}
}
void
AvailableClientInput (ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
if (FD_ISSET(oc->fd, &AllSockets))
FD_SET(oc->fd, &ClientsWithInput);
}
/*****************************************************************
* AppendFakeRequest
* Append a (possibly partial) request in as the last request.
*
**********************/
Bool
AppendFakeRequest (ClientPtr client, char *data, int count)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
ConnectionInputPtr oci = oc->input;
int fd = oc->fd;
int gotnow;
if (!oci)
{
if ((oci = FreeInputs))
FreeInputs = oci->next;
else if (!(oci = AllocateInputBuffer()))
return FALSE;
oc->input = oci;
} else if (AvailableInput == oc)
AvailableInput = (OsCommPtr)NULL;
/* do not free AvailableInput here, it could be proxy's */
oci->bufptr += oci->lenLastReq;
oci->lenLastReq = 0;
gotnow = oci->bufcnt + oci->buffer - oci->bufptr;
if ((gotnow + count) > oci->size)
{
char *ibuf;
ibuf = (char *)xrealloc(oci->buffer, gotnow + count);
if (!ibuf)
return(FALSE);
oci->size = gotnow + count;
oci->buffer = ibuf;
oci->bufptr = ibuf + oci->bufcnt - gotnow;
}
if (oci->bufcnt + count > oci->size) {
memmove(oci->buffer, oci->bufptr, gotnow);
oci->bufcnt = gotnow;
oci->bufptr = oci->buffer;
}
memmove(oci->bufptr + gotnow, data, count);
oci->bufcnt += count;
gotnow += count;
if ((gotnow >= sizeof(xReq)) &&
(gotnow >= (int)(get_req_len((xReq *)oci->bufptr, client) << 2)))
FD_SET(fd, &ClientsWithInput);
else
YieldControlNoInput();
return(TRUE);
}
static int
LbxWrite(XtransConnInfo trans_conn, LbxProxyPtr proxy,
char *buf, int len)
{
struct iovec iov;
int n;
int notWritten;
notWritten = len;
iov.iov_base = buf;
iov.iov_len = len;
while (notWritten) {
errno = 0;
if (proxy->compHandle)
n = (*proxy->streamOpts.streamCompWriteV)(proxy->fd, &iov, 1);
else
n = _XSERVTransWritev(trans_conn, &iov, 1);
if (n >= 0) {
iov.iov_base = (char *)iov.iov_base + n;
notWritten -= n;
iov.iov_len = notWritten;
}
else if (ETEST(errno)
#ifdef SUNSYSV /* check for another brain-damaged OS bug */
|| (errno == 0)
#endif
#ifdef EMSGSIZE /* check for another brain-damaged OS bug */
|| ((errno == EMSGSIZE) && (iov.iov_len == 1))
#endif
)
break;
#ifdef EMSGSIZE /* check for another brain-damaged OS bug */
else if (errno == EMSGSIZE)
iov.iov_len >>= 1;
#endif
else
return -1;
}
return len - notWritten;
}
static Bool
LbxAppendOutput(LbxProxyPtr proxy, ClientPtr client, ConnectionOutputPtr oco)
{
ConnectionOutputPtr noco = proxy->olast;
LbxClientPtr lbxClient = LbxClient(client);
if (!lbxClient) {
xfree(oco->buf);
xfree(oco);
return TRUE;
}
if (noco)
LbxReencodeOutput(client,
(char *)noco->buf, &noco->count,
(char *)oco->buf, &oco->count);
else
LbxReencodeOutput(client,
(char *)NULL, (int *)NULL,
(char *)oco->buf, &oco->count);
if (!oco->count) {
if (oco->size > BUFWATERMARK)
{
xfree(oco->buf);
xfree(oco);
}
else
{
oco->next = FreeOutputs;
FreeOutputs = oco;
}
return TRUE;
}
if ((lbxClient->id != proxy->cur_send_id) && proxy->lbxClients[0]) {
xLbxSwitchEvent *ev;
int n;
if (!noco || (noco->size - noco->count) < sz_xLbxSwitchEvent) {
if ((noco = FreeOutputs))
FreeOutputs = noco->next;
else
noco = AllocateOutputBuffer();
if (!noco) {
MarkClientException(client);
return FALSE;
}
noco->next = NULL;
if (proxy->olast)
proxy->olast->next = noco;
else
proxy->ofirst = noco;
proxy->olast = noco;
}
ev = (xLbxSwitchEvent *) (noco->buf + noco->count);
noco->count += sz_xLbxSwitchEvent;
proxy->cur_send_id = lbxClient->id;
ev->type = LbxEventCode;
ev->lbxType = LbxSwitchEvent;
ev->pad = 0;
ev->client = proxy->cur_send_id;
if (LbxProxyClient(proxy)->swapped) {
swapl(&ev->client, n);
}
}
oco->next = NULL;
if (proxy->olast)
proxy->olast->next = oco;
else
proxy->ofirst = oco;
proxy->olast = oco;
return TRUE;
}
static int
LbxClientOutput(ClientPtr client, OsCommPtr oc,
char *extraBuf, int extraCount, Bool nocompress)
{
ConnectionOutputPtr oco;
int len;
if ((oco = oc->output)) {
oc->output = NULL;
if (!LbxAppendOutput(oc->proxy, client, oco))
return -1;
}
if (extraCount) {
NewOutputPending = TRUE;
FD_SET(oc->fd, &OutputPending);
len = (extraCount + 3) & ~3;
if ((oco = FreeOutputs) && (oco->size >= len))
FreeOutputs = oco->next;
else {
oco = (ConnectionOutputPtr)xalloc(sizeof(ConnectionOutput));
if (!oco) {
MarkClientException(client);
return -1;
}
oco->size = len;
if (oco->size < BUFSIZE)
oco->size = BUFSIZE;
oco->buf = (unsigned char *) xalloc(oco->size);
if (!oco->buf) {
xfree(oco);
MarkClientException(client);
return -1;
}
}
oco->count = len;
oco->nocompress = nocompress;
memmove((char *)oco->buf, extraBuf, extraCount);
if (!nocompress && oco->count < oco->size)
oc->output = oco;
else if (!LbxAppendOutput(oc->proxy, client, oco))
return -1;
}
return extraCount;
}
void
LbxForceOutput(LbxProxyPtr proxy)
{
int i;
LbxClientPtr lbxClient;
OsCommPtr coc;
ConnectionOutputPtr oco;
for (i = proxy->maxIndex; i >= 0; i--) { /* proxy must be last */
lbxClient = proxy->lbxClients[i];
if (!lbxClient)
continue;
coc = (OsCommPtr)lbxClient->client->osPrivate;
if ((oco = coc->output)) {
coc->output = NULL;
LbxAppendOutput(proxy, lbxClient->client, oco);
}
}
}
int
LbxFlushClient(ClientPtr who, OsCommPtr oc,
char *extraBuf, int extraCount)
{
LbxProxyPtr proxy;
ConnectionOutputPtr oco;
int n;
XtransConnInfo trans_conn = NULL;
if (extraBuf)
return LbxClientOutput(who, oc, extraBuf, extraCount, FALSE);
proxy = oc->proxy;
if (!proxy->lbxClients[0])
return 0;
LbxForceOutput(proxy);
if (!proxy->compHandle)
trans_conn = ((OsCommPtr)LbxProxyClient(proxy)->osPrivate)->trans_conn;
while ((oco = proxy->ofirst)) {
/* XXX bundle up into writev someday */
if (proxy->compHandle) {
if (oco->nocompress)
(*proxy->streamOpts.streamCompOff)(proxy->fd);
n = LbxWrite(NULL, proxy, (char *)oco->buf, oco->count);
if (oco->nocompress)
(*proxy->streamOpts.streamCompOn)(proxy->fd);
} else
n = LbxWrite(trans_conn, proxy, (char *)oco->buf, oco->count);
if (n < 0) {
ClientPtr pclient = LbxProxyClient(proxy);
if (proxy->compHandle)
trans_conn = ((OsCommPtr)pclient->osPrivate)->trans_conn;
_XSERVTransDisconnect(trans_conn);
_XSERVTransClose(trans_conn);
((OsCommPtr)pclient->osPrivate)->trans_conn = NULL;
MarkClientException(pclient);
return 0;
} else if (n == oco->count) {
proxy->ofirst = oco->next;
if (!proxy->ofirst)
proxy->olast = NULL;
if (oco->size > BUFWATERMARK)
{
xfree(oco->buf);
xfree(oco);
}
else
{
oco->next = FreeOutputs;
oco->count = 0;
FreeOutputs = oco;
}
} else {
if (n) {
oco->count -= n;
memmove((char *)oco->buf, (char *)oco->buf + n, oco->count);
}
break;
}
}
if ((proxy->compHandle &&
(*proxy->streamOpts.streamCompFlush)(proxy->fd)) ||
proxy->ofirst) {
FD_SET(proxy->fd, &ClientsWriteBlocked);
AnyClientsWriteBlocked = TRUE;
}
return 0;
}
int
UncompressedWriteToClient (ClientPtr who, int count, char *buf)
{
return LbxClientOutput(who, (OsCommPtr)who->osPrivate, buf, count, TRUE);
}
void
LbxFreeOsBuffers(LbxProxyPtr proxy)
{
ConnectionOutputPtr oco;
while ((oco = proxy->ofirst)) {
proxy->ofirst = oco->next;
xfree(oco->buf);
xfree(oco);
}
}
Bool
AllocateLargeReqBuffer(ClientPtr client, int size)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
ConnectionInputPtr oci;
if (!(oci = oc->largereq)) {
if ((oci = FreeInputs))
FreeInputs = oci->next;
else {
oci = (ConnectionInputPtr)xalloc(sizeof(ConnectionInput));
if (!oci)
return FALSE;
oci->buffer = NULL;
oci->size = 0;
}
}
if (oci->size < size) {
char *ibuf;
oci->size = size;
if (size < BUFSIZE)
oci->size = BUFSIZE;
if (!(ibuf = (char *)xrealloc(oci->buffer, oci->size)))
{
xfree(oci->buffer);
xfree(oci);
oc->largereq = NULL;
return FALSE;
}
oci->buffer = ibuf;
}
oci->bufptr = oci->buffer;
oci->bufcnt = 0;
oci->lenLastReq = size;
oc->largereq = oci;
return TRUE;
}
Bool
AddToLargeReqBuffer(ClientPtr client, char *data, int size)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
ConnectionInputPtr oci = oc->largereq;
if (!oci || (oci->bufcnt + size > oci->lenLastReq))
return FALSE;
memcpy(oci->buffer + oci->bufcnt, data, size);
oci->bufcnt += size;
return TRUE;
}
static OsCommRec lbxAvailableInput;
int
PrepareLargeReqBuffer(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
ConnectionInputPtr oci = oc->largereq;
if (!oci)
return client->req_len << 2;
oc->largereq = NULL;
if (oci->bufcnt != oci->lenLastReq) {
xfree(oci->buffer);
xfree(oci);
return client->req_len << 2;
}
client->requestBuffer = oci->buffer;
client->req_len = oci->lenLastReq >> 2;
oci->bufcnt = 0;
oci->lenLastReq = 0;
if (AvailableInput)
{
ConnectionInputPtr aci = AvailableInput->input;
if (aci->size > BUFWATERMARK)
{
xfree(aci->buffer);
xfree(aci);
}
else
{
aci->next = FreeInputs;
FreeInputs = aci;
}
AvailableInput->input = (ConnectionInputPtr)NULL;
}
lbxAvailableInput.input = oci;
AvailableInput = &lbxAvailableInput;
return client->req_len << 2;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment