From cb4a2d732001d32fa1e95bb15e047da12b6c9754 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 26 May 2015 16:22:40 +0200
Subject: 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.
---
 nx-X11/programs/Xserver/GL/mesa/math/Imakefile | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'nx-X11/programs/Xserver/GL/mesa/math/Imakefile')

diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
index 49720974c..9f1ab6b44 100644
--- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
@@ -1,12 +1,7 @@
 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $
 
 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif
 
 #include <Server.tmpl>
@@ -14,11 +9,7 @@ SUBDIRS = module
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaMathBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../lib/GL/mesa/math/Imakefile.inc"
-#else
-#include "../../../../../../lib/GL/mesa/math/Imakefile.inc"
-#endif
+#include "Imakefile.inc"
 
          SRCS = $(MESA_MATH_SRCS)
          OBJS = $(MESA_MATH_OBJS)
-- 
cgit v1.2.3


From 73fa8999135be4f036d50d647102835a01be0e0e Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 26 May 2015 16:44:49 +0200
Subject: Drop unused / untested Xserver GLX extension support / build logic.

* MS Windows (non-tested)
* Mac OS X (not provided)
* SGISI / opengl (not provided)
* DRI support (nxagent uses Mesa software emulation only)
---
 nx-X11/programs/Xserver/GL/mesa/math/Imakefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nx-X11/programs/Xserver/GL/mesa/math/Imakefile')

diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
index 9f1ab6b44..df30ab909 100644
--- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
@@ -34,7 +34,6 @@ NormalLibraryObjectRule()
 
 SubdirLibraryRule($(OBJS))
 
-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
-- 
cgit v1.2.3