aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/GL
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-21 10:57:56 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-28 04:49:19 +0200
commitc189f6efce2fe1b84c7792875b2805fa331ee84f (patch)
treebbe2a36b359318459c53970da038445db8a00c2c /nx-X11/lib/GL
parentcbf4e4dbebaca561ff2ff98521e249b9eac046ab (diff)
downloadnx-libs-c189f6efce2fe1b84c7792875b2805fa331ee84f.tar.gz
nx-libs-c189f6efce2fe1b84c7792875b2805fa331ee84f.tar.bz2
nx-libs-c189f6efce2fe1b84c7792875b2805fa331ee84f.zip
imake cleanup: Break up multiple vars into invidual lines to ease further work on patches / pull requests.
Diffstat (limited to 'nx-X11/lib/GL')
-rw-r--r--nx-X11/lib/GL/GL/Imakefile2
-rw-r--r--nx-X11/lib/GL/Imakefile20
-rw-r--r--nx-X11/lib/GL/mesa/Imakefile15
3 files changed, 30 insertions, 7 deletions
diff --git a/nx-X11/lib/GL/GL/Imakefile b/nx-X11/lib/GL/GL/Imakefile
index 336f3d5b7..8c3ac0af4 100644
--- a/nx-X11/lib/GL/GL/Imakefile
+++ b/nx-X11/lib/GL/GL/Imakefile
@@ -242,5 +242,3 @@ InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
ProfiledLibraryTarget($(LIBNAME),$(POBJS))
InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
#endif
-
-
diff --git a/nx-X11/lib/GL/Imakefile b/nx-X11/lib/GL/Imakefile
index b53a71f4c..6b350203c 100644
--- a/nx-X11/lib/GL/Imakefile
+++ b/nx-X11/lib/GL/Imakefile
@@ -50,7 +50,7 @@ XCOMM Server-side tokens:
XCOMM BuildGlxExt
XCOMM GlxUseSGISI
-
+NULL =
#include <Threads.tmpl>
@@ -108,9 +108,23 @@ LIBGLBUILDDIR = GL
* the drivers, and in the latter case, it needs to be built after the driver.
*/
#if BuildXF86DRI && GlxUseBuiltInDRIDriver
-SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
+SUBDIRS = \
+ $(MESADIRS) \
+ $(DRIDIRS) \
+ $(DRIVERDIRS) \
+ $(GLXDIRS) \
+ $(LIBGLBUILDDIR) \
+ $(OSMESADIRS) \
+ $(NULL)
#else
-SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS)
+SUBDIRS = \
+ $(MESADIRS) \
+ $(GLXDIRS) \
+ $(DRIDIRS) \
+ $(LIBGLBUILDDIR) \
+ $(OSMESADIRS) \
+ $(DRIVERDIRS) \
+ $(NULL)
#endif
MakeSubdirs($(SUBDIRS))
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))