diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-06-16 23:58:50 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-06-16 23:58:50 +0200 |
| commit | 51b60ea7a1eaf1983c6a0d8095bf187a5f100f8b (patch) | |
| tree | 567c82168ede70dfc7532e93be9bc61159fb9753 /nx-X11/programs/Xserver/GL/mesa/Imakefile | |
| parent | 5a64974cc5f0e9001cb0ddba4cb2c956ba43f7df (diff) | |
| parent | 5cd80d272ba366686a3b28c5915cb5bf3ada8985 (diff) | |
| download | nx-libs-51b60ea7a1eaf1983c6a0d8095bf187a5f100f8b.tar.gz nx-libs-51b60ea7a1eaf1983c6a0d8095bf187a5f100f8b.tar.bz2 nx-libs-51b60ea7a1eaf1983c6a0d8095bf187a5f100f8b.zip | |
Merge branch 'sunweaver-pr/libglx-cleanup' into arctica-3.6.x
Attributes GH PR #40: https://github.com/ArcticaProject/nx-libs/pull/40
Diffstat (limited to 'nx-X11/programs/Xserver/GL/mesa/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/Imakefile | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/GL/mesa/Imakefile b/nx-X11/programs/Xserver/GL/mesa/Imakefile index ea7d18aa2..41acce9f4 100644 --- a/nx-X11/programs/Xserver/GL/mesa/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/Imakefile @@ -1,17 +1,11 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.23 2002/11/22 22:56:00 tsi Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) - MODSUBDIR = module -#endif #endif -#if !defined(IHaveModules) || !BuildModuleInSubdir #define IHaveSubdirs SUBDIRS = main math array_cache swrast swrast_setup tnl shader X GLcore $(MODSUBDIR) -#endif #include <Server.tmpl> @@ -19,11 +13,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.23 2002/11/22 22:5 #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../lib/GL/mesa/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/Imakefile.inc" -#endif +#include "Imakefile.inc" INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ @@ -44,4 +34,3 @@ DependSubdirs($(SUBDIRS)) #endif DependTarget() - |