aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/GL/mesa/drivers/x11/Imakefile
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-05-26 16:22:40 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-06-16 23:00:58 +0200
commitcb4a2d732001d32fa1e95bb15e047da12b6c9754 (patch)
tree3320c8160de7a8b23e1a1eab1febfc6e3daf384b /nx-X11/lib/GL/mesa/drivers/x11/Imakefile
parent5a64974cc5f0e9001cb0ddba4cb2c956ba43f7df (diff)
downloadnx-libs-cb4a2d732001d32fa1e95bb15e047da12b6c9754.tar.gz
nx-libs-cb4a2d732001d32fa1e95bb15e047da12b6c9754.tar.bz2
nx-libs-cb4a2d732001d32fa1e95bb15e047da12b6c9754.zip
Drop nx-X11/lib/GL and move Imakefile.inc include files into Xserver code tree.
The client-side library libNX_GL.{a,so} is not built when building nx-libs. However, nx-X11/lib/GL/** ships several imake include files (Imakefile.inc) that are also used in nx-X11/programs/Xserver/GL/**. These files have been moved from the nx-X11/lib/GL/ code subtree to the nx-X11/programs/Xserver/GL/. Furthermore, we don't provide module builds of the GL extension anymore, as that feature is neither used in nx-libs.
Diffstat (limited to 'nx-X11/lib/GL/mesa/drivers/x11/Imakefile')
-rw-r--r--nx-X11/lib/GL/mesa/drivers/x11/Imakefile70
1 files changed, 0 insertions, 70 deletions
diff --git a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile b/nx-X11/lib/GL/mesa/drivers/x11/Imakefile
deleted file mode 100644
index ab9a91970..000000000
--- a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile
+++ /dev/null
@@ -1,70 +0,0 @@
-XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.12tsi Exp $
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- * GlxDriverUsesMesa
- * GlxBuiltInXMesa
- * BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-
-#define MesaXBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
- DRI_DEFINES = GlxDefines
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
- -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src \
- -I$(MESASRCDIR)/src/X \
- -I$(MESASRCDIR)/include \
- -I../../../include -I$(XINCLUDESRC)
-
- INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-
-#ifdef UseCompaqMathLibrary
- MATHDEF = -DCCPML
-#endif
-
-#if BuildXF86DRI && GlxBuiltInXMesa
- XMESA_DEFINES = -DGLX_BUILT_IN_XMESA
-#endif
-
- SRCS = $(XMESA_SRCS)
- OBJS = $(XMESA_OBJS)
- DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MATHDEF) $(XMESA_DEFINES)
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(XMESA_OBJS))
-NormalLintTarget($(XMESA_SRCS))
-
-DependTarget()