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/array_cache/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/array_cache/Imakefile')
-rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile index 8126c3f30..188972b3b 100644 --- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/array_cache/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 MesaACBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/array_cache/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/array_cache/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_AC_SRCS) OBJS = $(MESA_AC_OBJS) @@ -44,7 +35,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() |