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.
---
 .../Xserver/GL/mesa/shader/slang/library/Imakefile         | 11 +----------
 .../Xserver/GL/mesa/shader/slang/library/Imakefile.inc     | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc

(limited to 'nx-X11/programs/Xserver/GL/mesa/shader/slang/library')

diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile
index e332121c9..d6de08e1b 100644
--- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile
@@ -1,10 +1,5 @@
 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif
 
 #include <Server.tmpl>
@@ -12,11 +7,7 @@ SUBDIRS = module
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaLibraryBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../../../lib/GL/mesa/shader/slang/library/Imakefile.inc"
-#else
-#include "../../../../../../../../lib/GL/mesa/shader/slang/library/Imakefile.inc"
-#endif
+#include "Imakefile.inc"
 
      INCLUDES = -I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/src/mesa/shader \
diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc
new file mode 100644
index 000000000..3489b7a28
--- /dev/null
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc
@@ -0,0 +1,14 @@
+XCOMM $XFree86:$
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(slang_common_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_common_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_core_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_core_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_fragment_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_fragment_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_shader_syn.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_version_syn.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_vertex_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_vertex_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+#endif
-- 
cgit v1.2.3