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-09-28 07:53:06 +0200 |
| commit | d877b46dd438a36f7481f5a270caf44635d0aa7d (patch) | |
| tree | 149d05bc4c0f30ff91f9d2dbeab3e873e8fafa06 /nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile | |
| parent | 8f4138457d0db8e782b450a60ade6a096a5cb048 (diff) | |
| download | nx-libs-d877b46dd438a36f7481f5a270caf44635d0aa7d.tar.gz nx-libs-d877b46dd438a36f7481f5a270caf44635d0aa7d.tar.bz2 nx-libs-d877b46dd438a36f7481f5a270caf44635d0aa7d.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/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile index 817fead69..46b22b6a1 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast/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 /* Large PIC tables needed for Solaris/SPARC builds */ @@ -19,11 +14,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaSwrastBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/swrast/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/swrast/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_SWRAST_SRCS) @@ -60,4 +51,3 @@ DependTarget() MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif - |