diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-05-26 16:22:40 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-06-16 23:00:58 +0200 |
| commit | cb4a2d732001d32fa1e95bb15e047da12b6c9754 (patch) | |
| tree | 3320c8160de7a8b23e1a1eab1febfc6e3daf384b /nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile | |
| parent | 5a64974cc5f0e9001cb0ddba4cb2c956ba43f7df (diff) | |
| download | nx-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/GLcore/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile index 154a5c1a0..8e3b77eda 100644 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.3 2002/05/31 18:12:36 dawes Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif #include <Server.tmpl> @@ -24,17 +19,17 @@ SUBDIRS = module #define MesaSlangBuildDir ../shader/slang/ #define MesaXBuildDir ../X/ -#include "../../../../../lib/GL/mesa/array_cache/Imakefile.inc" -#include "../../../../../lib/GL/mesa/swrast/Imakefile.inc" -#include "../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc" -#include "../../../../../lib/GL/mesa/tnl/Imakefile.inc" -#include "../../../../../lib/GL/mesa/main/Imakefile.inc" -#include "../../../../../lib/GL/mesa/math/Imakefile.inc" -#include "../../../../../lib/GL/mesa/shader/Imakefile.inc" -#include "../../../../../lib/GL/mesa/shader/grammar/Imakefile.inc" -#include "../../../../../lib/GL/mesa/shader/slang/Imakefile.inc" -#include "../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc" -#include "../../../../../lib/GL/mesa/Imakefile.inc" +#include "../array_cache/Imakefile.inc" +#include "../swrast/Imakefile.inc" +#include "../swrast_setup/Imakefile.inc" +#include "../tnl/Imakefile.inc" +#include "../main/Imakefile.inc" +#include "../math/Imakefile.inc" +#include "../shader/Imakefile.inc" +#include "../shader/grammar/Imakefile.inc" +#include "../shader/slang/Imakefile.inc" +#include "../X/Imakefile.inc" +#include "../Imakefile.inc" #ifdef IHaveModules MSRCS = GLcoremodule.c @@ -74,4 +69,3 @@ InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions) MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif - |