diff options
Diffstat (limited to 'nx-X11/config/cf')
26 files changed, 225 insertions, 226 deletions
diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules index 3923e4a10..21c223d8e 100644 --- a/nx-X11/config/cf/Imake.rules +++ b/nx-X11/config/cf/Imake.rules @@ -2124,9 +2124,9 @@ LintLibReferences(varname,libname,libsource) */ #ifndef ProjectUnsharedFontLibReferences #define ProjectUnsharedFontLibReferences() @@\ -DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(NX_Xfont)) @@\ -FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ -LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) +DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(Xfont)) @@\ +FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ +LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) #endif /* @@ -2142,9 +2142,9 @@ LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) #ifndef SharedFontLibReferences #define SharedFontLibReferences() @@\ SOFONTREV = SharedFontRev @@\ -DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\ -FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ -LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) +DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\ +FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ +LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) #endif /* diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 8390b61d4..26811085d 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -820,12 +820,12 @@ TCLIBDIR = TclLibDir #ifndef UsrLibDir #ifdef ProjectRoot -#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx) +#define UsrLibDir Concat3(ProjectRoot,/,LibDirName) #ifndef AlternateUsrLibDir #define AlternateUsrLibDir YES #endif #else -#define UsrLibDir Concat4(/usr,/,LibDirName,/nx) +#define UsrLibDir Concat3(/usr,/,LibDirName) #ifndef AlternateUsrLibDir #define AlternateUsrLibDir NO #endif @@ -863,7 +863,7 @@ TCLIBDIR = TclLibDir #endif #ifndef IncRoot #ifdef ProjectRoot -#define IncRoot Concat(ProjectRoot,/include/nx) +#define IncRoot Concat(ProjectRoot,/include) #ifndef AlternateIncRoot #define AlternateIncRoot YES #endif diff --git a/nx-X11/config/cf/Motif.tmpl b/nx-X11/config/cf/Motif.tmpl index daa18969d..d4b7d3a49 100644 --- a/nx-X11/config/cf/Motif.tmpl +++ b/nx-X11/config/cf/Motif.tmpl @@ -465,9 +465,9 @@ TOP_MOTIF_INCLUDES = -I$(MINCLUDESRC) #endif #if SharedLibXm -SharedLibReferences(XM,NX_Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev) +SharedLibReferences(XM,Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev) #else -ProjectUnsharedLibReferences(XM,NX_Xm,$(MWIDGETSRC),MBuildLibDir) +ProjectUnsharedLibReferences(XM,Xm,$(MWIDGETSRC),MBuildLibDir) #endif #if SharedLibMrm diff --git a/nx-X11/config/cf/X11.rules b/nx-X11/config/cf/X11.rules index 51ae38c7d..8a176c7a3 100644 --- a/nx-X11/config/cf/X11.rules +++ b/nx-X11/config/cf/X11.rules @@ -36,17 +36,17 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ #endif #if defined(X11ProjectRoot) -# define XBinDir $(XPROJECTROOT)/lib/nx/bin +# define XBinDir $(XPROJECTROOT)/bin #elif defined(ProjectRoot) -# define XBinDir $(PROJECTROOT)/lib/nx/bin +# define XBinDir $(PROJECTROOT)/bin #else # define XBinDir $(BINDIR) #endif #ifdef X11ProjectRoot -# define XUsrLibDirPath $(USRLIBDIR)/nx:$(XPROJECTROOT) +# define XUsrLibDirPath $(USRLIBDIR):$(XPROJECTROOT)/lib #else -# define XUsrLibDirPath $(USRLIBDIR)/nx +# define XUsrLibDirPath $(USRLIBDIR) #endif #ifdef UsrLibDirPath # undef UsrLibDirPath @@ -60,7 +60,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ #if ImportX11 # define XLdPreLibs -L$(LIBSRC) #elif defined(UseInstalledX11) && defined(X11ProjectRoot) -# define XLdPreLibs -L$(XPROJECTROOT) +# define XLdPreLibs -L$(XPROJECTROOT)/lib #else # define XLdPreLibs /**/ #endif @@ -70,7 +70,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ #define LdPreLibs LdPreLib XLdPreLibs #ifdef X11ProjectRoot -# define XLdPostLibs -L$(XPROJECTROOT) +# define XLdPostLibs -L$(XPROJECTROOT)/lib #else # define XLdPostLibs /**/ #endif @@ -86,7 +86,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ # define TopXInclude -I$(TOP)/exports/include #else # ifdef X11ProjectRoot -# define TopXInclude -I$(XPROJECTROOT)/../../include/nx +# define TopXInclude -I$(XPROJECTROOT)/include # else # define TopXInclude /**/ # endif @@ -98,7 +98,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ #define TopIncludes TopInclude $(TOP_X_INCLUDES) #if UseInstalledX11 && defined(X11ProjectRoot) -# define X11BuildLibPath $(XPROJECTROOT) +# define X11BuildLibPath $(XPROJECTROOT)/lib #elif UseInstalledX11 # define X11BuildLibPath $(USRLIBDIR) #elif ImportX11 diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 778e3099a..12967d1d5 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -456,7 +456,7 @@ XORGRELSTRING = XorgManVersionString #define BuildXinerama NO #endif #ifndef BuildXineramaLibrary -#define BuildXineramaLibrary (BuildXinerama) +#define BuildXineramaLibrary (BuildXinerama && !BuildServersOnly) #endif #ifndef BuildDmxDevelTools #define BuildDmxDevelTools NO @@ -1401,7 +1401,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #ifndef BinDir #ifdef ProjectRoot -#define BinDir Concat(ProjectRoot,/lib/nx/bin) +#define BinDir Concat(ProjectRoot,/bin) #else #define BinDir /usr/bin/X11 #endif @@ -1461,7 +1461,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #endif #ifndef LibDir # ifdef ProjectRoot -# define LibDir Concat(ProjectRoot,/lib/nx/X11) +# define LibDir Concat(ProjectRoot,/lib/X11) # else # define LibDir /usr/lib/X11 # endif @@ -1835,9 +1835,9 @@ VENDORSUPPORTDEFS = VendorSupportDefines #ifndef SharedX11Rev #define SharedX11Rev 6.2 #endif -SharedLibReferences(XONLY,NX_X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) +SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) #else -ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir) #endif /* Common alternate spellings */ DEPXLIBONLY = $(DEPXONLYLIB) @@ -2466,9 +2466,9 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) #ifndef SharedXextRev #define SharedXextRev 6.4 #endif -SharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) +SharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) #else -ProjectUnsharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),XBuildLibDir) #endif LINTEXTENSIONLIB = $(LINTEXTENSION) DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) @@ -2480,9 +2480,9 @@ LINTEXTENSIONLIB = $(LINTEXTENSION) #ifndef SharedXssRev #define SharedXssRev 1.0 #endif -SharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) +SharedLibReferences(XSS,Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) #else -ProjectUnsharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir) #endif XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc @@ -2490,9 +2490,9 @@ ProjectUnsharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),XBuildLibDir) #ifndef SharedXxf86miscRev #define SharedXxf86miscRev 1.1 #endif -SharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) +SharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) #else -ProjectUnsharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) #endif XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm @@ -2500,9 +2500,9 @@ ProjectUnsharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),XBuildLib #ifndef SharedXxf86vmRev #define SharedXxf86vmRev 1.0 #endif -SharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) +SharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) #else -ProjectUnsharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) #endif XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga @@ -2510,9 +2510,9 @@ ProjectUnsharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) #ifndef SharedXxf86dgaRev #define SharedXxf86dgaRev 1.0 #endif -SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) +SharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) #else -ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) #endif #if BuildDmxLibrary @@ -2544,9 +2544,9 @@ ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir #ifndef SharedXxf86rushRev #define SharedXxf86rushRev 1.0 #endif -SharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) +SharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) #else -ProjectUnsharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) #endif @@ -2555,9 +2555,9 @@ ProjectUnsharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLib #ifndef SharedXvRev #define SharedXvRev 1.0 #endif -SharedLibReferences(XV,NX_Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) +SharedLibReferences(XV,Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) #else -ProjectUnsharedLibReferences(XV,NX_Xv,$(XVLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir) #endif @@ -2566,9 +2566,9 @@ ProjectUnsharedLibReferences(XV,NX_Xv,$(XVLIBSRC),XBuildLibDir) #ifndef SharedXvMCRev #define SharedXvMCRev 1.0 #endif -SharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) +SharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) #else -ProjectUnsharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir) #endif XINERAMALIBSRC = $(LIBSRC)/Xinerama @@ -2576,9 +2576,9 @@ ProjectUnsharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),XBuildLibDir) #ifndef SharedXineramaRev #define SharedXineramaRev 1.0 #endif -SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) +SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) #else -ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir) #endif XRESLIBSRC = $(LIBSRC)/XRes @@ -2586,9 +2586,9 @@ ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir #ifndef SharedXResRev #define SharedXResRev 1.0 #endif -SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) +SharedLibReferences(XRES,XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) #else -ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XRES,XRes,$(XRESLIBSRC),XBuildLibDir) #endif DMXLIBSRC = $(LIBSRC)/dmx @@ -2596,9 +2596,9 @@ ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir) #ifndef SharedDmxRev #define SharedDmxRev 1.0 #endif -SharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) +SharedLibReferences(DMX,dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) #else -ProjectUnsharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(DMX,dmx,$(DMXLIBSRC),XBuildLibDir) #endif DPSLIBSRC = $(LIBSRC)/dps @@ -2606,9 +2606,9 @@ ProjectUnsharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),XBuildLibDir) #ifndef SharedDpsRev #define SharedDpsRev 1.0 #endif -SharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) +SharedLibReferences(DPS,dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) #else -ProjectUnsharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir) #endif DPSTKLIBSRC = $(LIBSRC)/dpstk @@ -2616,9 +2616,9 @@ ProjectUnsharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),XBuildLibDir) #ifndef SharedDpsTkRev #define SharedDpsTkRev 1.0 #endif -SharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) +SharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) #else -ProjectUnsharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir) #endif PSRESLIBSRC = $(LIBSRC)/psres @@ -2626,9 +2626,9 @@ ProjectUnsharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),XBuildLibDir) #ifndef SharedPSResRev #define SharedPSResRev 1.0 #endif -SharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) +SharedLibReferences(PSRES,psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) #else -ProjectUnsharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir) #endif GLULIBSRC = $(LIBSRC)/GLU @@ -2636,9 +2636,9 @@ ProjectUnsharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),XBuildLibDir) #ifndef SharedGluRev #define SharedGluRev 1.3 #endif -SharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) +SharedLibReferences(GLU,GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) #else -ProjectUnsharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir) #endif GLXLIBSRC = $(LIBSRC)/GL @@ -2646,18 +2646,18 @@ ProjectUnsharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),XBuildLibDir) #ifndef SharedGlxRev #define SharedGlxRev 1.2 #endif -SharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) +SharedLibReferences(GLX,GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) #else -ProjectUnsharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(GLX,GL,$(GLXLIBSRC),XBuildLibDir) #endif GLWIDGETSRC = $(LIBSRC)/GLw #if SharedLibGLw #ifndef SharedGLwRev #define SharedGLwRev 1.0 /* used to name the shared library */ #endif -SharedDSLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) +SharedDSLibReferences(GLW,GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) #else -ProjectUnsharedLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),XBuildLibDir) +ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir) #endif XRENDERLIBSRC = $(LIBSRC)/Xrender @@ -2665,9 +2665,9 @@ ProjectUnsharedLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),XBuildLibDir) #ifndef SharedXrenderRev #define SharedXrenderRev 1.2.2 #endif -SharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) +SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) #else -ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir) #endif XRANDRLIBSRC = $(LIBSRC)/Xrandr @@ -2675,9 +2675,9 @@ ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir) #ifndef SharedXrandrRev #define SharedXrandrRev 2.0 #endif -SharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) +SharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) #else -ProjectUnsharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir) #endif XFIXESLIBSRC = $(LIBSRC)/Xfixes @@ -2685,9 +2685,9 @@ ProjectUnsharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),XBuildLibDir) #ifndef SharedXfixesRev #define SharedXfixesRev 3.0 #endif -SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) +SharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) #else -ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),XBuildLibDir) #endif XDAMAGELIBSRC = $(LIBSRC)/Xdamage @@ -2695,9 +2695,9 @@ ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir) #ifndef SharedXdamageRev #define SharedXdamageRev 1.0 #endif -SharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev) +SharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev) #else -ProjectUnsharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),XBuildLibDir) #endif XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite @@ -2705,9 +2705,9 @@ XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite #ifndef SharedXcompositeRev #define SharedXcompositeRev 1.0 #endif -SharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev) +SharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev) #else -ProjectUnsharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir) #endif XEVIELIBSRC = $(LIBSRC)/Xevie @@ -2715,9 +2715,9 @@ XEVIELIBSRC = $(LIBSRC)/Xevie #ifndef SharedXevieRev #define SharedXevieRev 1.0 #endif -SharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) +SharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) #else -ProjectUnsharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir) #endif XCURSORLIBSRC = $(LIBSRC)/Xcursor @@ -2725,9 +2725,9 @@ ProjectUnsharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),XBuildLibDir) #ifndef SharedXcursorRev #define SharedXcursorRev 1.0.2 #endif -SharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev) +SharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev) #else -ProjectUnsharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir) #endif APPLEWMLIBSRC = $(LIBSRC)/apple @@ -2735,9 +2735,9 @@ ProjectUnsharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),XBuildLibDir) #ifndef SharedAppleWMRev #define SharedAppleWMRev 1.0 #endif -SharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev) +SharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev) #else -ProjectUnsharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) #endif WINDOWSWMLIBSRC = $(LIBSRC)/windows @@ -2745,9 +2745,9 @@ ProjectUnsharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) #ifndef SharedWindowsWMRev #define SharedWindowsWMRev 1.0 #endif -SharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev) +SharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev) #else -ProjectUnsharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir) #endif # ifndef SharedLibXfontcache @@ -2768,9 +2768,9 @@ ProjectUnsharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),XBuildLib #ifndef SharedXfontcacheRev #define SharedXfontcacheRev 1.2 #endif -SharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev) +SharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev) #else -ProjectUnsharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir) #endif #ifndef SharedLibXau @@ -2790,12 +2790,12 @@ ProjectUnsharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),XBuild #ifndef SharedXauRev #define SharedXauRev 6.0 #endif -SharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev) +SharedLibReferences(XAUTH,Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev) #else #if !UseInstalledXauLib -ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),XBuildLibDir) #else -ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR)) +ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR)) #endif #endif @@ -2816,12 +2816,12 @@ ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR)) #ifndef SharedXdmcpRev #define SharedXdmcpRev 6.0 #endif -SharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev) +SharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev) #else #if !UseInstalledXdmcpLib -ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),XBuildLibDir) #else -ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) +ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) #endif #endif @@ -2842,9 +2842,9 @@ ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) #ifndef SharedXmuRev #define SharedXmuRev 6.2 #endif -SharedDSLibReferences(XMU,NX_Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev) +SharedDSLibReferences(XMU,Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev) #else -ProjectUnsharedLibReferences(XMU,NX_Xmu,$(XMUSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir) #endif #ifndef SharedLibXmuu @@ -2864,9 +2864,9 @@ ProjectUnsharedLibReferences(XMU,NX_Xmu,$(XMUSRC),XBuildLibDir) #ifndef SharedXmuuRev #define SharedXmuuRev 1.0 #endif -SharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) +SharedLibReferences(XMUU,Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) #else -ProjectUnsharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir) #endif #ifndef SharedOldX @@ -2886,9 +2886,9 @@ ProjectUnsharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),XBuildLibDir) #ifndef SharedOldXRev #define SharedOldXRev 6.0 #endif -SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) +SharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) #else -ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir) #endif #ifndef SharedLibXp @@ -2908,9 +2908,9 @@ ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir) #ifndef SharedXpRev #define SharedXpRev 6.2 #endif -SharedLibReferences(XP,NX_Xp,$(XPLIBSRC),SOXPREV,SharedXpRev) +SharedLibReferences(XP,Xp,$(XPLIBSRC),SOXPREV,SharedXpRev) #else -ProjectUnsharedLibReferences(XP,NX_Xp,$(XPLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir) #endif #ifndef SharedLibXt @@ -2930,9 +2930,9 @@ ProjectUnsharedLibReferences(XP,NX_Xp,$(XPLIBSRC),XBuildLibDir) #ifndef SharedXtRev #define SharedXtRev 6.0 #endif -SharedDSLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) +SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) #else -ProjectUnsharedLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),XBuildLibDir) #endif DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) @@ -2956,9 +2956,9 @@ ProjectUnsharedLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),XBuildLibDir) #ifndef SharedXaRev #define SharedXaRev 1.0 #endif -SharedLibReferences(XA,NX_Xa,$(XALIBSRC),SOXAREV,SharedXaRev) +SharedLibReferences(XA,Xa,$(XALIBSRC),SOXAREV,SharedXaRev) #else -UnsharedLibReferences(XA,NX_Xa,$(XALIBSRC)) +UnsharedLibReferences(XA,Xa,$(XALIBSRC)) #endif #ifndef BuildXaw @@ -2985,9 +2985,9 @@ UnsharedLibReferences(XA,NX_Xa,$(XALIBSRC)) #ifndef SharedXawRev #define SharedXawRev 8.0 #endif -SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) +SharedDSLibReferences(XAW,Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) #else -ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir) #endif #endif @@ -3013,14 +3013,14 @@ ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),XBuildLibDir) #ifndef SharedXaw7Rev #define SharedXaw7Rev 7.0 #endif -SharedDSLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev) +SharedDSLibReferences(XAW7,Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev) #if !BuildXaw -SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev) +SharedDSLibReferences(XAW,Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev) #endif #else -ProjectUnsharedLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir) +ProjectUnsharedLibReferences(XAW7,Xaw,$(AWIDGET7SRC),XBuildLibDir) #if !BuildXaw -ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir) +ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET7SRC),XBuildLibDir) #endif #endif #endif @@ -3048,14 +3048,14 @@ ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir) #ifndef SharedXaw6Rev #define SharedXaw6Rev 6.1 #endif -SharedDSLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev) +SharedDSLibReferences(XAW6,Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev) #if !BuildXaw && !BuildXaw7 -SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev) +SharedDSLibReferences(XAW,Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev) #endif #else -ProjectUnsharedLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir) +ProjectUnsharedLibReferences(XAW6,Xaw,$(AWIDGET6SRC),XBuildLibDir) #if !BuildXaw && !BuildXaw7 -ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir) +ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET6SRC),XBuildLibDir) #endif #endif #endif @@ -3077,9 +3077,9 @@ ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir) #ifndef SharedXiRev #define SharedXiRev 6.0 #endif -SharedLibReferences(XI,NX_Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev) +SharedLibReferences(XI,Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev) #else -ProjectUnsharedLibReferences(XI,NX_Xi,$(XILIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XI,Xi,$(XILIBSRC),XBuildLibDir) #endif #ifndef SharedLibXtst @@ -3099,12 +3099,12 @@ ProjectUnsharedLibReferences(XI,NX_Xi,$(XILIBSRC),XBuildLibDir) #ifndef SharedXtstRev #define SharedXtstRev 6.1 #endif -SharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) +SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) #else -ProjectUnsharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),XBuildLibDir) #endif -ProjectUnsharedLibReferences(XBSD,NX_Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) +ProjectUnsharedLibReferences(XBSD,Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) #ifndef SharedLibICE #define SharedLibICE HasSharedLibraries @@ -3123,9 +3123,9 @@ ProjectUnsharedLibReferences(XBSD,NX_Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) #ifndef SharedICERev #define SharedICERev 6.4 #endif -SharedLibReferences(ICE,NX_ICE,$(ICESRC),SOICEREV,SharedICERev) +SharedLibReferences(ICE,ICE,$(ICESRC),SOICEREV,SharedICERev) #else -ProjectUnsharedLibReferences(ICE,NX_ICE,$(ICESRC),XBuildLibDir) +ProjectUnsharedLibReferences(ICE,ICE,$(ICESRC),XBuildLibDir) #endif #ifndef SharedLibSM @@ -3145,9 +3145,9 @@ ProjectUnsharedLibReferences(ICE,NX_ICE,$(ICESRC),XBuildLibDir) #ifndef SharedSMRev #define SharedSMRev 6.0 #endif -SharedLibReferences(SM,NX_SM,$(SMSRC),SOSMREV,SharedSMRev) +SharedLibReferences(SM,SM,$(SMSRC),SOSMREV,SharedSMRev) #else -ProjectUnsharedLibReferences(SM,NX_SM,$(SMSRC),XBuildLibDir) +ProjectUnsharedLibReferences(SM,SM,$(SMSRC),XBuildLibDir) #endif #ifndef SharedLibXkey @@ -3167,9 +3167,9 @@ ProjectUnsharedLibReferences(SM,NX_SM,$(SMSRC),XBuildLibDir) #ifndef SharedXkeyRev #define SharedXkeyRev 6.0 #endif -SharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev) +SharedLibReferences(XKEY,Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev) #else -ProjectUnsharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XKEY,Xkey,$(XKEYSRC),XBuildLibDir) #endif #ifndef SharedLibFS @@ -3189,9 +3189,9 @@ ProjectUnsharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),XBuildLibDir) #ifndef SharedFSRev #define SharedFSRev 6.0 #endif -SharedLibReferences(FS,NX_FS,$(FSLIBSRC),SOFSREV,SharedFSRev) +SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev) #else -ProjectUnsharedLibReferences(FS,NX_FS,$(FSLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir) #endif #ifndef SharedLibFont @@ -3212,14 +3212,14 @@ ProjectUnsharedLibReferences(FS,NX_FS,$(FSLIBSRC),XBuildLibDir) #define SharedFontRev 1.5 #endif SharedFontLibReferences() -XCOMM SharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev) +XCOMM SharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev) #else ProjectUnsharedFontLibReferences() -XCOMM ProjectUnsharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),XBuildLibDir) +XCOMM ProjectUnsharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),XBuildLibDir) #endif FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs -ProjectUnsharedLibReferences(FONTSTUB,NX_fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(FONTSTUB,fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) @@ -3241,9 +3241,9 @@ ProjectUnsharedLibReferences(FONTSTUB,NX_fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) #ifndef SharedFontEncRev #define SharedFontEncRev 1.0 #endif -SharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev) +SharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev) #else -ProjectUnsharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),XBuildLibDir) #endif #ifndef SharedLibXpm @@ -3263,9 +3263,9 @@ ProjectUnsharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),XBuildLibDir) #ifndef SharedXpmRev #define SharedXpmRev 4.11 #endif -SharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) +SharedLibReferences(XPM,Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) #else -ProjectUnsharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir) #endif #if UseFreetype2 @@ -3313,9 +3313,9 @@ ProjectUnsharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),XBuildLibDir) #define SharedFreetype2Rev 9.0 #endif #endif -SharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) +SharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) #else -ProjectUnsharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),XBuildLibDir) #endif #ifdef UseInstalled @@ -3470,9 +3470,9 @@ MOTIFINCLUDES = -I$(MOTIFINCDIR) #define SharedExpatRev 4.0 #endif #endif -SharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev) +SharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev) #else -ProjectUnsharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),XBuildLibDir) #endif #if UseExpat @@ -3552,9 +3552,9 @@ EXPATDEFINES = -DEXPAT #ifndef SharedXft1Rev #define SharedXft1Rev 1.1 #endif -SharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev) +SharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev) #else -ProjectUnsharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),XBuildLibDir) #endif #ifndef Xft1ClientDepLibs @@ -3589,9 +3589,9 @@ ProjectUnsharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),XBuildLibDir) #ifndef SharedXftRev #define SharedXftRev 2.1.2 #endif -SharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) +SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) #else -ProjectUnsharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) #endif #ifndef XftClientDepLibs @@ -3622,9 +3622,9 @@ ProjectUnsharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),XBuildLibDir) #ifndef SharedFontconfigRev #define SharedFontconfigRev 1.0.4 #endif -SharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev) +SharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev) #else -ProjectUnsharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir) #endif #ifdef UseInstalled @@ -3827,9 +3827,9 @@ LIBPNGLIB = -L$(LIBPNGLIBDIR) LinkerRuntimeLibraryPathFlag($(LIBPNGLIBDIR)) -lpn # ifndef SharedxkbfileRev # define SharedxkbfileRev 1.0 # endif -SharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev) +SharedLibReferences(XKBFILE,xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev) #else -ProjectUnsharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILELIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir) #endif #if BuildXKBlib @@ -3899,9 +3899,9 @@ ProjectUnsharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILELIBSRC),XBuildLibDir) # ifndef SharedxkbuiRev # define SharedxkbuiRev 1.0 # endif -SharedLibReferences(XKBUI,NX_xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev) +SharedLibReferences(XKBUI,xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev) #else -ProjectUnsharedLibReferences(XKBUI,NX_xkbui,$(XKBUILIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir) #endif #ifndef XkbuiLibs @@ -3974,9 +3974,9 @@ EXTRAXAWCLIENTLIBS = ExtraXawClientLibs #ifndef SharedXTrapRev #define SharedXTrapRev 6.4 #endif -SharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev) +SharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev) #else -ProjectUnsharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),XBuildLibDir) #endif #ifndef NeedDefaultDepLibs diff --git a/nx-X11/config/cf/bsdLib.rules b/nx-X11/config/cf/bsdLib.rules index 303d57912..b293b3fa2 100644 --- a/nx-X11/config/cf/bsdLib.rules +++ b/nx-X11/config/cf/bsdLib.rules @@ -134,9 +134,9 @@ LintLibReferences(varname,libname,libsource) #ifndef SharedFontLibReferences #define SharedFontLibReferences() @@\ SOFONTREV = SharedFontRev @@\ -DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\ -FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ -LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) +DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\ +FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ +LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) #endif /* diff --git a/nx-X11/config/cf/bsdLib.tmpl b/nx-X11/config/cf/bsdLib.tmpl index 0c9d62001..8d55581e3 100644 --- a/nx-X11/config/cf/bsdLib.tmpl +++ b/nx-X11/config/cf/bsdLib.tmpl @@ -38,7 +38,7 @@ XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.23 2003/11/04 01:59:31 dawes Exp $ #ifndef FixupLibReferences #define FixupLibReferences() @@\ -XMULIBONLY = -lNX_Xmu @@\ +XMULIBONLY = -lXmu @@\ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif diff --git a/nx-X11/config/cf/bsdiLib.tmpl b/nx-X11/config/cf/bsdiLib.tmpl index c8b1e0c1a..28087bfb0 100644 --- a/nx-X11/config/cf/bsdiLib.tmpl +++ b/nx-X11/config/cf/bsdiLib.tmpl @@ -11,7 +11,7 @@ XCOMM $XFree86: xc/config/cf/bsdiLib.tmpl,v 3.3 2003/05/29 21:56:57 herrb Exp $ #ifndef FixupLibReferences #define FixupLibReferences() @@\ -XMULIBONLY = -lNX_Xmu @@\ +XMULIBONLY = -lXmu @@\ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif diff --git a/nx-X11/config/cf/convex.cf b/nx-X11/config/cf/convex.cf index 859d9a01a..3b522f7a7 100644 --- a/nx-X11/config/cf/convex.cf +++ b/nx-X11/config/cf/convex.cf @@ -90,9 +90,9 @@ DEPMRESOURCELIB = _UseCat($(USRLIBDIR),$(MRESOURCESRC),/libMrm.a) LINTMRESOURCELIB= _UseCat($(LINTLIBDIR),$(MRESOURCESRC),/llib-lMrm.ln) XMLIBSRC = $(LIBSRC)/Xm - DEPXMLIB = _UseCat($(USRLIBDIR),$(XMLIBSRC),/libNX_Xm.a) - XMLIB = LoaderLibPrefix _Use(-lNX_Xm,$(DEPXMLIB)) - LINTXMLIB = _UseCat($(LINTLIBDIR),$(XMLIBSRC),/llib-lNX_Xm.ln) + DEPXMLIB = _UseCat($(USRLIBDIR),$(XMLIBSRC),/libXm.a) + XMLIB = LoaderLibPrefix _Use(-lXm,$(DEPXMLIB)) + LINTXMLIB = _UseCat($(LINTLIBDIR),$(XMLIBSRC),/llib-lXm.ln) UILLIBSRC = $(LIBSRC)/uil DEPUILLIB = _UseCat($(USRLIBDIR),$(UILLIBSRC),/libUil.a) diff --git a/nx-X11/config/cf/cygwin.tmpl b/nx-X11/config/cf/cygwin.tmpl index 9041eeadb..404b62845 100644 --- a/nx-X11/config/cf/cygwin.tmpl +++ b/nx-X11/config/cf/cygwin.tmpl @@ -50,7 +50,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.18 2003/10/19 08:27:05 herrb Exp $ #ifndef FixupLibReferences # define FixupLibReferences() @@\ -XMULIBONLY = -lNX_Xmu @@\ +XMULIBONLY = -lXmu @@\ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif diff --git a/nx-X11/config/cf/darwinLib.tmpl b/nx-X11/config/cf/darwinLib.tmpl index 4169e60fa..0d3c4368f 100644 --- a/nx-X11/config/cf/darwinLib.tmpl +++ b/nx-X11/config/cf/darwinLib.tmpl @@ -5,7 +5,7 @@ XCOMM $XFree86: xc/config/cf/darwinLib.tmpl,v 1.19 2003/11/04 00:24:36 torrey Ex #ifndef FixupLibReferences #define FixupLibReferences() @@\ -XMULIBONLY = -lNX_Xmu @@\ +XMULIBONLY = -lXmu @@\ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif diff --git a/nx-X11/config/cf/gnuLib.tmpl b/nx-X11/config/cf/gnuLib.tmpl index 2a0fcd1ae..012277c1d 100644 --- a/nx-X11/config/cf/gnuLib.tmpl +++ b/nx-X11/config/cf/gnuLib.tmpl @@ -6,7 +6,7 @@ XCOMM #ifndef FixupLibReferences #define FixupLibReferences() @@\ -XMULIBONLY = -lNX_Xmu @@\ +XMULIBONLY = -lXmu @@\ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 2193a4711..e9f53c2a9 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -138,7 +138,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildRenderLibrary YES #define SharedLibFreetype2 YES #define NormalLibFreetype2 YES -#define FontLibSharedFreeType YES +#define FontLibSharedFreeType NO #endif /* @@ -649,7 +649,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ * #define XserverStaticFontLib NO */ -#define XserverStaticFontLib YES /* * To enable binary compatibility with previous versions of the font @@ -687,7 +686,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ * #define BuildXinerama NO */ -#define BuildXinerama YES +#define BuildXinerama NO /* * If you don't want to build support for the GLX extension, uncomment this. @@ -734,7 +733,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildXKB YES #define BuildXKBlib YES -#define SharedLibXau YES +#define SharedLibXau NO /* * If you are running NetBSD 0.9C or later, and have the aperture driver @@ -957,9 +956,9 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildXterm YES */ -#define SharedLibXau YES +#define SharedLibXau NO -#define SharedLibXdmcp YES +#define SharedLibXdmcp NO #define BuildXaw7 YES @@ -977,7 +976,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildFontServer NO #define BuildFreeType NO #define BuildXTrueType NO -#define FontLibSharedFreeType YES +#define FontLibSharedFreeType NO #endif #if !defined(NXZaurusXServer) && defined(NXiPAQXServer) diff --git a/nx-X11/config/cf/ibmLib.rules b/nx-X11/config/cf/ibmLib.rules index 53d5bb171..eb6071330 100644 --- a/nx-X11/config/cf/ibmLib.rules +++ b/nx-X11/config/cf/ibmLib.rules @@ -127,23 +127,23 @@ LintLibReferences(varname,libname,libsource) # ifndef SharedFontLibReferences # define SharedFontLibReferences() @@\ DEPFONTLIB = /**/ @@\ -FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(FONTLIBSRC)/libNX_Xfont.a) @@\ -LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) +FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(FONTLIBSRC)/libXfont.a) @@\ +LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) # endif # else # ifndef SharedFontLibReferences # define SharedFontLibReferences() @@\ DEPFONTLIB = /**/ @@\ -FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libNX_Xfont.a)) @@\ -LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) +FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libXfont.a)) @@\ +LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) # endif # endif # else /* OSMajorVersion < 5 */ # ifndef SharedFontLibReferences # define SharedFontLibReferences() @@\ DEPFONTLIB = /**/ @@\ -FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(BUILDLIBDI)/libNX_Xfont.so)) @@\ -LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) +FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDI)/libXfont.so)) @@\ +LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) # endif # endif diff --git a/nx-X11/config/cf/ibmLib.tmpl b/nx-X11/config/cf/ibmLib.tmpl index 04ae2cbff..ff196aa5d 100644 --- a/nx-X11/config/cf/ibmLib.tmpl +++ b/nx-X11/config/cf/ibmLib.tmpl @@ -81,7 +81,7 @@ XCOMM $XFree86: xc/config/cf/ibmLib.tmpl,v 1.3tsi Exp $ /* we want this to be defined only when building X */ # ifndef FixupLibReferences # define FixupLibReferences() @@\ -DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libNX_Xt.a) +DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt.a) # endif #endif diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index 25d254787..98981d7a7 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -1054,7 +1054,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #if HaveLib64 # ifndef LibDirName -# define LibDirName lib +# define LibDirName lib64 # endif # ifndef SystemUsrLibDir # define SystemUsrLibDir /usr/lib64 diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules index 409203137..0cc71d325 100644 --- a/nx-X11/config/cf/lnxLib.rules +++ b/nx-X11/config/cf/lnxLib.rules @@ -389,7 +389,7 @@ JUMP_LDLIBS_libc = `$(CC) --print-libgcc-file-name` -lc XCOMM libX11.so (X11, SM, ICE) JUMP_ROOT_X11 = $(XLIBSRC) JUMP_IS_HOST_X11 = YES -JUMP_STUBLIBS_X11 = libNX_X11.sa libNX_SM.sa libNX_ICE.sa +JUMP_STUBLIBS_X11 = libX11.sa libSM.sa libICE.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_EXPORT_X11 = $(JUMP_DIR_X11)/jump.vars JUMP_ADDRESS_X11 = 0x60200000 JUMP_JUMPTABLESIZE_X11 = 0x4000 JUMP_GOTSIZE_X11 = 4096 -JUMP_STUBNAMES_X11 = libNX_X11 libNX_SM libNX_ICE +JUMP_STUBNAMES_X11 = libX11 libSM libICE JUMP_STUBS_IMPORT_X11 = $(LIBC_SA) -JUMP_SIBARS_X11 = jump/libNX_SM.a~ jump/libNX_ICE.a~ +JUMP_SIBARS_X11 = jump/libSM.a~ jump/libICE.a~ JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc) XCOMM libSM (part of libX11.so) @@ -435,9 +435,9 @@ JUMP_JUMPTABLESIZE_Xt = 0x4000 JUMP_GOTSIZE_Xt = 4096 JUMP_STUBNAMES_Xt = libXt libXmu libXext libXi libXtst libXp JUMP_STUBS_IMPORT_Xt = $(JUMP_STUBS_IMPORT_X11) -JUMP_SIBARS_Xt = jump/libNX_Xmu.a~ jump/libNX_Xext.a~ jump/libNX_Xi.a~ jump/libNX_Xtst.a~ jump/libNX_Xp.a~ -JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libNX_ICE.sa \ - $(JUMP_ROOT_SM)/libNX_SM.sa $(JUMP_ROOT_X11)/libNX_X11.sa $(JUMP_LDLIBS_libc) +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) XCOMM libXmu (part of libXt.so) JUMP_ROOT_Xmu = $(XMUSRC) @@ -485,8 +485,8 @@ JUMP_JUMPTABLESIZE_Xaw = 0x4000 JUMP_GOTSIZE_Xaw = 4096 JUMP_STUBNAMES_Xaw = libXaw JUMP_STUBS_IMPORT_Xaw = $(JUMP_STUBS_IMPORT_X11) -JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libNX_Xt.sa $(JUMP_ROOT_Xt)/libNX_Xmu.sa \ - $(JUMP_ROOT_Xt)/libNX_Xext.sa $(JUMP_ROOT_X11)/libNX_X11.sa \ +JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libXt.sa $(JUMP_ROOT_Xt)/libXmu.sa \ + $(JUMP_ROOT_Xt)/libXext.sa $(JUMP_ROOT_X11)/libX11.sa \ $(JUMP_LDLIBS_libc) # endif /* !UseInstalled */ diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl index 788733c1f..f1eb5ac4b 100644 --- a/nx-X11/config/cf/lnxLib.tmpl +++ b/nx-X11/config/cf/lnxLib.tmpl @@ -9,7 +9,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ #ifndef FixupLibReferences #define FixupLibReferences() @@\ -XMULIBONLY = -lNX_Xmu @@\ +XMULIBONLY = -lXmu @@\ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif @@ -66,7 +66,7 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #ifndef FixupLibReferences #define FixupLibReferences() @@\ -XMULIB = -lNX_Xmu $(XLIB) +XMULIB = -lXmu $(XLIB) #endif #endif /* UseElfFormat */ diff --git a/nx-X11/config/cf/mingw.tmpl b/nx-X11/config/cf/mingw.tmpl index f9c3ec919..6be56d117 100644 --- a/nx-X11/config/cf/mingw.tmpl +++ b/nx-X11/config/cf/mingw.tmpl @@ -50,7 +50,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.18 2003/10/19 08:27:05 herrb Exp $ #ifndef FixupLibReferences # define FixupLibReferences() @@\ -XMULIBONLY = -lNX_Xmu @@\ +XMULIBONLY = -lXmu @@\ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif diff --git a/nx-X11/config/cf/nto.rules b/nx-X11/config/cf/nto.rules index 87960ef53..e5023e26f 100644 --- a/nx-X11/config/cf/nto.rules +++ b/nx-X11/config/cf/nto.rules @@ -104,7 +104,7 @@ ComplexHostProgramTarget(program) #ifndef FixupLibReferences #define FixupLibReferences() @@\ -XMULIBONLY = -lNX_Xmu @@\ +XMULIBONLY = -lXmu @@\ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif diff --git a/nx-X11/config/cf/os2Lib.tmpl b/nx-X11/config/cf/os2Lib.tmpl index 38c05ce19..522993031 100644 --- a/nx-X11/config/cf/os2Lib.tmpl +++ b/nx-X11/config/cf/os2Lib.tmpl @@ -107,35 +107,35 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.18 2003/11/12 00:10:23 dawes Exp $ #endif #if LinkStatically -#define SDlibX11 -lNX_X11_s -#define SDlibXExt -lNX_XExt_s -#define SDlibXmu -lNX_Xmu_s -#define SDlibXt -lNX_Xt_s -#define SDlibXaw -lNX_Xaw_s -#define SDlibXaw7 -lNX_Xaw_s -#define SDlibXaw6 -lNX_Xaw_s -#define SDlibXi -lNX_Xi_s -#define SDlibXtst -lNX_Xtst_s -#define SDlibXp -lNX_Xp_s -#define SDlibXv -lNX_Xv_s -#define SDlibGL -lNX_GL_s -#define SDlibDPS -lNX_DPS_s -#define SDlibDPSTK -lNX_DPSTK_s +#define SDlibX11 -lX11_s +#define SDlibXExt -lXExt_s +#define SDlibXmu -lXmu_s +#define SDlibXt -lXt_s +#define SDlibXaw -lXaw_s +#define SDlibXaw7 -lXaw_s +#define SDlibXaw6 -lXaw_s +#define SDlibXi -lXi_s +#define SDlibXtst -lXtst_s +#define SDlibXp -lXp_s +#define SDlibXv -lXv_s +#define SDlibGL -lGL_s +#define SDlibDPS -lDPS_s +#define SDlibDPSTK -lDPSTK_s #else -#define SDlibX11 -lNX_X11 -#define SDlibXExt -lNX_XExt -#define SDlibXmu -lNX_Xmu -#define SDlibXt -lNX_Xt -#define SDlibXaw -lNX_Xaw -#define SDlibXaw7 -lNX_Xaw -#define SDlibXaw6 -lNX_Xaw -#define SDlibXi -lNX_Xi -#define SDlibXtst -lNX_Xtst -#define SDlibXp -lNX_Xp -#define SDlibXv -lNX_Xv -#define SDlibGL -lNX_GL -#define SDlibDPS -lNX_DPS -#define SDlibDPSTK -lNX_DPSTK +#define SDlibX11 -lX11 +#define SDlibXExt -lXExt +#define SDlibXmu -lXmu +#define SDlibXt -lXt +#define SDlibXaw -lXaw +#define SDlibXaw7 -lXaw +#define SDlibXaw6 -lXaw +#define SDlibXi -lXi +#define SDlibXtst -lXtst +#define SDlibXp -lXp +#define SDlibXv -lXv +#define SDlibGL -lGL +#define SDlibDPS -lDPS +#define SDlibDPSTK -lDPSTK #endif /* @@ -159,7 +159,7 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.18 2003/11/12 00:10:23 dawes Exp $ #endif #if SharedOldX DEPOLDXLIB = - OLDXLIB = _Use(-lNX_oldX,-L$(OLDXLIBSRC) -lNX_oldX) + OLDXLIB = _Use(-loldX,-L$(OLDXLIBSRC) -loldX) #endif #if SharedLibXt DEPXTOOLLIB = diff --git a/nx-X11/config/cf/sco5.cf b/nx-X11/config/cf/sco5.cf index b53640fec..c6fa54bad 100644 --- a/nx-X11/config/cf/sco5.cf +++ b/nx-X11/config/cf/sco5.cf @@ -318,7 +318,7 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1.9 2005/12/20 22:30:48 alanc Exp $ */ #ifndef FixupLibReferences #define FixupLibReferences() @@\ -XMULIBONLY = -lNX_Xmu @@\ +XMULIBONLY = -lXmu @@\ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif diff --git a/nx-X11/config/cf/site.def b/nx-X11/config/cf/site.def index 071116f3f..c242f0ef9 100644 --- a/nx-X11/config/cf/site.def +++ b/nx-X11/config/cf/site.def @@ -72,7 +72,7 @@ XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Ex #ifdef AfterVendorCF #ifndef ProjectRoot -#define ProjectRoot /usr/local +#define ProjectRoot /usr/local/lib/nx #endif /* @@ -87,7 +87,7 @@ XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Ex * ProjectRoot rather than in /etc/X11. See also HasVarDirectory, * UseEtcX11 and UseSeparateConfDir. * -#define EtcX11Directory /etc/nx +#define EtcX11Directory ProjectRoot/etc */ diff --git a/nx-X11/config/cf/sv3Lib.tmpl b/nx-X11/config/cf/sv3Lib.tmpl index fbd9b62b6..c9fd32331 100644 --- a/nx-X11/config/cf/sv3Lib.tmpl +++ b/nx-X11/config/cf/sv3Lib.tmpl @@ -40,31 +40,31 @@ XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.2 2001/01/17 16:38:49 dawes Exp $ * are using shared libraries, we really do not need to depend on anything */ #if SharedLibXext - DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libNX_Xext_s.a) - EXTENSIONLIB = LoaderLibPrefix _Use(-lNX_Xext_s, $(DEPEXTENSIONLIB)) + DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libXext_s.a) + EXTENSIONLIB = LoaderLibPrefix _Use(-lXext_s, $(DEPEXTENSIONLIB)) #endif #if SharedLibX - DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libNX_X11_s.a) - XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lNX_X11_s,$(XLIBSRC)/libNX_X11_s.a) + DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libX11_s.a) + XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lX11_s,$(XLIBSRC)/libX11_s.a) #endif #if SharedLibXmu - DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libNX_Xmu_s.a) - XMULIB = LoaderLibPrefix _Use(-lNX_Xmu_s,$(DEPXMULIB)) + DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libXmu_s.a) + XMULIB = LoaderLibPrefix _Use(-lXmu_s,$(DEPXMULIB)) #endif #if SharedOldLibX DEPOLDXLIB = _UseCat($(USRLIBDIR),$(OLDXLIBSRC),/liboldX_s.a) OLDXLIB = LoaderLibPrefix _Use(-loldX_s,$(DEPOLDXLIB)) #endif #if SharedLibXt - DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libNX_Xt_s.a) - XTOOLLIB = LoaderLibPrefix _Use(-lNX_Xt_s,$(DEPXTOOLLIB)) + DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt_s.a) + XTOOLLIB = LoaderLibPrefix _Use(-lXt_s,$(DEPXTOOLLIB)) #endif #if SharedLibXaw - DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libNX_Xaw_s.a) - XAWLIB = LoaderLibPrefix _Use(-lNX_Xaw_s,$(DEPXAWLIB)) + DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libXaw_s.a) + XAWLIB = LoaderLibPrefix _Use(-lXaw_s,$(DEPXAWLIB)) #endif #if SharedLibXinput - DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libNX_Xi_s.a) - XILIB = LoaderLibPrefix _Use(-lNX_Xi_s,$(DEPXILIB)) + DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libXi_s.a) + XILIB = LoaderLibPrefix _Use(-lXi_s,$(DEPXILIB)) #endif diff --git a/nx-X11/config/cf/sv4Lib.tmpl b/nx-X11/config/cf/sv4Lib.tmpl index 65aa0878e..d209e83ff 100644 --- a/nx-X11/config/cf/sv4Lib.tmpl +++ b/nx-X11/config/cf/sv4Lib.tmpl @@ -7,7 +7,7 @@ XCOMM $Xorg: sv4Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.7 2003/05/29 21:56:57 herrb Exp $ /* SVR4 shared libraries are deficient in link semantics */ -XMULIBONLY = -lNX_Xmu +XMULIBONLY = -lXmu #ifndef FixupLibReferences # define FixupLibReferences() @@\ XMULIB = $(XMULIBONLY) -z nodefs diff --git a/nx-X11/config/cf/usl.cf b/nx-X11/config/cf/usl.cf index be46645d1..e54476bee 100644 --- a/nx-X11/config/cf/usl.cf +++ b/nx-X11/config/cf/usl.cf @@ -262,7 +262,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer */ #ifndef FixupLibReferences #define FixupLibReferences() @@\ -XMULIBONLY = -lNX_Xmu @@\ +XMULIBONLY = -lXmu @@\ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif |