diff options
Diffstat (limited to 'nx-X11/lib')
| -rw-r--r-- | nx-X11/lib/GL/GL/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/lib/GL/Imakefile | 20 | ||||
| -rw-r--r-- | nx-X11/lib/GL/mesa/Imakefile | 15 | ||||
| -rw-r--r-- | nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/lib/Imakefile | 140 |
5 files changed, 61 insertions, 118 deletions
diff --git a/nx-X11/lib/GL/GL/Imakefile b/nx-X11/lib/GL/GL/Imakefile index 336f3d5b7..8c3ac0af4 100644 --- a/nx-X11/lib/GL/GL/Imakefile +++ b/nx-X11/lib/GL/GL/Imakefile @@ -242,5 +242,3 @@ InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) ProfiledLibraryTarget($(LIBNAME),$(POBJS)) InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) #endif - - diff --git a/nx-X11/lib/GL/Imakefile b/nx-X11/lib/GL/Imakefile index b53a71f4c..6b350203c 100644 --- a/nx-X11/lib/GL/Imakefile +++ b/nx-X11/lib/GL/Imakefile @@ -50,7 +50,7 @@ XCOMM Server-side tokens: XCOMM BuildGlxExt XCOMM GlxUseSGISI - +NULL = #include <Threads.tmpl> @@ -108,9 +108,23 @@ LIBGLBUILDDIR = GL * the drivers, and in the latter case, it needs to be built after the driver. */ #if BuildXF86DRI && GlxUseBuiltInDRIDriver -SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) +SUBDIRS = \ + $(MESADIRS) \ + $(DRIDIRS) \ + $(DRIVERDIRS) \ + $(GLXDIRS) \ + $(LIBGLBUILDDIR) \ + $(OSMESADIRS) \ + $(NULL) #else -SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS) +SUBDIRS = \ + $(MESADIRS) \ + $(GLXDIRS) \ + $(DRIDIRS) \ + $(LIBGLBUILDDIR) \ + $(OSMESADIRS) \ + $(DRIVERDIRS) \ + $(NULL) #endif MakeSubdirs($(SUBDIRS)) diff --git a/nx-X11/lib/GL/mesa/Imakefile b/nx-X11/lib/GL/mesa/Imakefile index 523123ae8..9e1db00a0 100644 --- a/nx-X11/lib/GL/mesa/Imakefile +++ b/nx-X11/lib/GL/mesa/Imakefile @@ -12,6 +12,8 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $ * driver modules. */ +NULL = + #if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) @@ -63,8 +65,17 @@ LibraryObjectRule() #define IHaveSubdirs #define PassCDebugFlags -SUBDIRS = $(ASM_SUBDIRS) array_cache main math swrast swrast_setup tnl tnl_dd shader - +SUBDIRS = \ + $(ASM_SUBDIRS) \ + array_cache \ + main \ + math \ + swrast \ + swrast_setup \ + tnl \ + tnl_dd \ + shader \ + $(NULL) MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) diff --git a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile index d5c8dc7fa..5c910489f 100644 --- a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile +++ b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile @@ -29,7 +29,7 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/common/Imakefile,v 1.6 2001/04/03 02:29:3 DEFINES = $(ALLOC_DEFINES) $(COMMON_DRI_DEFINES) $(MESA_ASM_DEFINES) INCLUDES = $(COMMON_X_INCLUDES) $(COMMON_MESA_INCLUDES) \ - $(COMMON_DRI_INCLUDES) $(EXPATINCLUDES) + $(COMMON_DRI_INCLUDES) SRCS = $(COMMONSRCS) OBJS = $(COMMONOBJS) diff --git a/nx-X11/lib/Imakefile b/nx-X11/lib/Imakefile index 28d9f1296..aa780877b 100644 --- a/nx-X11/lib/Imakefile +++ b/nx-X11/lib/Imakefile @@ -9,25 +9,7 @@ XCOMM $XFree86: xc/lib/Imakefile,v 3.74 2003/04/14 20:37:07 herrb Exp $ #define IHaveSubdirs #define PassCDebugFlags -#if BuildXaw6 && BuildLibraries -XAW6LIBDIR = Xaw6 -#endif - -#if BuildXaw7 && BuildLibraries -XAW7LIBDIR = Xaw7 -#endif - -#if BuildXaw && BuildLibraries -XAWLIBDIR = Xaw -#endif - -#ifndef NeedBerklib -#define NeedBerklib NO -#endif - -#if NeedBerklib -BERKDIR = Xbsd -#endif +NULL = #if BuildXKBfilelib || BuildXKB XKBLIBDIR = xkbfile @@ -37,14 +19,6 @@ XKBLIBDIR = xkbfile XKBUILIBDIR = xkbui #endif -#if BuildXInputLib -XINPUTLIBDIR = Xi -#endif - -#if BuildScreenSaverLibrary -SSLIBDIR = Xss -#endif - #if BuildXF86MiscLibrary XF86MISCLIBDIR = Xxf86misc #endif @@ -61,11 +35,6 @@ XF86DGALIBDIR = Xxf86dga XF86RUSHLIBDIR = Xxf86rush #endif -#if BuildXvLibrary -XVLIBDIR = Xv -XVMCLIBDIR = XvMC -#endif - #if BuildXineramaLibrary XINERAMADIR=Xinerama #endif @@ -78,42 +47,14 @@ XRESLIBDIR = XRes GLXLIBDIR = GL #endif -#if BuildGLwLibrary -GLWLIBDIR = GLw -#endif - -#if BuildGLULibrary -GLULIBDIR = GLU -#endif - -#if BuildDPSLibrary -DPSLIBDIR = dps -#endif - -#if BuildDPSTkLibrary -DPSTKLIBDIR = dpstk -#endif - -#if BuildPSResLibrary -PSRESLIBDIR = psres -#endif - #if BuildRenderLibrary RENDERLIBDIR = Xrender #endif -#if BuildExpatLibrary -EXPATBUILDDIR = expat -#endif - #if BuildRandRLibrary RANDRLIBDIR = Xrandr #endif -#if BuildXevieLibrary -XEVIELIBDIR = Xevie -#endif - #if BuildXfixesLibrary XFIXESLIBDIR = Xfixes #endif @@ -126,40 +67,12 @@ DAMAGELIBDIR = Xdamage COMPOSITELIBDIR = Xcomposite #endif -#if BuildXcursorLibrary -XCURSORLIBDIR = Xcursor -#endif - -#if BuildXTrapLibrary -XTRAPLIBDIR = XTrap -#endif - -#if BuildAppleWMLibrary -APPLELIBDIR = apple -#endif - -#if BuildWindowsWMLibrary -WINDOWSLIBDIR = windows -#endif - -XF86EXTLIBS = $(XF86MISCLIBDIR) $(XF86VMLIBDIR) \ - $(XF86DGALIBDIR) $(XF86RUSHLIBDIR) - -#if BuildLBX -LBXUTILDIR = lbxutil -#endif - -#if BuildLBX && !HasZlib -ZLIBDIR = zlib -#endif - -#if (defined(XFree86Version) || defined(XorgVersion)) && !HasPosixRegex -REGEXDIR = regex -#endif - -#if BuildXAudio -XALIBDIR = Xa -#endif +XF86EXTLIBS = \ + $(XF86MISCLIBDIR) \ + $(XF86VMLIBDIR) \ + $(XF86DGALIBDIR) \ + $(XF86RUSHLIBDIR) \ + $(NULL) #if BuildXauLib XAULIBDIR = Xau @@ -179,22 +92,29 @@ XTSTLIBDIR = Xtst #endif -LINTSUBDIRS = $(XAULIBDIR) $(X11LIBDIR) \ - $(OLDXLIBDIR) $(ICELIBDIR) $(SMLIBDIR) $(XEXTLIBDIR) $(XTLIBDIR) \ - $(SSLIBDIR) $(XF86MISCLIBDIR) $(XF86VMLIBDIR) $(XF86DGALIBDIR) \ - $(XF86RUSHLIBDIR) $(XMULIBDIR) $(XMUULIBDIR) $(XPMLIBDIR) \ - $(XAW6LIBDIR) $(XAW7LIBDIR) $(XAWLIBDIR) \ - $(XINPUTLIBDIR) $(XTSTLIBDIR) $(FSLIBDIR) $(XKBLIBDIR) \ - $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(EXPATBUILDDIR) \ - $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \ - $(DPSLIBDIR) $(PSRESLIBDIR) $(DPSTKLIBDIR) $(XINERAMADIR) \ - $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) \ - $(XVMCLIBDIR) $(RANDRLIBDIR) $(XTRAPLIBDIR) \ - $(XRESLIBDIR) $(APPLELIBDIR) $(DMXLIBDIR) $(WINDOWSLIBDIR) \ - $(XEVIELIBDIR) $(XFIXESLIBDIR) $(DAMAGELIBDIR) \ - $(XCURSORLIBDIR) $(COMPOSITELIBDIR) - -SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) +LINTSUBDIRS = \ + $(XAULIBDIR) \ + $(X11LIBDIR) \ + $(OLDXLIBDIR) \ + $(XEXTLIBDIR) \ + $(XF86MISCLIBDIR) \ + $(XF86VMLIBDIR) \ + $(XF86DGALIBDIR) \ + $(XF86RUSHLIBDIR) \ + $(XTSTLIBDIR) \ + $(XKBLIBDIR) \ + $(XKBUILIBDIR) \ + $(GLXLIBDIR) \ + $(XINERAMADIR) \ + $(RENDERLIBDIR) \ + $(RANDRLIBDIR) \ + $(XRESLIBDIR) \ + $(XFIXESLIBDIR) \ + $(DAMAGELIBDIR) \ + $(COMPOSITELIBDIR) \ + $(NULL) + +SUBDIRS = xtrans $(LINTSUBDIRS) MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) |