aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/GL/mesa
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-04-28 05:15:19 +0200
committerMihai Moldovan <ionic@ionic.de>2015-04-28 05:15:19 +0200
commit7b7ba9441b3ff72f0e963221342dcccbafc04312 (patch)
treef718af7b85c4a17a28eb12f81922b1e3d1eb6481 /nx-X11/lib/GL/mesa
parentcbf4e4dbebaca561ff2ff98521e249b9eac046ab (diff)
parent662a89545f3e953a47f176cf64e574350643d446 (diff)
downloadnx-libs-7b7ba9441b3ff72f0e963221342dcccbafc04312.tar.gz
nx-libs-7b7ba9441b3ff72f0e963221342dcccbafc04312.tar.bz2
nx-libs-7b7ba9441b3ff72f0e963221342dcccbafc04312.zip
Merge branch 'sunweaver-pr/imake-cleanup-nonpresent-buildlogic' into arctica-3.6.x
Attributes GH PR #17: https://github.com/ArcticaProject/nx-libs/pull/17
Diffstat (limited to 'nx-X11/lib/GL/mesa')
-rw-r--r--nx-X11/lib/GL/mesa/Imakefile15
-rw-r--r--nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile2
2 files changed, 14 insertions, 3 deletions
diff --git a/nx-X11/lib/GL/mesa/Imakefile b/nx-X11/lib/GL/mesa/Imakefile
index 523123ae8..9e1db00a0 100644
--- a/nx-X11/lib/GL/mesa/Imakefile
+++ b/nx-X11/lib/GL/mesa/Imakefile
@@ -12,6 +12,8 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $
* driver modules.
*/
+NULL =
+
#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
@@ -63,8 +65,17 @@ LibraryObjectRule()
#define IHaveSubdirs
#define PassCDebugFlags
-SUBDIRS = $(ASM_SUBDIRS) array_cache main math swrast swrast_setup tnl tnl_dd shader
-
+SUBDIRS = \
+ $(ASM_SUBDIRS) \
+ array_cache \
+ main \
+ math \
+ swrast \
+ swrast_setup \
+ tnl \
+ tnl_dd \
+ shader \
+ $(NULL)
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile
index d5c8dc7fa..5c910489f 100644
--- a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile
+++ b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile
@@ -29,7 +29,7 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/common/Imakefile,v 1.6 2001/04/03 02:29:3
DEFINES = $(ALLOC_DEFINES) $(COMMON_DRI_DEFINES) $(MESA_ASM_DEFINES)
INCLUDES = $(COMMON_X_INCLUDES) $(COMMON_MESA_INCLUDES) \
- $(COMMON_DRI_INCLUDES) $(EXPATINCLUDES)
+ $(COMMON_DRI_INCLUDES)
SRCS = $(COMMONSRCS)
OBJS = $(COMMONOBJS)