diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-28 05:15:19 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-28 05:15:19 +0200 |
| commit | 7b7ba9441b3ff72f0e963221342dcccbafc04312 (patch) | |
| tree | f718af7b85c4a17a28eb12f81922b1e3d1eb6481 /nx-X11/lib/GL/Imakefile | |
| parent | cbf4e4dbebaca561ff2ff98521e249b9eac046ab (diff) | |
| parent | 662a89545f3e953a47f176cf64e574350643d446 (diff) | |
| download | nx-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/Imakefile')
| -rw-r--r-- | nx-X11/lib/GL/Imakefile | 20 |
1 files changed, 17 insertions, 3 deletions
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)) |