diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-04-22 00:37:47 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-04-28 05:09:09 +0200 |
| commit | 662a89545f3e953a47f176cf64e574350643d446 (patch) | |
| tree | f718af7b85c4a17a28eb12f81922b1e3d1eb6481 /nx-X11/lib | |
| parent | c189f6efce2fe1b84c7792875b2805fa331ee84f (diff) | |
| download | nx-libs-662a89545f3e953a47f176cf64e574350643d446.tar.gz nx-libs-662a89545f3e953a47f176cf64e574350643d446.tar.bz2 nx-libs-662a89545f3e953a47f176cf64e574350643d446.zip | |
imake cleanup: Drop references to X11 build-logic that is not present in nx-X11.
Diffstat (limited to 'nx-X11/lib')
| -rw-r--r-- | nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/lib/Imakefile | 125 |
2 files changed, 2 insertions, 125 deletions
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 0e3519c69..aa780877b 100644 --- a/nx-X11/lib/Imakefile +++ b/nx-X11/lib/Imakefile @@ -11,26 +11,6 @@ XCOMM $XFree86: xc/lib/Imakefile,v 3.74 2003/04/14 20:37:07 herrb Exp $ NULL = -#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 - #if BuildXKBfilelib || BuildXKB XKBLIBDIR = xkbfile #endif @@ -39,14 +19,6 @@ XKBLIBDIR = xkbfile XKBUILIBDIR = xkbui #endif -#if BuildXInputLib -XINPUTLIBDIR = Xi -#endif - -#if BuildScreenSaverLibrary -SSLIBDIR = Xss -#endif - #if BuildXF86MiscLibrary XF86MISCLIBDIR = Xxf86misc #endif @@ -63,11 +35,6 @@ XF86DGALIBDIR = Xxf86dga XF86RUSHLIBDIR = Xxf86rush #endif -#if BuildXvLibrary -XVLIBDIR = Xv -XVMCLIBDIR = XvMC -#endif - #if BuildXineramaLibrary XINERAMADIR=Xinerama #endif @@ -80,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 @@ -128,22 +67,6 @@ 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) \ @@ -151,22 +74,6 @@ XF86EXTLIBS = \ $(XF86RUSHLIBDIR) \ $(NULL) -#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 - #if BuildXauLib XAULIBDIR = Xau #endif @@ -189,55 +96,25 @@ 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) \ $(NULL) -SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) +SUBDIRS = xtrans $(LINTSUBDIRS) MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) |