Skip to content

N
nx-libs
Commit c4a8556c authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Mike Gabriel
Browse files
Options

Unique Library Names Patch (600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch).

We really want to make use of rpm's automatic dependency finding. Binaries are scanned for DT_NEEDED entries, the latter of which are then used for populating the "Requires"-type deps. The "nxagent" binary for example would require libX11.so.6. That incurs problems: 1. A package manager told to install nxagent could select xorg-x11 rather than nx-libs, even though nxagent depends on the NX version. 2. A package manager told to install $some_program could select nx-libs rather than xorg-x11 (since both provide libX11.so.6), but, since the NX library is in an obscure directory, running $some_program would fail as libX11.so.6 is not found. To solve this, give the NX libraries unique names different from the Xorg ones.
parent d4d3fe0e
Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 1356 deletions
debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch deleted 100644 → 0
View file @ d4d3fe0e
Description: Unique Library Names Patch
Patch from the RPM folks...
.
We really want to make use of rpm's automatic dependency finding.
Binaries are scanned for DT_NEEDED entries, the latter of which are
then used for populating the "Requires"-type deps. The "nxagent"
binary for example would require libX11.so.6. That incurs problems:
.
1. A package manager told to install nxagent could select xorg-x11
rather than nx-libs, even though nxagent depends on the NX version.
.
2. A package manager told to install $some_program could select nx-libs
rather than xorg-x11 (since both provide libX11.so.6), but, since
the NX library is in an obscure directory, running $some_program
would fail as libX11.so.6 is not found.
.
To solve this, give the NX libraries unique names different from the
Xorg ones.
Forward: pending
Author: Jan Engelhardt <jengelh@medozas.de>
Last-Update: 2012-02-15
---
nx-X11/config/cf/Imake.rules | 12 -
nx-X11/config/cf/X11.tmpl | 240 ++++++++++----------
nx-X11/config/cf/lnxLib.rules | 16 -
nx-X11/config/cf/lnxLib.tmpl | 4
nx-X11/lib/X11/Imakefile | 2
nx-X11/lib/XRes/Imakefile | 2
nx-X11/lib/Xau/Imakefile | 2
nx-X11/lib/Xcomposite/Imakefile | 2
nx-X11/lib/Xcomposite/xcomposite.pc.in | 2
nx-X11/lib/Xcursor/Imakefile | 2
nx-X11/lib/Xcursor/xcursor.pc.in | 2
nx-X11/lib/Xdamage/Imakefile | 2
nx-X11/lib/Xdamage/xdamage.pc.in | 2
nx-X11/lib/Xdmcp/Imakefile | 2
nx-X11/lib/Xext/Imakefile | 2
nx-X11/lib/Xfixes/Imakefile | 2
nx-X11/lib/Xfixes/xfixes.pc.in | 2
nx-X11/lib/Xinerama/Imakefile | 2
nx-X11/lib/Xpm/Imakefile | 2
nx-X11/lib/Xrandr/Imakefile | 2
nx-X11/lib/Xrender/Imakefile | 2
nx-X11/lib/Xrender/xrender.pc.in | 2
nx-X11/lib/Xtst/Imakefile | 2
nx-X11/lib/font/Imakefile | 2
nx-X11/lib/oldX/Imakefile | 2
nx-X11/lib/xkbfile/Imakefile | 2
nx-X11/lib/xkbui/Imakefile | 2
nx-X11/programs/Xserver/Imakefile | 18 -
nxcompext/Makefile.in | 4
nxcompshad/Makefile.in | 4
103 files changed, 294 insertions(+), 294 deletions(-)
--- a/nx-X11/config/cf/Imake.rules
+++ b/nx-X11/config/cf/Imake.rules
@@ -2124,9 +2124,9 @@
*/
#ifndef ProjectUnsharedFontLibReferences
#define ProjectUnsharedFontLibReferences() @@\
-DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(Xfont)) @@\
-FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\
-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
+DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(NX_Xfont)) @@\
+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\
+LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
#endif
/*
@@ -2142,9 +2142,9 @@
#ifndef SharedFontLibReferences
#define SharedFontLibReferences() @@\
SOFONTREV = SharedFontRev @@\
-DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\
-FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\
-LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
+DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\
+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\
+LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
#endif
/*
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -1835,9 +1835,9 @@
#ifndef SharedX11Rev
#define SharedX11Rev 6.2
#endif
-SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev)
+SharedLibReferences(XONLY,NX_X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev)
#else
-ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
#endif
/* Common alternate spellings */
DEPXLIBONLY = $(DEPXONLYLIB)
@@ -2466,9 +2466,9 @@
#ifndef SharedXextRev
#define SharedXextRev 6.4
#endif
-SharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev)
+SharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev)
#else
-ProjectUnsharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),XBuildLibDir)
#endif
LINTEXTENSIONLIB = $(LINTEXTENSION)
DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
@@ -2480,9 +2480,9 @@
#ifndef SharedXssRev
#define SharedXssRev 1.0
#endif
-SharedLibReferences(XSS,Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev)
+SharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev)
#else
-ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),XBuildLibDir)
#endif
XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc
@@ -2490,9 +2490,9 @@
#ifndef SharedXxf86miscRev
#define SharedXxf86miscRev 1.1
#endif
-SharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev)
+SharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev)
#else
-ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir)
#endif
XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm
@@ -2500,9 +2500,9 @@
#ifndef SharedXxf86vmRev
#define SharedXxf86vmRev 1.0
#endif
-SharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev)
+SharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev)
#else
-ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir)
#endif
XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga
@@ -2510,9 +2510,9 @@
#ifndef SharedXxf86dgaRev
#define SharedXxf86dgaRev 1.0
#endif
-SharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev)
+SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev)
#else
-ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir)
#endif
#if BuildDmxLibrary
@@ -2544,9 +2544,9 @@
#ifndef SharedXxf86rushRev
#define SharedXxf86rushRev 1.0
#endif
-SharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev)
+SharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev)
#else
-ProjectUnsharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir)
#endif
@@ -2555,9 +2555,9 @@
#ifndef SharedXvRev
#define SharedXvRev 1.0
#endif
-SharedLibReferences(XV,Xv,$(XVLIBSRC),SOXVREV,SharedXvRev)
+SharedLibReferences(XV,NX_Xv,$(XVLIBSRC),SOXVREV,SharedXvRev)
#else
-ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XV,NX_Xv,$(XVLIBSRC),XBuildLibDir)
#endif
@@ -2566,9 +2566,9 @@
#ifndef SharedXvMCRev
#define SharedXvMCRev 1.0
#endif
-SharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev)
+SharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev)
#else
-ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),XBuildLibDir)
#endif
XINERAMALIBSRC = $(LIBSRC)/Xinerama
@@ -2576,9 +2576,9 @@
#ifndef SharedXineramaRev
#define SharedXineramaRev 1.0
#endif
-SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev)
+SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev)
#else
-ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir)
#endif
XRESLIBSRC = $(LIBSRC)/XRes
@@ -2586,9 +2586,9 @@
#ifndef SharedXResRev
#define SharedXResRev 1.0
#endif
-SharedLibReferences(XRES,XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev)
+SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev)
#else
-ProjectUnsharedLibReferences(XRES,XRes,$(XRESLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir)
#endif
DMXLIBSRC = $(LIBSRC)/dmx
@@ -2596,9 +2596,9 @@
#ifndef SharedDmxRev
#define SharedDmxRev 1.0
#endif
-SharedLibReferences(DMX,dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev)
+SharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev)
#else
-ProjectUnsharedLibReferences(DMX,dmx,$(DMXLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),XBuildLibDir)
#endif
DPSLIBSRC = $(LIBSRC)/dps
@@ -2606,9 +2606,9 @@
#ifndef SharedDpsRev
#define SharedDpsRev 1.0
#endif
-SharedLibReferences(DPS,dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev)
+SharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev)
#else
-ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),XBuildLibDir)
#endif
DPSTKLIBSRC = $(LIBSRC)/dpstk
@@ -2616,9 +2616,9 @@
#ifndef SharedDpsTkRev
#define SharedDpsTkRev 1.0
#endif
-SharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev)
+SharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev)
#else
-ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),XBuildLibDir)
#endif
PSRESLIBSRC = $(LIBSRC)/psres
@@ -2626,9 +2626,9 @@
#ifndef SharedPSResRev
#define SharedPSResRev 1.0
#endif
-SharedLibReferences(PSRES,psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev)
+SharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev)
#else
-ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),XBuildLibDir)
#endif
GLULIBSRC = $(LIBSRC)/GLU
@@ -2636,9 +2636,9 @@
#ifndef SharedGluRev
#define SharedGluRev 1.3
#endif
-SharedLibReferences(GLU,GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev)
+SharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev)
#else
-ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),XBuildLibDir)
#endif
GLXLIBSRC = $(LIBSRC)/GL
@@ -2646,18 +2646,18 @@
#ifndef SharedGlxRev
#define SharedGlxRev 1.2
#endif
-SharedLibReferences(GLX,GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev)
+SharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev)
#else
-ProjectUnsharedLibReferences(GLX,GL,$(GLXLIBSRC),XBuildLibDir)
+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,GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev)
+SharedDSLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev)
#else
-ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),XBuildLibDir)
#endif
XRENDERLIBSRC = $(LIBSRC)/Xrender
@@ -2665,9 +2665,9 @@
#ifndef SharedXrenderRev
#define SharedXrenderRev 1.2.2
#endif
-SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev)
+SharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev)
#else
-ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir)
#endif
XRANDRLIBSRC = $(LIBSRC)/Xrandr
@@ -2675,9 +2675,9 @@
#ifndef SharedXrandrRev
#define SharedXrandrRev 2.0
#endif
-SharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev)
+SharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev)
#else
-ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
#endif
XFIXESLIBSRC = $(LIBSRC)/Xfixes
@@ -2685,9 +2685,9 @@
#ifndef SharedXfixesRev
#define SharedXfixesRev 3.0
#endif
-SharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev)
+SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev)
#else
-ProjectUnsharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir)
#endif
XDAMAGELIBSRC = $(LIBSRC)/Xdamage
@@ -2695,9 +2695,9 @@
#ifndef SharedXdamageRev
#define SharedXdamageRev 1.0
#endif
-SharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev)
+SharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev)
#else
-ProjectUnsharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),XBuildLibDir)
#endif
XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite
@@ -2705,9 +2705,9 @@
#ifndef SharedXcompositeRev
#define SharedXcompositeRev 1.0
#endif
-SharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev)
+SharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev)
#else
-ProjectUnsharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir)
#endif
XEVIELIBSRC = $(LIBSRC)/Xevie
@@ -2715,9 +2715,9 @@
#ifndef SharedXevieRev
#define SharedXevieRev 1.0
#endif
-SharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev)
+SharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev)
#else
-ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),XBuildLibDir)
#endif
XCURSORLIBSRC = $(LIBSRC)/Xcursor
@@ -2725,9 +2725,9 @@
#ifndef SharedXcursorRev
#define SharedXcursorRev 1.0.2
#endif
-SharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev)
+SharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev)
#else
-ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),XBuildLibDir)
#endif
APPLEWMLIBSRC = $(LIBSRC)/apple
@@ -2735,9 +2735,9 @@
#ifndef SharedAppleWMRev
#define SharedAppleWMRev 1.0
#endif
-SharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev)
+SharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev)
#else
-ProjectUnsharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),XBuildLibDir)
#endif
WINDOWSWMLIBSRC = $(LIBSRC)/windows
@@ -2745,9 +2745,9 @@
#ifndef SharedWindowsWMRev
#define SharedWindowsWMRev 1.0
#endif
-SharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev)
+SharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev)
#else
-ProjectUnsharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir)
#endif
# ifndef SharedLibXfontcache
@@ -2768,9 +2768,9 @@
#ifndef SharedXfontcacheRev
#define SharedXfontcacheRev 1.2
#endif
-SharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev)
+SharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev)
#else
-ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibXau
@@ -2790,12 +2790,12 @@
#ifndef SharedXauRev
#define SharedXauRev 6.0
#endif
-SharedLibReferences(XAUTH,Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev)
+SharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev)
#else
#if !UseInstalledXauLib
-ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),XBuildLibDir)
#else
-ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR))
+ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR))
#endif
#endif
@@ -2816,12 +2816,12 @@
#ifndef SharedXdmcpRev
#define SharedXdmcpRev 6.0
#endif
-SharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev)
+SharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev)
#else
#if !UseInstalledXdmcpLib
-ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),XBuildLibDir)
#else
-ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR))
+ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR))
#endif
#endif
@@ -2842,9 +2842,9 @@
#ifndef SharedXmuRev
#define SharedXmuRev 6.2
#endif
-SharedDSLibReferences(XMU,Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev)
+SharedDSLibReferences(XMU,NX_Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev)
#else
-ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XMU,NX_Xmu,$(XMUSRC),XBuildLibDir)
#endif
#ifndef SharedLibXmuu
@@ -2864,9 +2864,9 @@
#ifndef SharedXmuuRev
#define SharedXmuuRev 1.0
#endif
-SharedLibReferences(XMUU,Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev)
+SharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev)
#else
-ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),XBuildLibDir)
#endif
#ifndef SharedOldX
@@ -2886,9 +2886,9 @@
#ifndef SharedOldXRev
#define SharedOldXRev 6.0
#endif
-SharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev)
+SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev)
#else
-ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibXp
@@ -2908,9 +2908,9 @@
#ifndef SharedXpRev
#define SharedXpRev 6.2
#endif
-SharedLibReferences(XP,Xp,$(XPLIBSRC),SOXPREV,SharedXpRev)
+SharedLibReferences(XP,NX_Xp,$(XPLIBSRC),SOXPREV,SharedXpRev)
#else
-ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XP,NX_Xp,$(XPLIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibXt
@@ -2930,9 +2930,9 @@
#ifndef SharedXtRev
#define SharedXtRev 6.0
#endif
-SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev)
+SharedDSLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev)
#else
-ProjectUnsharedLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),XBuildLibDir)
#endif
DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB)
XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB)
@@ -2956,9 +2956,9 @@
#ifndef SharedXaRev
#define SharedXaRev 1.0
#endif
-SharedLibReferences(XA,Xa,$(XALIBSRC),SOXAREV,SharedXaRev)
+SharedLibReferences(XA,NX_Xa,$(XALIBSRC),SOXAREV,SharedXaRev)
#else
-UnsharedLibReferences(XA,Xa,$(XALIBSRC))
+UnsharedLibReferences(XA,NX_Xa,$(XALIBSRC))
#endif
#ifndef BuildXaw
@@ -2985,9 +2985,9 @@
#ifndef SharedXawRev
#define SharedXawRev 8.0
#endif
-SharedDSLibReferences(XAW,Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev)
+SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev)
#else
-ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),XBuildLibDir)
#endif
#endif
@@ -3013,14 +3013,14 @@
#ifndef SharedXaw7Rev
#define SharedXaw7Rev 7.0
#endif
-SharedDSLibReferences(XAW7,Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev)
+SharedDSLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev)
#if !BuildXaw
-SharedDSLibReferences(XAW,Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev)
+SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev)
#endif
#else
-ProjectUnsharedLibReferences(XAW7,Xaw,$(AWIDGET7SRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir)
#if !BuildXaw
-ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET7SRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir)
#endif
#endif
#endif
@@ -3048,14 +3048,14 @@
#ifndef SharedXaw6Rev
#define SharedXaw6Rev 6.1
#endif
-SharedDSLibReferences(XAW6,Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev)
+SharedDSLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev)
#if !BuildXaw && !BuildXaw7
-SharedDSLibReferences(XAW,Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev)
+SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev)
#endif
#else
-ProjectUnsharedLibReferences(XAW6,Xaw,$(AWIDGET6SRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir)
#if !BuildXaw && !BuildXaw7
-ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET6SRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir)
#endif
#endif
#endif
@@ -3077,9 +3077,9 @@
#ifndef SharedXiRev
#define SharedXiRev 6.0
#endif
-SharedLibReferences(XI,Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev)
+SharedLibReferences(XI,NX_Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev)
#else
-ProjectUnsharedLibReferences(XI,Xi,$(XILIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XI,NX_Xi,$(XILIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibXtst
@@ -3099,12 +3099,12 @@
#ifndef SharedXtstRev
#define SharedXtstRev 6.1
#endif
-SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev)
+SharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev)
#else
-ProjectUnsharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),XBuildLibDir)
#endif
-ProjectUnsharedLibReferences(XBSD,Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir)
+ProjectUnsharedLibReferences(XBSD,NX_Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir)
#ifndef SharedLibICE
#define SharedLibICE HasSharedLibraries
@@ -3123,9 +3123,9 @@
#ifndef SharedICERev
#define SharedICERev 6.4
#endif
-SharedLibReferences(ICE,ICE,$(ICESRC),SOICEREV,SharedICERev)
+SharedLibReferences(ICE,NX_ICE,$(ICESRC),SOICEREV,SharedICERev)
#else
-ProjectUnsharedLibReferences(ICE,ICE,$(ICESRC),XBuildLibDir)
+ProjectUnsharedLibReferences(ICE,NX_ICE,$(ICESRC),XBuildLibDir)
#endif
#ifndef SharedLibSM
@@ -3145,9 +3145,9 @@
#ifndef SharedSMRev
#define SharedSMRev 6.0
#endif
-SharedLibReferences(SM,SM,$(SMSRC),SOSMREV,SharedSMRev)
+SharedLibReferences(SM,NX_SM,$(SMSRC),SOSMREV,SharedSMRev)
#else
-ProjectUnsharedLibReferences(SM,SM,$(SMSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(SM,NX_SM,$(SMSRC),XBuildLibDir)
#endif
#ifndef SharedLibXkey
@@ -3167,9 +3167,9 @@
#ifndef SharedXkeyRev
#define SharedXkeyRev 6.0
#endif
-SharedLibReferences(XKEY,Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev)
+SharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev)
#else
-ProjectUnsharedLibReferences(XKEY,Xkey,$(XKEYSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),XBuildLibDir)
#endif
#ifndef SharedLibFS
@@ -3189,9 +3189,9 @@
#ifndef SharedFSRev
#define SharedFSRev 6.0
#endif
-SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
+SharedLibReferences(FS,NX_FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
#else
-ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(FS,NX_FS,$(FSLIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibFont
@@ -3212,14 +3212,14 @@
#define SharedFontRev 1.5
#endif
SharedFontLibReferences()
-XCOMM SharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev)
+XCOMM SharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev)
#else
ProjectUnsharedFontLibReferences()
-XCOMM ProjectUnsharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),XBuildLibDir)
+XCOMM ProjectUnsharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),XBuildLibDir)
#endif
FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs
-ProjectUnsharedLibReferences(FONTSTUB,fntstubs,$(FONTSUBLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(FONTSTUB,NX_fntstubs,$(FONTSUBLIBSRC),XBuildLibDir)
DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB)
FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB)
@@ -3241,9 +3241,9 @@
#ifndef SharedFontEncRev
#define SharedFontEncRev 1.0
#endif
-SharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev)
+SharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev)
#else
-ProjectUnsharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibXpm
@@ -3263,9 +3263,9 @@
#ifndef SharedXpmRev
#define SharedXpmRev 4.11
#endif
-SharedLibReferences(XPM,Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev)
+SharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev)
#else
-ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),XBuildLibDir)
#endif
#if UseFreetype2
@@ -3313,9 +3313,9 @@
#define SharedFreetype2Rev 9.0
#endif
#endif
-SharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev)
+SharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev)
#else
-ProjectUnsharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),XBuildLibDir)
#endif
#ifdef UseInstalled
@@ -3470,9 +3470,9 @@
#define SharedExpatRev 4.0
#endif
#endif
-SharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev)
+SharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev)
#else
-ProjectUnsharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),XBuildLibDir)
#endif
#if UseExpat
@@ -3552,9 +3552,9 @@
#ifndef SharedXft1Rev
#define SharedXft1Rev 1.1
#endif
-SharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev)
+SharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev)
#else
-ProjectUnsharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),XBuildLibDir)
#endif
#ifndef Xft1ClientDepLibs
@@ -3589,9 +3589,9 @@
#ifndef SharedXftRev
#define SharedXftRev 2.1.2
#endif
-SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev)
+SharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev)
#else
-ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),XBuildLibDir)
#endif
#ifndef XftClientDepLibs
@@ -3622,9 +3622,9 @@
#ifndef SharedFontconfigRev
#define SharedFontconfigRev 1.0.4
#endif
-SharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev)
+SharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev)
#else
-ProjectUnsharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir)
#endif
#ifdef UseInstalled
@@ -3827,9 +3827,9 @@
# ifndef SharedxkbfileRev
# define SharedxkbfileRev 1.0
# endif
-SharedLibReferences(XKBFILE,xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev)
+SharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev)
#else
-ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILELIBSRC),XBuildLibDir)
#endif
#if BuildXKBlib
@@ -3899,9 +3899,9 @@
# ifndef SharedxkbuiRev
# define SharedxkbuiRev 1.0
# endif
-SharedLibReferences(XKBUI,xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev)
+SharedLibReferences(XKBUI,NX_xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev)
#else
-ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XKBUI,NX_xkbui,$(XKBUILIBSRC),XBuildLibDir)
#endif
#ifndef XkbuiLibs
@@ -3974,9 +3974,9 @@
#ifndef SharedXTrapRev
#define SharedXTrapRev 6.4
#endif
-SharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev)
+SharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev)
#else
-ProjectUnsharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),XBuildLibDir)
+ProjectUnsharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),XBuildLibDir)
#endif
#ifndef NeedDefaultDepLibs
--- a/nx-X11/config/cf/lnxLib.rules
+++ b/nx-X11/config/cf/lnxLib.rules
@@ -389,7 +389,7 @@
XCOMM libX11.so (X11, SM, ICE)
JUMP_ROOT_X11 = $(XLIBSRC)
JUMP_IS_HOST_X11 = YES
-JUMP_STUBLIBS_X11 = libX11.sa libSM.sa libICE.sa
+JUMP_STUBLIBS_X11 = libNX_X11.sa libNX_SM.sa libNX_ICE.sa
JUMP_SIBDIRS_X11 = $(JUMP_ROOT_SM) $(JUMP_ROOT_ICE)
JUMP_DIR_X11 = $(JUMP_ROOT_X11)/shared
JUMP_DEFS_X11 = $(XDMAUTHDEFS) $(XKB_DEFINES)
@@ -400,9 +400,9 @@
JUMP_ADDRESS_X11 = 0x60200000
JUMP_JUMPTABLESIZE_X11 = 0x4000
JUMP_GOTSIZE_X11 = 4096
-JUMP_STUBNAMES_X11 = libX11 libSM libICE
+JUMP_STUBNAMES_X11 = libNX_X11 libNX_SM libNX_ICE
JUMP_STUBS_IMPORT_X11 = $(LIBC_SA)
-JUMP_SIBARS_X11 = jump/libSM.a~ jump/libICE.a~
+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)
@@ -435,9 +435,9 @@
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/libXmu.a~ jump/libXext.a~ jump/libXi.a~ jump/libXtst.a~ jump/libXp.a~
-JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libICE.sa \
- $(JUMP_ROOT_SM)/libSM.sa $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc)
+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)
@@ -485,8 +485,8 @@
JUMP_GOTSIZE_Xaw = 4096
JUMP_STUBNAMES_Xaw = libXaw
JUMP_STUBS_IMPORT_Xaw = $(JUMP_STUBS_IMPORT_X11)
-JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libXt.sa $(JUMP_ROOT_Xt)/libXmu.sa \
- $(JUMP_ROOT_Xt)/libXext.sa $(JUMP_ROOT_X11)/libX11.sa \
+JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libNX_Xt.sa $(JUMP_ROOT_Xt)/libNX_Xmu.sa \
+ $(JUMP_ROOT_Xt)/libNX_Xext.sa $(JUMP_ROOT_X11)/libNX_X11.sa \
$(JUMP_LDLIBS_libc)
# endif /* !UseInstalled */
--- a/nx-X11/config/cf/lnxLib.tmpl
+++ b/nx-X11/config/cf/lnxLib.tmpl
@@ -9,7 +9,7 @@
#ifndef FixupLibReferences
#define FixupLibReferences() @@\
-XMULIBONLY = -lXmu @@\
+XMULIBONLY = -lNX_Xmu @@\
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#endif
@@ -66,7 +66,7 @@
#ifndef FixupLibReferences
#define FixupLibReferences() @@\
-XMULIB = -lXmu $(XLIB)
+XMULIB = -lNX_Xmu $(XLIB)
#endif
#endif /* UseElfFormat */
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -82,7 +82,7 @@
#define DoExtraLib SharedLibX11
#define DoDebugLib DebugLibX11
#define DoProfileLib ProfileLibX11
-#define LibName X11
+#define LibName NX_X11
#define SoRev SOXLIBREV
#define HugeLibrary YES
#define IncSubdir X11
--- a/nx-X11/lib/XRes/Imakefile
+++ b/nx-X11/lib/XRes/Imakefile
@@ -4,7 +4,7 @@
#define DoSharedLib SharedLibXRes
#define DoDebugLib DebugLibXRes
#define DoProfileLib ProfileLibXRes
-#define LibName XRes
+#define LibName NX_XRes
#define SoRev SOXRESREV
#define LibHeaders NO
--- a/nx-X11/lib/Xau/Imakefile
+++ b/nx-X11/lib/Xau/Imakefile
@@ -10,7 +10,7 @@
#define DoExtraLib SharedLibXau
#define DoDebugLib DebugLibXau
#define DoProfileLib ProfileLibXau
-#define LibName Xau
+#define LibName NX_Xau
#define SoRev SOXAUTHREV
#define IncSubdir X11
--- a/nx-X11/lib/Xcomposite/Imakefile
+++ b/nx-X11/lib/Xcomposite/Imakefile
@@ -14,7 +14,7 @@
#define DoDebugLib DebugLibXcomposite
#define DoProfileLib ProfileLibXcomposite
-#define LibName Xcomposite
+#define LibName NX_Xcomposite
#define SoRev SOXCOMPOSITEREV
#define IncSubdir X11
#define IncSubSubdir extensions
--- a/nx-X11/lib/Xcomposite/xcomposite.pc.in
+++ b/nx-X11/lib/Xcomposite/xcomposite.pc.in
@@ -7,4 +7,4 @@
Description: X Composite Library
Version: @VERSION@
Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ @X_CFLAGS@
-Libs: -L${libdir} -lXcomposite @XCOMPOSITE_LIBS@ @X_LIBS@
+Libs: -L${libdir} -lNX_Xcomposite @XCOMPOSITE_LIBS@ @X_LIBS@
--- a/nx-X11/lib/Xcursor/Imakefile
+++ b/nx-X11/lib/Xcursor/Imakefile
@@ -15,7 +15,7 @@
#define DoDebugLib DebugLibXcursor
#define DoProfileLib ProfileLibXcursor
-#define LibName Xcursor
+#define LibName NX_Xcursor
#define SoRev SOXCURSORREV
#define IncSubdir X11
#define IncSubSubdir Xcursor
--- a/nx-X11/lib/Xcursor/xcursor.pc.in
+++ b/nx-X11/lib/Xcursor/xcursor.pc.in
@@ -12,4 +12,4 @@
Version: @VERSION@
Requires: xrender
Cflags: -I${includedir} ${xrendercflags} ${xcflags}
-Libs: -L${libdir} -lXcursor ${xrenderlibs} ${xlibs}
+Libs: -L${libdir} -lNX_Xcursor ${xrenderlibs} ${xlibs}
--- a/nx-X11/lib/Xdamage/Imakefile
+++ b/nx-X11/lib/Xdamage/Imakefile
@@ -14,7 +14,7 @@
#define DoDebugLib DebugLibXdamage
#define DoProfileLib ProfileLibXdamage
-#define LibName Xdamage
+#define LibName NX_Xdamage
#define SoRev SOXDAMAGEREV
#define IncSubdir X11
#define IncSubSubdir extensions
--- a/nx-X11/lib/Xdamage/xdamage.pc.in
+++ b/nx-X11/lib/Xdamage/xdamage.pc.in
@@ -7,4 +7,4 @@
Description: X Damage Library
Version: @VERSION@
Cflags: -I${includedir} @XDAMAGE_CFLAGS@ @X_CFLAGS@
-Libs: -L${libdir} -lXdamage @XDAMAGE_LIBS@ @X_LIBS@
+Libs: -L${libdir} -lNX_Xdamage @XDAMAGE_LIBS@ @X_LIBS@
--- a/nx-X11/lib/Xdmcp/Imakefile
+++ b/nx-X11/lib/Xdmcp/Imakefile
@@ -10,7 +10,7 @@
#define DoExtraLib SharedLibXdmcp
#define DoDebugLib DebugLibXdmcp
#define DoProfileLib ProfileLibXdmcp
-#define LibName Xdmcp
+#define LibName NX_Xdmcp
#define SoRev SOXDMCPREV
#define IncSubdir X11
--- a/nx-X11/lib/Xext/Imakefile
+++ b/nx-X11/lib/Xext/Imakefile
@@ -10,7 +10,7 @@
#define DoExtraLib SharedLibXext
#define DoDebugLib DebugLibXext
#define DoProfileLib ProfileLibXext
-#define LibName Xext
+#define LibName NX_Xext
#define SoRev SOXEXTREV
#define LibHeaders NO
--- a/nx-X11/lib/Xfixes/Imakefile
+++ b/nx-X11/lib/Xfixes/Imakefile
@@ -14,7 +14,7 @@
#define DoDebugLib DebugLibXfixes
#define DoProfileLib ProfileLibXfixes
-#define LibName Xfixes
+#define LibName NX_Xfixes
#define SoRev SOXFIXESREV
#define IncSubdir X11
#define IncSubSubdir extensions
--- a/nx-X11/lib/Xfixes/xfixes.pc.in
+++ b/nx-X11/lib/Xfixes/xfixes.pc.in
@@ -7,4 +7,4 @@
Description: X Fixes Library
Version: @VERSION@
Cflags: -I${includedir} @X_CFLAGS@
-Libs: -L${libdir} -lXfixes @X_LIBS@
+Libs: -L${libdir} -lNX_Xfixes @X_LIBS@
--- a/nx-X11/lib/Xinerama/Imakefile
+++ b/nx-X11/lib/Xinerama/Imakefile
@@ -4,7 +4,7 @@
#define DoSharedLib SharedLibXinerama
#define DoDebugLib DebugLibXinerama
#define DoProfileLib ProfileLibXinerama
-#define LibName Xinerama
+#define LibName NX_Xinerama
#define SoRev SOXINERAMAREV
#define LibHeaders NO
--- a/nx-X11/lib/Xpm/Imakefile
+++ b/nx-X11/lib/Xpm/Imakefile
@@ -12,7 +12,7 @@
#define DoDebugLib DebugLibXpm
#define DoProfileLib ProfileLibXpm
#define HasSharedData NO
-#define LibName Xpm
+#define LibName NX_Xpm
#define SoRev SOXPMREV
#define IncSubdir X11
--- a/nx-X11/lib/Xrandr/Imakefile
+++ b/nx-X11/lib/Xrandr/Imakefile
@@ -5,7 +5,7 @@
#define DoSharedLib SharedLibXrandr
#define DoDebugLib DebugLibXrandr
#define DoProfileLib ProfileLibXrandr
-#define LibName Xrandr
+#define LibName NX_Xrandr
#define SoRev SOXRANDRREV
#define IncSubdir X11
#define IncSubSubdir extensions
--- a/nx-X11/lib/Xrender/Imakefile
+++ b/nx-X11/lib/Xrender/Imakefile
@@ -74,7 +74,7 @@
#define DoSharedLib SharedLibXrender
#define DoDebugLib DebugLibXrender
#define DoProfileLib ProfileLibXrender
-#define LibName Xrender
+#define LibName NX_Xrender
#define SoRev SOXRENDERREV
#ifdef XBuildIncDir
--- a/nx-X11/lib/Xrender/xrender.pc.in
+++ b/nx-X11/lib/Xrender/xrender.pc.in
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: @X_REQUIRES@
Cflags: -I${includedir} @RENDER_CFLAGS@ @X_NON_PKG_CFLAGS@
-Libs: -L${libdir} -lXrender @X_NON_PKG_LIBS@
+Libs: -L${libdir} -lNX_Xrender @X_NON_PKG_LIBS@
--- a/nx-X11/lib/Xtst/Imakefile
+++ b/nx-X11/lib/Xtst/Imakefile
@@ -10,7 +10,7 @@
#define DoExtraLib SharedLibXtst
#define DoDebugLib DebugLibXtst
#define DoProfileLib ProfileLibXtst
-#define LibName Xtst
+#define LibName NX_Xtst
#define SoRev SOXTESTREV
#define LibHeaders NO
--- a/nx-X11/lib/font/Imakefile
+++ b/nx-X11/lib/font/Imakefile
@@ -31,7 +31,7 @@
STUBDIRS = stubs
#endif
-LIBNAME = Xfont
+LIBNAME = NX_Xfont
SOREV = $(SOFONTREV)
#ifndef SeparateSharedCompile
--- a/nx-X11/lib/oldX/Imakefile
+++ b/nx-X11/lib/oldX/Imakefile
@@ -10,7 +10,7 @@
#define DoExtraLib SharedOldX
#define DoDebugLib DebugOldX
#define DoProfileLib ProfileOldX
-#define LibName oldX
+#define LibName NX_oldX
#define SoRev SOOLDXREV
#define IncSubdir X11
--- a/nx-X11/lib/xkbfile/Imakefile
+++ b/nx-X11/lib/xkbfile/Imakefile
@@ -11,7 +11,7 @@
#define DoDebugLib DebugLibxkbfile
#define DoProfileLib ProfileLibxkbfile
#define HasSharedData NO
-#define LibName xkbfile
+#define LibName NX_xkbfile
#define SoRev SOXKBFILEREV
#define IncSubdir X11
#define IncSubSubdir extensions
--- a/nx-X11/lib/xkbui/Imakefile
+++ b/nx-X11/lib/xkbui/Imakefile
@@ -6,7 +6,7 @@
#define DoDebugLib DebugLibxkbui
#define DoProfileLib ProfileLibxkbui
#define HasSharedData NO
-#define LibName xkbui
+#define LibName NX_xkbui
#define SoRev SOXKBUIREV
#define IncSubdir X11
#define IncSubSubdir extensions
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -313,7 +313,7 @@
FONTBASE = $(FONTLIBSRC)/fontbase.o \
$(FONTLIBSRC)/LibraryTargetName(fontbase)
#if XserverStaticFontLib
- FONT = $(FONTLIBSRC)/LibraryTargetName(Xfont) $(FREETYPE2LIB)
+ FONT = $(FONTLIBSRC)/LibraryTargetName(NX_Xfont) $(FREETYPE2LIB)
#else
FONT = $(LDPRELIB) $(XFONTLIB) $(FREETYPE2LIB)
#endif
@@ -994,7 +994,7 @@
dix/main.o
#endif
-XPMLIB = -lXpm
+XPMLIB = -lNX_Xpm
NXAGENT = hw/nxagent/LibraryTargetName(nxagent)
NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI)
NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB)
@@ -1012,18 +1012,18 @@
#if defined(SunArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
- -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \
- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp \
+ -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lNX_Xfixes \
+ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xdmcp \
`pkg-config --libs libxml-2.0`
#elif defined(cygwinArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \
- -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \
- -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp \
+ -lXcomp -lXcompext -lNX_Xrender -lX11 -lNX_Xext -lNX_Xcomposite -lNX_Xfixes \
+ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdmcp \
`pkg-config --libs libxml-2.0`
#else
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
- -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \
- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp \
+ -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xfixes \
+ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lNX_Xdmcp \
`pkg-config --libs libxml-2.0`
#endif
@@ -1078,7 +1078,7 @@
else exit 0; fi
$(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \
$(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) $(FONTLIBS) \
- $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lXext -lX11 $(EXTRA_LOAD_FLAGS)
+ $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_Xext -lNX_X11 $(EXTRA_LOAD_FLAGS)
#endif /* NXAgentServer */
#if defined(XnonServer) && XnonServer
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -42,12 +42,12 @@
CCDEFINES =
LDFLAGS = @LDFLAGS@ -L../nxcomp
-LIBS = @LIBS@ -lz -lX11 -lXcomp
+LIBS = @LIBS@ -lz -lNX_X11 -lXcomp
#
# Only if THREADS is defined
#
-# LIBS = @LIBS@ -lz -ljpeg -lpthread -lX11 -lXcomp
+# LIBS = @LIBS@ -lz -ljpeg -lpthread -lNX_X11 -lXcomp
#
srcdir = @srcdir@
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -48,7 +48,7 @@
CCDEFINES =
LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ -lX11
+LIBS = @LIBS@ -lNX_X11
#
# Only if THREADS is defined.
@@ -139,7 +139,7 @@
else
-EXTRALIBS = -lXtst -lXrandr -lXdamage
+EXTRALIBS = -lNX_Xtst -lNX_Xrandr -lNX_Xdamage
all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE)
debian/patches/series
View file @ c4a8556c
#401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
602_nx-X11_initgroups.full.patch 602_nx-X11_initgroups.full.patch
603_nx-X11_compilation_warnings.full.patch 603_nx-X11_compilation_warnings.full.patch
......
nx-X11/config/cf/Imake.rules
View file @ c4a8556c
...@@ -2124,9 +2124,9 @@ LintLibReferences(varname,libname,libsource) ...@@ -2124,9 +2124,9 @@ LintLibReferences(varname,libname,libsource)
*/ */
#ifndef ProjectUnsharedFontLibReferences #ifndef ProjectUnsharedFontLibReferences
#define ProjectUnsharedFontLibReferences() @@\ #define ProjectUnsharedFontLibReferences() @@\
DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(Xfont)) @@\ DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(NX_Xfont)) @@\
FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\
LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
#endif #endif
/* /*
...@@ -2142,9 +2142,9 @@ LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) ...@@ -2142,9 +2142,9 @@ LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
#ifndef SharedFontLibReferences #ifndef SharedFontLibReferences
#define SharedFontLibReferences() @@\ #define SharedFontLibReferences() @@\
SOFONTREV = SharedFontRev @@\ SOFONTREV = SharedFontRev @@\
DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\ DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\
FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\
LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
#endif #endif
/* /*
......
nx-X11/config/cf/X11.tmpl
View file @ c4a8556c
...@@ -1835,9 +1835,9 @@ VENDORSUPPORTDEFS = VendorSupportDefines ...@@ -1835,9 +1835,9 @@ VENDORSUPPORTDEFS = VendorSupportDefines
#ifndef SharedX11Rev #ifndef SharedX11Rev
#define SharedX11Rev 6.2 #define SharedX11Rev 6.2
#endif #endif
SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) SharedLibReferences(XONLY,NX_X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev)
#else #else
ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
#endif #endif
/* Common alternate spellings */ /* Common alternate spellings */
DEPXLIBONLY = $(DEPXONLYLIB) DEPXLIBONLY = $(DEPXONLYLIB)
...@@ -2466,9 +2466,9 @@ ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir) ...@@ -2466,9 +2466,9 @@ ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir)
#ifndef SharedXextRev #ifndef SharedXextRev
#define SharedXextRev 6.4 #define SharedXextRev 6.4
#endif #endif
SharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) SharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev)
#else #else
ProjectUnsharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),XBuildLibDir)
#endif #endif
LINTEXTENSIONLIB = $(LINTEXTENSION) LINTEXTENSIONLIB = $(LINTEXTENSION)
DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
...@@ -2480,9 +2480,9 @@ LINTEXTENSIONLIB = $(LINTEXTENSION) ...@@ -2480,9 +2480,9 @@ LINTEXTENSIONLIB = $(LINTEXTENSION)
#ifndef SharedXssRev #ifndef SharedXssRev
#define SharedXssRev 1.0 #define SharedXssRev 1.0
#endif #endif
SharedLibReferences(XSS,Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) SharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev)
#else #else
ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),XBuildLibDir)
#endif #endif
XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc
...@@ -2490,9 +2490,9 @@ ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir) ...@@ -2490,9 +2490,9 @@ ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir)
#ifndef SharedXxf86miscRev #ifndef SharedXxf86miscRev
#define SharedXxf86miscRev 1.1 #define SharedXxf86miscRev 1.1
#endif #endif
SharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) SharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev)
#else #else
ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir)
#endif #endif
XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm
...@@ -2500,9 +2500,9 @@ ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir ...@@ -2500,9 +2500,9 @@ ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir
#ifndef SharedXxf86vmRev #ifndef SharedXxf86vmRev
#define SharedXxf86vmRev 1.0 #define SharedXxf86vmRev 1.0
#endif #endif
SharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) SharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev)
#else #else
ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir)
#endif #endif
XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga
...@@ -2510,9 +2510,9 @@ ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) ...@@ -2510,9 +2510,9 @@ ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir)
#ifndef SharedXxf86dgaRev #ifndef SharedXxf86dgaRev
#define SharedXxf86dgaRev 1.0 #define SharedXxf86dgaRev 1.0
#endif #endif
SharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev)
#else #else
ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir)
#endif #endif
#if BuildDmxLibrary #if BuildDmxLibrary
...@@ -2544,9 +2544,9 @@ ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) ...@@ -2544,9 +2544,9 @@ ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir)
#ifndef SharedXxf86rushRev #ifndef SharedXxf86rushRev
#define SharedXxf86rushRev 1.0 #define SharedXxf86rushRev 1.0
#endif #endif
SharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) SharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev)
#else #else
ProjectUnsharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir)
#endif #endif
...@@ -2555,9 +2555,9 @@ ProjectUnsharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir ...@@ -2555,9 +2555,9 @@ ProjectUnsharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir
#ifndef SharedXvRev #ifndef SharedXvRev
#define SharedXvRev 1.0 #define SharedXvRev 1.0
#endif #endif
SharedLibReferences(XV,Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) SharedLibReferences(XV,NX_Xv,$(XVLIBSRC),SOXVREV,SharedXvRev)
#else #else
ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XV,NX_Xv,$(XVLIBSRC),XBuildLibDir)
#endif #endif
...@@ -2566,9 +2566,9 @@ ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir) ...@@ -2566,9 +2566,9 @@ ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir)
#ifndef SharedXvMCRev #ifndef SharedXvMCRev
#define SharedXvMCRev 1.0 #define SharedXvMCRev 1.0
#endif #endif
SharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) SharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev)
#else #else
ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),XBuildLibDir)
#endif #endif
XINERAMALIBSRC = $(LIBSRC)/Xinerama XINERAMALIBSRC = $(LIBSRC)/Xinerama
...@@ -2576,9 +2576,9 @@ ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir) ...@@ -2576,9 +2576,9 @@ ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir)
#ifndef SharedXineramaRev #ifndef SharedXineramaRev
#define SharedXineramaRev 1.0 #define SharedXineramaRev 1.0
#endif #endif
SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev)
#else #else
ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir)
#endif #endif
XRESLIBSRC = $(LIBSRC)/XRes XRESLIBSRC = $(LIBSRC)/XRes
...@@ -2586,9 +2586,9 @@ ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir) ...@@ -2586,9 +2586,9 @@ ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir)
#ifndef SharedXResRev #ifndef SharedXResRev
#define SharedXResRev 1.0 #define SharedXResRev 1.0
#endif #endif
SharedLibReferences(XRES,XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev)
#else #else
ProjectUnsharedLibReferences(XRES,XRes,$(XRESLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir)
#endif #endif
DMXLIBSRC = $(LIBSRC)/dmx DMXLIBSRC = $(LIBSRC)/dmx
...@@ -2596,9 +2596,9 @@ ProjectUnsharedLibReferences(XRES,XRes,$(XRESLIBSRC),XBuildLibDir) ...@@ -2596,9 +2596,9 @@ ProjectUnsharedLibReferences(XRES,XRes,$(XRESLIBSRC),XBuildLibDir)
#ifndef SharedDmxRev #ifndef SharedDmxRev
#define SharedDmxRev 1.0 #define SharedDmxRev 1.0
#endif #endif
SharedLibReferences(DMX,dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) SharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev)
#else #else
ProjectUnsharedLibReferences(DMX,dmx,$(DMXLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),XBuildLibDir)
#endif #endif
DPSLIBSRC = $(LIBSRC)/dps DPSLIBSRC = $(LIBSRC)/dps
...@@ -2606,9 +2606,9 @@ ProjectUnsharedLibReferences(DMX,dmx,$(DMXLIBSRC),XBuildLibDir) ...@@ -2606,9 +2606,9 @@ ProjectUnsharedLibReferences(DMX,dmx,$(DMXLIBSRC),XBuildLibDir)
#ifndef SharedDpsRev #ifndef SharedDpsRev
#define SharedDpsRev 1.0 #define SharedDpsRev 1.0
#endif #endif
SharedLibReferences(DPS,dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) SharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev)
#else #else
ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),XBuildLibDir)
#endif #endif
DPSTKLIBSRC = $(LIBSRC)/dpstk DPSTKLIBSRC = $(LIBSRC)/dpstk
...@@ -2616,9 +2616,9 @@ ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir) ...@@ -2616,9 +2616,9 @@ ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir)
#ifndef SharedDpsTkRev #ifndef SharedDpsTkRev
#define SharedDpsTkRev 1.0 #define SharedDpsTkRev 1.0
#endif #endif
SharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) SharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev)
#else #else
ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),XBuildLibDir)
#endif #endif
PSRESLIBSRC = $(LIBSRC)/psres PSRESLIBSRC = $(LIBSRC)/psres
...@@ -2626,9 +2626,9 @@ ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir) ...@@ -2626,9 +2626,9 @@ ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir)
#ifndef SharedPSResRev #ifndef SharedPSResRev
#define SharedPSResRev 1.0 #define SharedPSResRev 1.0
#endif #endif
SharedLibReferences(PSRES,psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) SharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev)
#else #else
ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),XBuildLibDir)
#endif #endif
GLULIBSRC = $(LIBSRC)/GLU GLULIBSRC = $(LIBSRC)/GLU
...@@ -2636,9 +2636,9 @@ ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir) ...@@ -2636,9 +2636,9 @@ ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir)
#ifndef SharedGluRev #ifndef SharedGluRev
#define SharedGluRev 1.3 #define SharedGluRev 1.3
#endif #endif
SharedLibReferences(GLU,GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) SharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev)
#else #else
ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),XBuildLibDir)
#endif #endif
GLXLIBSRC = $(LIBSRC)/GL GLXLIBSRC = $(LIBSRC)/GL
...@@ -2646,18 +2646,18 @@ ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir) ...@@ -2646,18 +2646,18 @@ ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir)
#ifndef SharedGlxRev #ifndef SharedGlxRev
#define SharedGlxRev 1.2 #define SharedGlxRev 1.2
#endif #endif
SharedLibReferences(GLX,GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) SharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev)
#else #else
ProjectUnsharedLibReferences(GLX,GL,$(GLXLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),XBuildLibDir)
#endif #endif
GLWIDGETSRC = $(LIBSRC)/GLw GLWIDGETSRC = $(LIBSRC)/GLw
#if SharedLibGLw #if SharedLibGLw
#ifndef SharedGLwRev #ifndef SharedGLwRev
#define SharedGLwRev 1.0 /* used to name the shared library */ #define SharedGLwRev 1.0 /* used to name the shared library */
#endif #endif
SharedDSLibReferences(GLW,GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) SharedDSLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev)
#else #else
ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir) ProjectUnsharedLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),XBuildLibDir)
#endif #endif
XRENDERLIBSRC = $(LIBSRC)/Xrender XRENDERLIBSRC = $(LIBSRC)/Xrender
...@@ -2665,9 +2665,9 @@ ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir) ...@@ -2665,9 +2665,9 @@ ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir)
#ifndef SharedXrenderRev #ifndef SharedXrenderRev
#define SharedXrenderRev 1.2.2 #define SharedXrenderRev 1.2.2
#endif #endif
SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) SharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev)
#else #else
ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir)
#endif #endif
XRANDRLIBSRC = $(LIBSRC)/Xrandr XRANDRLIBSRC = $(LIBSRC)/Xrandr
...@@ -2675,9 +2675,9 @@ ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir) ...@@ -2675,9 +2675,9 @@ ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
#ifndef SharedXrandrRev #ifndef SharedXrandrRev
#define SharedXrandrRev 2.0 #define SharedXrandrRev 2.0
#endif #endif
SharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) SharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev)
#else #else
ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
#endif #endif
XFIXESLIBSRC = $(LIBSRC)/Xfixes XFIXESLIBSRC = $(LIBSRC)/Xfixes
...@@ -2685,9 +2685,9 @@ ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir) ...@@ -2685,9 +2685,9 @@ ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
#ifndef SharedXfixesRev #ifndef SharedXfixesRev
#define SharedXfixesRev 3.0 #define SharedXfixesRev 3.0
#endif #endif
SharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev)
#else #else
ProjectUnsharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir)
#endif #endif
XDAMAGELIBSRC = $(LIBSRC)/Xdamage XDAMAGELIBSRC = $(LIBSRC)/Xdamage
...@@ -2695,9 +2695,9 @@ ProjectUnsharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),XBuildLibDir) ...@@ -2695,9 +2695,9 @@ ProjectUnsharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),XBuildLibDir)
#ifndef SharedXdamageRev #ifndef SharedXdamageRev
#define SharedXdamageRev 1.0 #define SharedXdamageRev 1.0
#endif #endif
SharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev) SharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev)
#else #else
ProjectUnsharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),XBuildLibDir)
#endif #endif
XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite
...@@ -2705,9 +2705,9 @@ XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite ...@@ -2705,9 +2705,9 @@ XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite
#ifndef SharedXcompositeRev #ifndef SharedXcompositeRev
#define SharedXcompositeRev 1.0 #define SharedXcompositeRev 1.0
#endif #endif
SharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev) SharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev)
#else #else
ProjectUnsharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir)
#endif #endif
XEVIELIBSRC = $(LIBSRC)/Xevie XEVIELIBSRC = $(LIBSRC)/Xevie
...@@ -2715,9 +2715,9 @@ XEVIELIBSRC = $(LIBSRC)/Xevie ...@@ -2715,9 +2715,9 @@ XEVIELIBSRC = $(LIBSRC)/Xevie
#ifndef SharedXevieRev #ifndef SharedXevieRev
#define SharedXevieRev 1.0 #define SharedXevieRev 1.0
#endif #endif
SharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) SharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev)
#else #else
ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),XBuildLibDir)
#endif #endif
XCURSORLIBSRC = $(LIBSRC)/Xcursor XCURSORLIBSRC = $(LIBSRC)/Xcursor
...@@ -2725,9 +2725,9 @@ ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir) ...@@ -2725,9 +2725,9 @@ ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir)
#ifndef SharedXcursorRev #ifndef SharedXcursorRev
#define SharedXcursorRev 1.0.2 #define SharedXcursorRev 1.0.2
#endif #endif
SharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev) SharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev)
#else #else
ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),XBuildLibDir)
#endif #endif
APPLEWMLIBSRC = $(LIBSRC)/apple APPLEWMLIBSRC = $(LIBSRC)/apple
...@@ -2735,9 +2735,9 @@ ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir) ...@@ -2735,9 +2735,9 @@ ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir)
#ifndef SharedAppleWMRev #ifndef SharedAppleWMRev
#define SharedAppleWMRev 1.0 #define SharedAppleWMRev 1.0
#endif #endif
SharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev) SharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev)
#else #else
ProjectUnsharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),XBuildLibDir)
#endif #endif
WINDOWSWMLIBSRC = $(LIBSRC)/windows WINDOWSWMLIBSRC = $(LIBSRC)/windows
...@@ -2745,9 +2745,9 @@ ProjectUnsharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) ...@@ -2745,9 +2745,9 @@ ProjectUnsharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),XBuildLibDir)
#ifndef SharedWindowsWMRev #ifndef SharedWindowsWMRev
#define SharedWindowsWMRev 1.0 #define SharedWindowsWMRev 1.0
#endif #endif
SharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev) SharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev)
#else #else
ProjectUnsharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir)
#endif #endif
# ifndef SharedLibXfontcache # ifndef SharedLibXfontcache
...@@ -2768,9 +2768,9 @@ ProjectUnsharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir ...@@ -2768,9 +2768,9 @@ ProjectUnsharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir
#ifndef SharedXfontcacheRev #ifndef SharedXfontcacheRev
#define SharedXfontcacheRev 1.2 #define SharedXfontcacheRev 1.2
#endif #endif
SharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev) SharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev)
#else #else
ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir)
#endif #endif
#ifndef SharedLibXau #ifndef SharedLibXau
...@@ -2790,12 +2790,12 @@ ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLib ...@@ -2790,12 +2790,12 @@ ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLib
#ifndef SharedXauRev #ifndef SharedXauRev
#define SharedXauRev 6.0 #define SharedXauRev 6.0
#endif #endif
SharedLibReferences(XAUTH,Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev) SharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev)
#else #else
#if !UseInstalledXauLib #if !UseInstalledXauLib
ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),XBuildLibDir) ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),XBuildLibDir)
#else #else
ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR)) ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR))
#endif #endif
#endif #endif
...@@ -2816,12 +2816,12 @@ ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR)) ...@@ -2816,12 +2816,12 @@ ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR))
#ifndef SharedXdmcpRev #ifndef SharedXdmcpRev
#define SharedXdmcpRev 6.0 #define SharedXdmcpRev 6.0
#endif #endif
SharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev) SharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev)
#else #else
#if !UseInstalledXdmcpLib #if !UseInstalledXdmcpLib
ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),XBuildLibDir)
#else #else
ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR))
#endif #endif
#endif #endif
...@@ -2842,9 +2842,9 @@ ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) ...@@ -2842,9 +2842,9 @@ ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR))
#ifndef SharedXmuRev #ifndef SharedXmuRev
#define SharedXmuRev 6.2 #define SharedXmuRev 6.2
#endif #endif
SharedDSLibReferences(XMU,Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev) SharedDSLibReferences(XMU,NX_Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev)
#else #else
ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir) ProjectUnsharedLibReferences(XMU,NX_Xmu,$(XMUSRC),XBuildLibDir)
#endif #endif
#ifndef SharedLibXmuu #ifndef SharedLibXmuu
...@@ -2864,9 +2864,9 @@ ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir) ...@@ -2864,9 +2864,9 @@ ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir)
#ifndef SharedXmuuRev #ifndef SharedXmuuRev
#define SharedXmuuRev 1.0 #define SharedXmuuRev 1.0
#endif #endif
SharedLibReferences(XMUU,Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) SharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev)
#else #else
ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir) ProjectUnsharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),XBuildLibDir)
#endif #endif
#ifndef SharedOldX #ifndef SharedOldX
...@@ -2886,9 +2886,9 @@ ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir) ...@@ -2886,9 +2886,9 @@ ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir)
#ifndef SharedOldXRev #ifndef SharedOldXRev
#define SharedOldXRev 6.0 #define SharedOldXRev 6.0
#endif #endif
SharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev)
#else #else
ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir)
#endif #endif
#ifndef SharedLibXp #ifndef SharedLibXp
...@@ -2908,9 +2908,9 @@ ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir) ...@@ -2908,9 +2908,9 @@ ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir)
#ifndef SharedXpRev #ifndef SharedXpRev
#define SharedXpRev 6.2 #define SharedXpRev 6.2
#endif #endif
SharedLibReferences(XP,Xp,$(XPLIBSRC),SOXPREV,SharedXpRev) SharedLibReferences(XP,NX_Xp,$(XPLIBSRC),SOXPREV,SharedXpRev)
#else #else
ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XP,NX_Xp,$(XPLIBSRC),XBuildLibDir)
#endif #endif
#ifndef SharedLibXt #ifndef SharedLibXt
...@@ -2930,9 +2930,9 @@ ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir) ...@@ -2930,9 +2930,9 @@ ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir)
#ifndef SharedXtRev #ifndef SharedXtRev
#define SharedXtRev 6.0 #define SharedXtRev 6.0
#endif #endif
SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) SharedDSLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev)
#else #else
ProjectUnsharedLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),XBuildLibDir) ProjectUnsharedLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),XBuildLibDir)
#endif #endif
DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB)
XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB)
...@@ -2956,9 +2956,9 @@ ProjectUnsharedLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),XBuildLibDir) ...@@ -2956,9 +2956,9 @@ ProjectUnsharedLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),XBuildLibDir)
#ifndef SharedXaRev #ifndef SharedXaRev
#define SharedXaRev 1.0 #define SharedXaRev 1.0
#endif #endif
SharedLibReferences(XA,Xa,$(XALIBSRC),SOXAREV,SharedXaRev) SharedLibReferences(XA,NX_Xa,$(XALIBSRC),SOXAREV,SharedXaRev)
#else #else
UnsharedLibReferences(XA,Xa,$(XALIBSRC)) UnsharedLibReferences(XA,NX_Xa,$(XALIBSRC))
#endif #endif
#ifndef BuildXaw #ifndef BuildXaw
...@@ -2985,9 +2985,9 @@ UnsharedLibReferences(XA,Xa,$(XALIBSRC)) ...@@ -2985,9 +2985,9 @@ UnsharedLibReferences(XA,Xa,$(XALIBSRC))
#ifndef SharedXawRev #ifndef SharedXawRev
#define SharedXawRev 8.0 #define SharedXawRev 8.0
#endif #endif
SharedDSLibReferences(XAW,Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev)
#else #else
ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir) ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),XBuildLibDir)
#endif #endif
#endif #endif
...@@ -3013,14 +3013,14 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir) ...@@ -3013,14 +3013,14 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir)
#ifndef SharedXaw7Rev #ifndef SharedXaw7Rev
#define SharedXaw7Rev 7.0 #define SharedXaw7Rev 7.0
#endif #endif
SharedDSLibReferences(XAW7,Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev) SharedDSLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev)
#if !BuildXaw #if !BuildXaw
SharedDSLibReferences(XAW,Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev) SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev)
#endif #endif
#else #else
ProjectUnsharedLibReferences(XAW7,Xaw,$(AWIDGET7SRC),XBuildLibDir) ProjectUnsharedLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir)
#if !BuildXaw #if !BuildXaw
ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET7SRC),XBuildLibDir) ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir)
#endif #endif
#endif #endif
#endif #endif
...@@ -3048,14 +3048,14 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET7SRC),XBuildLibDir) ...@@ -3048,14 +3048,14 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET7SRC),XBuildLibDir)
#ifndef SharedXaw6Rev #ifndef SharedXaw6Rev
#define SharedXaw6Rev 6.1 #define SharedXaw6Rev 6.1
#endif #endif
SharedDSLibReferences(XAW6,Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev) SharedDSLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev)
#if !BuildXaw && !BuildXaw7 #if !BuildXaw && !BuildXaw7
SharedDSLibReferences(XAW,Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev) SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev)
#endif #endif
#else #else
ProjectUnsharedLibReferences(XAW6,Xaw,$(AWIDGET6SRC),XBuildLibDir) ProjectUnsharedLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir)
#if !BuildXaw && !BuildXaw7 #if !BuildXaw && !BuildXaw7
ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET6SRC),XBuildLibDir) ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir)
#endif #endif
#endif #endif
#endif #endif
...@@ -3077,9 +3077,9 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET6SRC),XBuildLibDir) ...@@ -3077,9 +3077,9 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET6SRC),XBuildLibDir)
#ifndef SharedXiRev #ifndef SharedXiRev
#define SharedXiRev 6.0 #define SharedXiRev 6.0
#endif #endif
SharedLibReferences(XI,Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev) SharedLibReferences(XI,NX_Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev)
#else #else
ProjectUnsharedLibReferences(XI,Xi,$(XILIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XI,NX_Xi,$(XILIBSRC),XBuildLibDir)
#endif #endif
#ifndef SharedLibXtst #ifndef SharedLibXtst
...@@ -3099,12 +3099,12 @@ ProjectUnsharedLibReferences(XI,Xi,$(XILIBSRC),XBuildLibDir) ...@@ -3099,12 +3099,12 @@ ProjectUnsharedLibReferences(XI,Xi,$(XILIBSRC),XBuildLibDir)
#ifndef SharedXtstRev #ifndef SharedXtstRev
#define SharedXtstRev 6.1 #define SharedXtstRev 6.1
#endif #endif
SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) SharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev)
#else #else
ProjectUnsharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),XBuildLibDir)
#endif #endif
ProjectUnsharedLibReferences(XBSD,Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) ProjectUnsharedLibReferences(XBSD,NX_Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir)
#ifndef SharedLibICE #ifndef SharedLibICE
#define SharedLibICE HasSharedLibraries #define SharedLibICE HasSharedLibraries
...@@ -3123,9 +3123,9 @@ ProjectUnsharedLibReferences(XBSD,Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) ...@@ -3123,9 +3123,9 @@ ProjectUnsharedLibReferences(XBSD,Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir)
#ifndef SharedICERev #ifndef SharedICERev
#define SharedICERev 6.4 #define SharedICERev 6.4
#endif #endif
SharedLibReferences(ICE,ICE,$(ICESRC),SOICEREV,SharedICERev) SharedLibReferences(ICE,NX_ICE,$(ICESRC),SOICEREV,SharedICERev)
#else #else
ProjectUnsharedLibReferences(ICE,ICE,$(ICESRC),XBuildLibDir) ProjectUnsharedLibReferences(ICE,NX_ICE,$(ICESRC),XBuildLibDir)
#endif #endif
#ifndef SharedLibSM #ifndef SharedLibSM
...@@ -3145,9 +3145,9 @@ ProjectUnsharedLibReferences(ICE,ICE,$(ICESRC),XBuildLibDir) ...@@ -3145,9 +3145,9 @@ ProjectUnsharedLibReferences(ICE,ICE,$(ICESRC),XBuildLibDir)
#ifndef SharedSMRev #ifndef SharedSMRev
#define SharedSMRev 6.0 #define SharedSMRev 6.0
#endif #endif
SharedLibReferences(SM,SM,$(SMSRC),SOSMREV,SharedSMRev) SharedLibReferences(SM,NX_SM,$(SMSRC),SOSMREV,SharedSMRev)
#else #else
ProjectUnsharedLibReferences(SM,SM,$(SMSRC),XBuildLibDir) ProjectUnsharedLibReferences(SM,NX_SM,$(SMSRC),XBuildLibDir)
#endif #endif
#ifndef SharedLibXkey #ifndef SharedLibXkey
...@@ -3167,9 +3167,9 @@ ProjectUnsharedLibReferences(SM,SM,$(SMSRC),XBuildLibDir) ...@@ -3167,9 +3167,9 @@ ProjectUnsharedLibReferences(SM,SM,$(SMSRC),XBuildLibDir)
#ifndef SharedXkeyRev #ifndef SharedXkeyRev
#define SharedXkeyRev 6.0 #define SharedXkeyRev 6.0
#endif #endif
SharedLibReferences(XKEY,Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev) SharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev)
#else #else
ProjectUnsharedLibReferences(XKEY,Xkey,$(XKEYSRC),XBuildLibDir) ProjectUnsharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),XBuildLibDir)
#endif #endif
#ifndef SharedLibFS #ifndef SharedLibFS
...@@ -3189,9 +3189,9 @@ ProjectUnsharedLibReferences(XKEY,Xkey,$(XKEYSRC),XBuildLibDir) ...@@ -3189,9 +3189,9 @@ ProjectUnsharedLibReferences(XKEY,Xkey,$(XKEYSRC),XBuildLibDir)
#ifndef SharedFSRev #ifndef SharedFSRev
#define SharedFSRev 6.0 #define SharedFSRev 6.0
#endif #endif
SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev) SharedLibReferences(FS,NX_FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
#else #else
ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(FS,NX_FS,$(FSLIBSRC),XBuildLibDir)
#endif #endif
#ifndef SharedLibFont #ifndef SharedLibFont
...@@ -3212,14 +3212,14 @@ ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir) ...@@ -3212,14 +3212,14 @@ ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir)
#define SharedFontRev 1.5 #define SharedFontRev 1.5
#endif #endif
SharedFontLibReferences() SharedFontLibReferences()
XCOMM SharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev) XCOMM SharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev)
#else #else
ProjectUnsharedFontLibReferences() ProjectUnsharedFontLibReferences()
XCOMM ProjectUnsharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),XBuildLibDir) XCOMM ProjectUnsharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),XBuildLibDir)
#endif #endif
FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs
ProjectUnsharedLibReferences(FONTSTUB,fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(FONTSTUB,NX_fntstubs,$(FONTSUBLIBSRC),XBuildLibDir)
DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB)
FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB)
...@@ -3241,9 +3241,9 @@ ProjectUnsharedLibReferences(FONTSTUB,fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) ...@@ -3241,9 +3241,9 @@ ProjectUnsharedLibReferences(FONTSTUB,fntstubs,$(FONTSUBLIBSRC),XBuildLibDir)
#ifndef SharedFontEncRev #ifndef SharedFontEncRev
#define SharedFontEncRev 1.0 #define SharedFontEncRev 1.0
#endif #endif
SharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev) SharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev)
#else #else
ProjectUnsharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),XBuildLibDir)
#endif #endif
#ifndef SharedLibXpm #ifndef SharedLibXpm
...@@ -3263,9 +3263,9 @@ ProjectUnsharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),XBuildLibDir) ...@@ -3263,9 +3263,9 @@ ProjectUnsharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),XBuildLibDir)
#ifndef SharedXpmRev #ifndef SharedXpmRev
#define SharedXpmRev 4.11 #define SharedXpmRev 4.11
#endif #endif
SharedLibReferences(XPM,Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) SharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev)
#else #else
ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),XBuildLibDir)
#endif #endif
#if UseFreetype2 #if UseFreetype2
...@@ -3313,9 +3313,9 @@ ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir) ...@@ -3313,9 +3313,9 @@ ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir)
#define SharedFreetype2Rev 9.0 #define SharedFreetype2Rev 9.0
#endif #endif
#endif #endif
SharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) SharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev)
#else #else
ProjectUnsharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),XBuildLibDir)
#endif #endif
#ifdef UseInstalled #ifdef UseInstalled
...@@ -3470,9 +3470,9 @@ MOTIFINCLUDES = -I$(MOTIFINCDIR) ...@@ -3470,9 +3470,9 @@ MOTIFINCLUDES = -I$(MOTIFINCDIR)
#define SharedExpatRev 4.0 #define SharedExpatRev 4.0
#endif #endif
#endif #endif
SharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev) SharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev)
#else #else
ProjectUnsharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),XBuildLibDir)
#endif #endif
#if UseExpat #if UseExpat
...@@ -3552,9 +3552,9 @@ EXPATDEFINES = -DEXPAT ...@@ -3552,9 +3552,9 @@ EXPATDEFINES = -DEXPAT
#ifndef SharedXft1Rev #ifndef SharedXft1Rev
#define SharedXft1Rev 1.1 #define SharedXft1Rev 1.1
#endif #endif
SharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev) SharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev)
#else #else
ProjectUnsharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),XBuildLibDir)
#endif #endif
#ifndef Xft1ClientDepLibs #ifndef Xft1ClientDepLibs
...@@ -3589,9 +3589,9 @@ ProjectUnsharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),XBuildLibDir) ...@@ -3589,9 +3589,9 @@ ProjectUnsharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),XBuildLibDir)
#ifndef SharedXftRev #ifndef SharedXftRev
#define SharedXftRev 2.1.2 #define SharedXftRev 2.1.2
#endif #endif
SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) SharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev)
#else #else
ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),XBuildLibDir)
#endif #endif
#ifndef XftClientDepLibs #ifndef XftClientDepLibs
...@@ -3622,9 +3622,9 @@ ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) ...@@ -3622,9 +3622,9 @@ ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir)
#ifndef SharedFontconfigRev #ifndef SharedFontconfigRev
#define SharedFontconfigRev 1.0.4 #define SharedFontconfigRev 1.0.4
#endif #endif
SharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev) SharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev)
#else #else
ProjectUnsharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir)
#endif #endif
#ifdef UseInstalled #ifdef UseInstalled
...@@ -3827,9 +3827,9 @@ LIBPNGLIB = -L$(LIBPNGLIBDIR) LinkerRuntimeLibraryPathFlag($(LIBPNGLIBDIR)) -lpn ...@@ -3827,9 +3827,9 @@ LIBPNGLIB = -L$(LIBPNGLIBDIR) LinkerRuntimeLibraryPathFlag($(LIBPNGLIBDIR)) -lpn
# ifndef SharedxkbfileRev # ifndef SharedxkbfileRev
# define SharedxkbfileRev 1.0 # define SharedxkbfileRev 1.0
# endif # endif
SharedLibReferences(XKBFILE,xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev) SharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev)
#else #else
ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILELIBSRC),XBuildLibDir)
#endif #endif
#if BuildXKBlib #if BuildXKBlib
...@@ -3899,9 +3899,9 @@ ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir) ...@@ -3899,9 +3899,9 @@ ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir)
# ifndef SharedxkbuiRev # ifndef SharedxkbuiRev
# define SharedxkbuiRev 1.0 # define SharedxkbuiRev 1.0
# endif # endif
SharedLibReferences(XKBUI,xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev) SharedLibReferences(XKBUI,NX_xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev)
#else #else
ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XKBUI,NX_xkbui,$(XKBUILIBSRC),XBuildLibDir)
#endif #endif
#ifndef XkbuiLibs #ifndef XkbuiLibs
...@@ -3974,9 +3974,9 @@ EXTRAXAWCLIENTLIBS = ExtraXawClientLibs ...@@ -3974,9 +3974,9 @@ EXTRAXAWCLIENTLIBS = ExtraXawClientLibs
#ifndef SharedXTrapRev #ifndef SharedXTrapRev
#define SharedXTrapRev 6.4 #define SharedXTrapRev 6.4
#endif #endif
SharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev) SharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev)
#else #else
ProjectUnsharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),XBuildLibDir)
#endif #endif
#ifndef NeedDefaultDepLibs #ifndef NeedDefaultDepLibs
......
nx-X11/config/cf/lnxLib.rules
View file @ c4a8556c
...@@ -389,7 +389,7 @@ JUMP_LDLIBS_libc = `$(CC) --print-libgcc-file-name` -lc ...@@ -389,7 +389,7 @@ JUMP_LDLIBS_libc = `$(CC) --print-libgcc-file-name` -lc
XCOMM libX11.so (X11, SM, ICE) XCOMM libX11.so (X11, SM, ICE)
JUMP_ROOT_X11 = $(XLIBSRC) JUMP_ROOT_X11 = $(XLIBSRC)
JUMP_IS_HOST_X11 = YES JUMP_IS_HOST_X11 = YES
JUMP_STUBLIBS_X11 = libX11.sa libSM.sa libICE.sa JUMP_STUBLIBS_X11 = libNX_X11.sa libNX_SM.sa libNX_ICE.sa
JUMP_SIBDIRS_X11 = $(JUMP_ROOT_SM) $(JUMP_ROOT_ICE) JUMP_SIBDIRS_X11 = $(JUMP_ROOT_SM) $(JUMP_ROOT_ICE)
JUMP_DIR_X11 = $(JUMP_ROOT_X11)/shared JUMP_DIR_X11 = $(JUMP_ROOT_X11)/shared
JUMP_DEFS_X11 = $(XDMAUTHDEFS) $(XKB_DEFINES) JUMP_DEFS_X11 = $(XDMAUTHDEFS) $(XKB_DEFINES)
...@@ -400,9 +400,9 @@ JUMP_EXPORT_X11 = $(JUMP_DIR_X11)/jump.vars ...@@ -400,9 +400,9 @@ JUMP_EXPORT_X11 = $(JUMP_DIR_X11)/jump.vars
JUMP_ADDRESS_X11 = 0x60200000 JUMP_ADDRESS_X11 = 0x60200000
JUMP_JUMPTABLESIZE_X11 = 0x4000 JUMP_JUMPTABLESIZE_X11 = 0x4000
JUMP_GOTSIZE_X11 = 4096 JUMP_GOTSIZE_X11 = 4096
JUMP_STUBNAMES_X11 = libX11 libSM libICE JUMP_STUBNAMES_X11 = libNX_X11 libNX_SM libNX_ICE
JUMP_STUBS_IMPORT_X11 = $(LIBC_SA) JUMP_STUBS_IMPORT_X11 = $(LIBC_SA)
JUMP_SIBARS_X11 = jump/libSM.a~ jump/libICE.a~ JUMP_SIBARS_X11 = jump/libNX_SM.a~ jump/libNX_ICE.a~
JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc) JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc)
XCOMM libSM (part of libX11.so) XCOMM libSM (part of libX11.so)
...@@ -435,9 +435,9 @@ JUMP_JUMPTABLESIZE_Xt = 0x4000 ...@@ -435,9 +435,9 @@ JUMP_JUMPTABLESIZE_Xt = 0x4000
JUMP_GOTSIZE_Xt = 4096 JUMP_GOTSIZE_Xt = 4096
JUMP_STUBNAMES_Xt = libXt libXmu libXext libXi libXtst libXp JUMP_STUBNAMES_Xt = libXt libXmu libXext libXi libXtst libXp
JUMP_STUBS_IMPORT_Xt = $(JUMP_STUBS_IMPORT_X11) JUMP_STUBS_IMPORT_Xt = $(JUMP_STUBS_IMPORT_X11)
JUMP_SIBARS_Xt = jump/libXmu.a~ jump/libXext.a~ jump/libXi.a~ jump/libXtst.a~ jump/libXp.a~ 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)/libICE.sa \ JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libNX_ICE.sa \
$(JUMP_ROOT_SM)/libSM.sa $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc) $(JUMP_ROOT_SM)/libNX_SM.sa $(JUMP_ROOT_X11)/libNX_X11.sa $(JUMP_LDLIBS_libc)
XCOMM libXmu (part of libXt.so) XCOMM libXmu (part of libXt.so)
JUMP_ROOT_Xmu = $(XMUSRC) JUMP_ROOT_Xmu = $(XMUSRC)
...@@ -485,8 +485,8 @@ JUMP_JUMPTABLESIZE_Xaw = 0x4000 ...@@ -485,8 +485,8 @@ JUMP_JUMPTABLESIZE_Xaw = 0x4000
JUMP_GOTSIZE_Xaw = 4096 JUMP_GOTSIZE_Xaw = 4096
JUMP_STUBNAMES_Xaw = libXaw JUMP_STUBNAMES_Xaw = libXaw
JUMP_STUBS_IMPORT_Xaw = $(JUMP_STUBS_IMPORT_X11) JUMP_STUBS_IMPORT_Xaw = $(JUMP_STUBS_IMPORT_X11)
JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libXt.sa $(JUMP_ROOT_Xt)/libXmu.sa \ JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libNX_Xt.sa $(JUMP_ROOT_Xt)/libNX_Xmu.sa \
$(JUMP_ROOT_Xt)/libXext.sa $(JUMP_ROOT_X11)/libX11.sa \ $(JUMP_ROOT_Xt)/libNX_Xext.sa $(JUMP_ROOT_X11)/libNX_X11.sa \
$(JUMP_LDLIBS_libc) $(JUMP_LDLIBS_libc)
# endif /* !UseInstalled */ # endif /* !UseInstalled */
......
nx-X11/config/cf/lnxLib.tmpl
View file @ c4a8556c
...@@ -9,7 +9,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ ...@@ -9,7 +9,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
#ifndef FixupLibReferences #ifndef FixupLibReferences
#define FixupLibReferences() @@\ #define FixupLibReferences() @@\
XMULIBONLY = -lXmu @@\ XMULIBONLY = -lNX_Xmu @@\
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#endif #endif
...@@ -66,7 +66,7 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) ...@@ -66,7 +66,7 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#ifndef FixupLibReferences #ifndef FixupLibReferences
#define FixupLibReferences() @@\ #define FixupLibReferences() @@\
XMULIB = -lXmu $(XLIB) XMULIB = -lNX_Xmu $(XLIB)
#endif #endif
#endif /* UseElfFormat */ #endif /* UseElfFormat */
......
nx-X11/lib/X11/Imakefile
View file @ c4a8556c
...@@ -82,7 +82,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status ...@@ -82,7 +82,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status
#define DoExtraLib SharedLibX11 #define DoExtraLib SharedLibX11
#define DoDebugLib DebugLibX11 #define DoDebugLib DebugLibX11
#define DoProfileLib ProfileLibX11 #define DoProfileLib ProfileLibX11
#define LibName X11 #define LibName NX_X11
#define SoRev SOXLIBREV #define SoRev SOXLIBREV
#define HugeLibrary YES #define HugeLibrary YES
#define IncSubdir X11 #define IncSubdir X11
......
nx-X11/lib/XRes/Imakefile
View file @ c4a8556c
...@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/XRes/Imakefile,v 1.3 2003/10/13 21:19:28 herrb Exp $ ...@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/XRes/Imakefile,v 1.3 2003/10/13 21:19:28 herrb Exp $
#define DoSharedLib SharedLibXRes #define DoSharedLib SharedLibXRes
#define DoDebugLib DebugLibXRes #define DoDebugLib DebugLibXRes
#define DoProfileLib ProfileLibXRes #define DoProfileLib ProfileLibXRes
#define LibName XRes #define LibName NX_XRes
#define SoRev SOXRESREV #define SoRev SOXRESREV
#define LibHeaders NO #define LibHeaders NO
......
nx-X11/lib/Xau/Imakefile
View file @ c4a8556c
...@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.5 1999/04/17 09:08:11 dawes Exp $ ...@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.5 1999/04/17 09:08:11 dawes Exp $
#define DoExtraLib SharedLibXau #define DoExtraLib SharedLibXau
#define DoDebugLib DebugLibXau #define DoDebugLib DebugLibXau
#define DoProfileLib ProfileLibXau #define DoProfileLib ProfileLibXau
#define LibName Xau #define LibName NX_Xau
#define SoRev SOXAUTHREV #define SoRev SOXAUTHREV
#define IncSubdir X11 #define IncSubdir X11
......
nx-X11/lib/Xcomposite/Imakefile
View file @ c4a8556c
...@@ -14,7 +14,7 @@ SOXCOMPOSITEREV=1.0.0 ...@@ -14,7 +14,7 @@ SOXCOMPOSITEREV=1.0.0
#define DoDebugLib DebugLibXcomposite #define DoDebugLib DebugLibXcomposite
#define DoProfileLib ProfileLibXcomposite #define DoProfileLib ProfileLibXcomposite
#define LibName Xcomposite #define LibName NX_Xcomposite
#define SoRev SOXCOMPOSITEREV #define SoRev SOXCOMPOSITEREV
#define IncSubdir X11 #define IncSubdir X11
#define IncSubSubdir extensions #define IncSubSubdir extensions
......
nx-X11/lib/Xcomposite/xcomposite.pc.in
View file @ c4a8556c
...@@ -7,4 +7,4 @@ Name: Xcomposite ...@@ -7,4 +7,4 @@ Name: Xcomposite
Description: X Composite Library Description: X Composite Library
Version: @VERSION@ Version: @VERSION@
Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ @X_CFLAGS@ Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ @X_CFLAGS@
Libs: -L${libdir} -lXcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ Libs: -L${libdir} -lNX_Xcomposite @XCOMPOSITE_LIBS@ @X_LIBS@
nx-X11/lib/Xcursor/Imakefile
View file @ c4a8556c
...@@ -15,7 +15,7 @@ SOXCURSORREV=1.0.2 ...@@ -15,7 +15,7 @@ SOXCURSORREV=1.0.2
#define DoDebugLib DebugLibXcursor #define DoDebugLib DebugLibXcursor
#define DoProfileLib ProfileLibXcursor #define DoProfileLib ProfileLibXcursor
#define LibName Xcursor #define LibName NX_Xcursor
#define SoRev SOXCURSORREV #define SoRev SOXCURSORREV
#define IncSubdir X11 #define IncSubdir X11
#define IncSubSubdir Xcursor #define IncSubSubdir Xcursor
......
nx-X11/lib/Xcursor/xcursor.pc.in
View file @ c4a8556c
...@@ -12,4 +12,4 @@ Description: X Cursor Library ...@@ -12,4 +12,4 @@ Description: X Cursor Library
Version: @VERSION@ Version: @VERSION@
Requires: xrender Requires: xrender
Cflags: -I${includedir} ${xrendercflags} ${xcflags} Cflags: -I${includedir} ${xrendercflags} ${xcflags}
Libs: -L${libdir} -lXcursor ${xrenderlibs} ${xlibs} Libs: -L${libdir} -lNX_Xcursor ${xrenderlibs} ${xlibs}
nx-X11/lib/Xdamage/Imakefile
View file @ c4a8556c
...@@ -14,7 +14,7 @@ SOXDAMAGEREV=1.0.1 ...@@ -14,7 +14,7 @@ SOXDAMAGEREV=1.0.1
#define DoDebugLib DebugLibXdamage #define DoDebugLib DebugLibXdamage
#define DoProfileLib ProfileLibXdamage #define DoProfileLib ProfileLibXdamage
#define LibName Xdamage #define LibName NX_Xdamage
#define SoRev SOXDAMAGEREV #define SoRev SOXDAMAGEREV
#define IncSubdir X11 #define IncSubdir X11
#define IncSubSubdir extensions #define IncSubSubdir extensions
......
nx-X11/lib/Xdamage/xdamage.pc.in
View file @ c4a8556c
...@@ -7,4 +7,4 @@ Name: Xdamage ...@@ -7,4 +7,4 @@ Name: Xdamage
Description: X Damage Library Description: X Damage Library
Version: @VERSION@ Version: @VERSION@
Cflags: -I${includedir} @XDAMAGE_CFLAGS@ @X_CFLAGS@ Cflags: -I${includedir} @XDAMAGE_CFLAGS@ @X_CFLAGS@
Libs: -L${libdir} -lXdamage @XDAMAGE_LIBS@ @X_LIBS@ Libs: -L${libdir} -lNX_Xdamage @XDAMAGE_LIBS@ @X_LIBS@
nx-X11/lib/Xdmcp/Imakefile
View file @ c4a8556c
...@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.4 1999/04/17 09:08:12 dawes Exp $ ...@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.4 1999/04/17 09:08:12 dawes Exp $
#define DoExtraLib SharedLibXdmcp #define DoExtraLib SharedLibXdmcp
#define DoDebugLib DebugLibXdmcp #define DoDebugLib DebugLibXdmcp
#define DoProfileLib ProfileLibXdmcp #define DoProfileLib ProfileLibXdmcp
#define LibName Xdmcp #define LibName NX_Xdmcp
#define SoRev SOXDMCPREV #define SoRev SOXDMCPREV
#define IncSubdir X11 #define IncSubdir X11
......
nx-X11/lib/Xext/Imakefile
View file @ c4a8556c
...@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xext/Imakefile,v 1.12 2002/10/16 00:37:27 dawes Exp $ ...@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xext/Imakefile,v 1.12 2002/10/16 00:37:27 dawes Exp $
#define DoExtraLib SharedLibXext #define DoExtraLib SharedLibXext
#define DoDebugLib DebugLibXext #define DoDebugLib DebugLibXext
#define DoProfileLib ProfileLibXext #define DoProfileLib ProfileLibXext
#define LibName Xext #define LibName NX_Xext
#define SoRev SOXEXTREV #define SoRev SOXEXTREV
#define LibHeaders NO #define LibHeaders NO
......
nx-X11/lib/Xfixes/Imakefile
View file @ c4a8556c
...@@ -14,7 +14,7 @@ SOXFIXESREV=3.0.0 ...@@ -14,7 +14,7 @@ SOXFIXESREV=3.0.0
#define DoDebugLib DebugLibXfixes #define DoDebugLib DebugLibXfixes
#define DoProfileLib ProfileLibXfixes #define DoProfileLib ProfileLibXfixes
#define LibName Xfixes #define LibName NX_Xfixes
#define SoRev SOXFIXESREV #define SoRev SOXFIXESREV
#define IncSubdir X11 #define IncSubdir X11
#define IncSubSubdir extensions #define IncSubSubdir extensions
......
nx-X11/lib/Xfixes/xfixes.pc.in
View file @ c4a8556c
...@@ -7,4 +7,4 @@ Name: Xfixes ...@@ -7,4 +7,4 @@ Name: Xfixes
Description: X Fixes Library Description: X Fixes Library
Version: @VERSION@ Version: @VERSION@
Cflags: -I${includedir} @X_CFLAGS@ Cflags: -I${includedir} @X_CFLAGS@
Libs: -L${libdir} -lXfixes @X_LIBS@ Libs: -L${libdir} -lNX_Xfixes @X_LIBS@
nx-X11/lib/Xinerama/Imakefile
View file @ c4a8556c
...@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xinerama/Imakefile,v 1.4 2002/10/16 00:37:31 dawes Exp $ ...@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xinerama/Imakefile,v 1.4 2002/10/16 00:37:31 dawes Exp $
#define DoSharedLib SharedLibXinerama #define DoSharedLib SharedLibXinerama
#define DoDebugLib DebugLibXinerama #define DoDebugLib DebugLibXinerama
#define DoProfileLib ProfileLibXinerama #define DoProfileLib ProfileLibXinerama
#define LibName Xinerama #define LibName NX_Xinerama
#define SoRev SOXINERAMAREV #define SoRev SOXINERAMAREV
#define LibHeaders NO #define LibHeaders NO
......
nx-X11/lib/Xpm/Imakefile
View file @ c4a8556c
...@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1.1 1999/01/11 14:40:02 dawes Exp $ ...@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1.1 1999/01/11 14:40:02 dawes Exp $
#define DoDebugLib DebugLibXpm #define DoDebugLib DebugLibXpm
#define DoProfileLib ProfileLibXpm #define DoProfileLib ProfileLibXpm
#define HasSharedData NO #define HasSharedData NO
#define LibName Xpm #define LibName NX_Xpm
#define SoRev SOXPMREV #define SoRev SOXPMREV
#define IncSubdir X11 #define IncSubdir X11
......
nx-X11/lib/Xrandr/Imakefile
View file @ c4a8556c
...@@ -5,7 +5,7 @@ XCOMM $XdotOrg: xc/lib/Xrandr/Imakefile,v 1.5 2005/10/24 23:30:21 alanc Exp $ ...@@ -5,7 +5,7 @@ XCOMM $XdotOrg: xc/lib/Xrandr/Imakefile,v 1.5 2005/10/24 23:30:21 alanc Exp $
#define DoSharedLib SharedLibXrandr #define DoSharedLib SharedLibXrandr
#define DoDebugLib DebugLibXrandr #define DoDebugLib DebugLibXrandr
#define DoProfileLib ProfileLibXrandr #define DoProfileLib ProfileLibXrandr
#define LibName Xrandr #define LibName NX_Xrandr
#define SoRev SOXRANDRREV #define SoRev SOXRANDRREV
#define IncSubdir X11 #define IncSubdir X11
#define IncSubSubdir extensions #define IncSubSubdir extensions
......
nx-X11/lib/Xrender/Imakefile
View file @ c4a8556c
...@@ -74,7 +74,7 @@ clean:: ...@@ -74,7 +74,7 @@ clean::
#define DoSharedLib SharedLibXrender #define DoSharedLib SharedLibXrender
#define DoDebugLib DebugLibXrender #define DoDebugLib DebugLibXrender
#define DoProfileLib ProfileLibXrender #define DoProfileLib ProfileLibXrender
#define LibName Xrender #define LibName NX_Xrender
#define SoRev SOXRENDERREV #define SoRev SOXRENDERREV
#ifdef XBuildIncDir #ifdef XBuildIncDir
......
nx-X11/lib/Xrender/xrender.pc.in
View file @ c4a8556c
...@@ -8,4 +8,4 @@ Description: X Render Library ...@@ -8,4 +8,4 @@ Description: X Render Library
Version: @VERSION@ Version: @VERSION@
Requires: @X_REQUIRES@ Requires: @X_REQUIRES@
Cflags: -I${includedir} @RENDER_CFLAGS@ @X_NON_PKG_CFLAGS@ Cflags: -I${includedir} @RENDER_CFLAGS@ @X_NON_PKG_CFLAGS@
Libs: -L${libdir} -lXrender @X_NON_PKG_LIBS@ Libs: -L${libdir} -lNX_Xrender @X_NON_PKG_LIBS@
nx-X11/lib/Xtst/Imakefile
View file @ c4a8556c
...@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xtst/Imakefile,v 1.2 1998/12/20 11:57:12 dawes Exp $ ...@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xtst/Imakefile,v 1.2 1998/12/20 11:57:12 dawes Exp $
#define DoExtraLib SharedLibXtst #define DoExtraLib SharedLibXtst
#define DoDebugLib DebugLibXtst #define DoDebugLib DebugLibXtst
#define DoProfileLib ProfileLibXtst #define DoProfileLib ProfileLibXtst
#define LibName Xtst #define LibName NX_Xtst
#define SoRev SOXTESTREV #define SoRev SOXTESTREV
#define LibHeaders NO #define LibHeaders NO
......
nx-X11/lib/font/Imakefile
View file @ c4a8556c
...@@ -31,7 +31,7 @@ XCOMM $XFree86: xc/lib/font/Imakefile,v 3.37 2003/10/24 16:21:12 tsi Exp $ ...@@ -31,7 +31,7 @@ XCOMM $XFree86: xc/lib/font/Imakefile,v 3.37 2003/10/24 16:21:12 tsi Exp $
STUBDIRS = stubs STUBDIRS = stubs
#endif #endif
LIBNAME = Xfont LIBNAME = NX_Xfont
SOREV = $(SOFONTREV) SOREV = $(SOFONTREV)
#ifndef SeparateSharedCompile #ifndef SeparateSharedCompile
......
nx-X11/lib/oldX/Imakefile
View file @ c4a8556c
...@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/oldX/Imakefile,v 1.2 1998/12/20 11:57:19 dawes Exp $ ...@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/oldX/Imakefile,v 1.2 1998/12/20 11:57:19 dawes Exp $
#define DoExtraLib SharedOldX #define DoExtraLib SharedOldX
#define DoDebugLib DebugOldX #define DoDebugLib DebugOldX
#define DoProfileLib ProfileOldX #define DoProfileLib ProfileOldX
#define LibName oldX #define LibName NX_oldX
#define SoRev SOOLDXREV #define SoRev SOOLDXREV
#define IncSubdir X11 #define IncSubdir X11
......
nx-X11/lib/xkbfile/Imakefile
View file @ c4a8556c
...@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.5 2003/10/15 21:23:38 herrb Exp $ ...@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.5 2003/10/15 21:23:38 herrb Exp $
#define DoDebugLib DebugLibxkbfile #define DoDebugLib DebugLibxkbfile
#define DoProfileLib ProfileLibxkbfile #define DoProfileLib ProfileLibxkbfile
#define HasSharedData NO #define HasSharedData NO
#define LibName xkbfile #define LibName NX_xkbfile
#define SoRev SOXKBFILEREV #define SoRev SOXKBFILEREV
#define IncSubdir X11 #define IncSubdir X11
#define IncSubSubdir extensions #define IncSubSubdir extensions
......
nx-X11/lib/xkbui/Imakefile
View file @ c4a8556c
...@@ -6,7 +6,7 @@ XCOMM $XFree86: xc/lib/xkbui/Imakefile,v 3.4 2003/10/15 21:23:38 herrb Exp $ ...@@ -6,7 +6,7 @@ XCOMM $XFree86: xc/lib/xkbui/Imakefile,v 3.4 2003/10/15 21:23:38 herrb Exp $
#define DoDebugLib DebugLibxkbui #define DoDebugLib DebugLibxkbui
#define DoProfileLib ProfileLibxkbui #define DoProfileLib ProfileLibxkbui
#define HasSharedData NO #define HasSharedData NO
#define LibName xkbui #define LibName NX_xkbui
#define SoRev SOXKBUIREV #define SoRev SOXKBUIREV
#define IncSubdir X11 #define IncSubdir X11
#define IncSubSubdir extensions #define IncSubSubdir extensions
......
nx-X11/programs/Xserver/Imakefile
View file @ c4a8556c
...@@ -313,7 +313,7 @@ XPFBLIBS = dix/LibraryTargetName(xpstubs) ...@@ -313,7 +313,7 @@ XPFBLIBS = dix/LibraryTargetName(xpstubs)
FONTBASE = $(FONTLIBSRC)/fontbase.o \ FONTBASE = $(FONTLIBSRC)/fontbase.o \
$(FONTLIBSRC)/LibraryTargetName(fontbase) $(FONTLIBSRC)/LibraryTargetName(fontbase)
#if XserverStaticFontLib #if XserverStaticFontLib
FONT = $(FONTLIBSRC)/LibraryTargetName(Xfont) $(FREETYPE2LIB) FONT = $(FONTLIBSRC)/LibraryTargetName(NX_Xfont) $(FREETYPE2LIB)
#else #else
FONT = $(LDPRELIB) $(XFONTLIB) $(FREETYPE2LIB) FONT = $(LDPRELIB) $(XFONTLIB) $(FREETYPE2LIB)
#endif #endif
...@@ -994,7 +994,7 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ ...@@ -994,7 +994,7 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \
dix/main.o dix/main.o
#endif #endif
XPMLIB = -lXpm XPMLIB = -lNX_Xpm
NXAGENT = hw/nxagent/LibraryTargetName(nxagent) NXAGENT = hw/nxagent/LibraryTargetName(nxagent)
NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI) NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI)
NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB)
...@@ -1012,18 +1012,18 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) ...@@ -1012,18 +1012,18 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
#if defined(SunArchitecture) #if defined(SunArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
-lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lNX_Xfixes \
-L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp \ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xdmcp \
`pkg-config --libs libxml-2.0` `pkg-config --libs libxml-2.0`
#elif defined(cygwinArchitecture) #elif defined(cygwinArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \
-lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ -lXcomp -lXcompext -lNX_Xrender -lX11 -lNX_Xext -lNX_Xcomposite -lNX_Xfixes \
-L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp \ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdmcp \
`pkg-config --libs libxml-2.0` `pkg-config --libs libxml-2.0`
#else #else
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
-lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xfixes \
-L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp \ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lNX_Xdmcp \
`pkg-config --libs libxml-2.0` `pkg-config --libs libxml-2.0`
#endif #endif
...@@ -1078,7 +1078,7 @@ nxagent_static_nolibs: nxagent ...@@ -1078,7 +1078,7 @@ nxagent_static_nolibs: nxagent
else exit 0; fi else exit 0; fi
$(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \ $(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \
$(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) $(FONTLIBS) \ $(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) $(FONTLIBS) \
$(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lXext -lX11 $(EXTRA_LOAD_FLAGS) $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_Xext -lNX_X11 $(EXTRA_LOAD_FLAGS)
#endif /* NXAgentServer */ #endif /* NXAgentServer */
#if defined(XnonServer) && XnonServer #if defined(XnonServer) && XnonServer
......
nxcompext/Makefile.in
View file @ c4a8556c
...@@ -42,12 +42,12 @@ CCINCLUDES = -I. -I../nxcomp ...@@ -42,12 +42,12 @@ CCINCLUDES = -I. -I../nxcomp
CCDEFINES = CCDEFINES =
LDFLAGS = @LDFLAGS@ -L../nxcomp LDFLAGS = @LDFLAGS@ -L../nxcomp
LIBS = @LIBS@ -lz -lX11 -lXcomp LIBS = @LIBS@ -lz -lNX_X11 -lXcomp
# #
# Only if THREADS is defined # Only if THREADS is defined
# #
# LIBS = @LIBS@ -lz -ljpeg -lpthread -lX11 -lXcomp # LIBS = @LIBS@ -lz -ljpeg -lpthread -lNX_X11 -lXcomp
# #
srcdir = @srcdir@ srcdir = @srcdir@
......
nxcompshad/Makefile.in
View file @ c4a8556c
...@@ -48,7 +48,7 @@ CCINCLUDES = ...@@ -48,7 +48,7 @@ CCINCLUDES =
CCDEFINES = CCDEFINES =
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ -lX11 LIBS = @LIBS@ -lNX_X11
# #
# Only if THREADS is defined. # Only if THREADS is defined.
...@@ -139,7 +139,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL) ...@@ -139,7 +139,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL)
else else
EXTRALIBS = -lXtst -lXrandr -lXdamage EXTRALIBS = -lNX_Xtst -lNX_Xrandr -lNX_Xdamage
all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE)
......
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