aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/GL/mesa/swrast_setup/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/programs/Xserver/GL/mesa/swrast_setup/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/programs/Xserver/GL/mesa/swrast_setup/Imakefile')
-rw-r--r--nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile12
1 files changed, 1 insertions, 11 deletions
diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile
index b530457e9..992c4925c 100644
--- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile
@@ -1,12 +1,7 @@
XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast_setup/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 MesaSwrastSetupBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc"
-#else
-#include "../../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc"
-#endif
+#include "Imakefile.inc"
SRCS = $(MESA_SWR_SETUP_SRCS)
OBJS = $(MESA_SWR_SETUP_OBJS)
@@ -52,4 +43,3 @@ DependTarget()
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
#endif
-