From b4e2ec70982358cfc0ad939367dcbfc1bc3b519b Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 10 Apr 2016 02:37:19 +0200
Subject: Xserver/GL/glx/Imakefile: Serialize parameters and make Imakefile
 changes more trackable.

---
 nx-X11/programs/Xserver/GL/glx/Imakefile | 105 ++++++++++++++++++++++++-------
 1 file changed, 82 insertions(+), 23 deletions(-)

(limited to 'nx-X11/programs/Xserver/GL')

diff --git a/nx-X11/programs/Xserver/GL/glx/Imakefile b/nx-X11/programs/Xserver/GL/glx/Imakefile
index bf2d760a0..5683cf51c 100644
--- a/nx-X11/programs/Xserver/GL/glx/Imakefile
+++ b/nx-X11/programs/Xserver/GL/glx/Imakefile
@@ -1,5 +1,7 @@
 XCOMM $XFree86: xc/programs/Xserver/GL/glx/Imakefile,v 1.11 2004/01/28 18:11:50 alanh Exp $
 
+NULL =
+
 #if DoLoadableServer
 # if !BuildModuleInSubdir
 #  define IHaveModules
@@ -22,29 +24,86 @@ LinkSourceFile(glcontextmodes.h, $(MESASRCDIR)/src/mesa/drivers/dri/common)
 LinkSourceFile(indirect_size.c, $(MESASRCDIR)/src/glx/x11)
 LinkSourceFile(indirect_size.h, $(MESASRCDIR)/src/glx/x11)
 
-         SRCS = global.c glxbuf.c glxcmds.c glxcmdsswap.c glxext.c \
-                glxfb.c glximports.c glxmem.c glxpix.c glxscreens.c \
-                glxutil.c render2.c render2swap.c renderpix.c \
-                renderpixswap.c rensize.c rensizetab.c single2.c \
-                single2swap.c singlepix.c singlepixswap.c \
-                singlesize.c xfont.c g_disptab.c g_disptab_EXT.c \
-                g_render.c g_renderswap.c g_single.c g_singleswap.c \
-                glcontextmodes.c indirect_size.c $(MSRCS)
-
-         OBJS = global.o glxbuf.o glxcmds.o glxcmdsswap.o glxext.o \
-                glxfb.o glximports.o glxmem.o glxpix.o glxscreens.o \
-                glxutil.o render2.o render2swap.o renderpix.o \
-                renderpixswap.o rensize.o rensizetab.o single2.o \
-                single2swap.o singlepix.o singlepixswap.o \
-                singlesize.o xfont.o g_disptab.o g_disptab_EXT.o \
-                g_render.o g_renderswap.o g_single.o g_singleswap.o \
-                glcontextmodes.o indirect_size.o $(MOBJS)
-
-     INCLUDES = -I$(SERVERSRC)/GL/glx -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/include -I$(INCLUDESRC) -I$(MESASRCDIR)/include \
-                -I$(XINCLUDESRC) -I$(SERVERSRC)/mi \
-                -I$(EXTINCSRC) -I$(LIBSRC)/GL/include \
-                -I$(XF86SRC) \
-                `pkg-config --cflags-only-I pixman-1`
+         SRCS = global.c                \
+                glxbuf.c                \
+                glxcmds.c               \
+                glxcmdsswap.c           \
+                glxext.c                \
+                glxfb.c                 \
+                glximports.c            \
+                glxmem.c                \
+                glxpix.c                \
+                glxscreens.c            \
+                glxutil.c               \
+                render2.c               \
+                render2swap.c           \
+                renderpix.c             \
+                renderpixswap.c         \
+                rensize.c               \
+                rensizetab.c            \
+                single2.c               \
+                single2swap.c           \
+                singlepix.c             \
+                singlepixswap.c         \
+                singlesize.c            \
+                xfont.c                 \
+                g_disptab.c             \
+                g_disptab_EXT.c         \
+                g_render.c              \
+                g_renderswap.c          \
+                g_single.c              \
+                g_singleswap.c          \
+                glcontextmodes. c       \
+                indirect_size.c         \
+                $(MSRCS)                \
+                $(NULL)
+
+         OBJS = global.o                \
+                glxbuf.o                \
+                glxcmds.o               \
+                glxcmdsswap.o           \
+                glxext.o                \
+                glxfb.o                 \
+                glximports.o            \
+                glxmem.o                \
+                glxpix.o                \
+                glxscreens.o            \
+                glxutil.o               \
+                render2.o               \
+                render2swap.o           \
+                renderpix.o             \
+                renderpixswap.o         \
+                rensize.o               \
+                rensizetab.o            \
+                single2.o               \
+                single2swap.o           \
+                singlepix.o             \
+                singlepixswap.o         \
+                singlesize.o            \
+                xfont.o                 \
+                g_disptab.o             \
+                g_disptab_EXT.o         \
+                g_render.o              \
+                g_renderswap.o          \
+                g_single.o              \
+                g_singleswap.o          \
+                glcontextmodes.o        \
+                indirect_size.o         \
+                $(MOBJS)                \
+                $(NULL)
+
+     INCLUDES = -I$(SERVERSRC)/GL/glx                   \
+                -I$(SERVERSRC)/GL/include               \
+                -I$(SERVERSRC)/include                  \
+                -I$(INCLUDESRC)                         \
+                -I$(MESASRCDIR)/include                 \
+                -I$(XINCLUDESRC)                        \
+                -I$(SERVERSRC)/mi                       \
+                -I$(EXTINCSRC)                          \
+                -I$(LIBSRC)/GL/include                  \
+                -I$(XF86SRC)                            \
+                `pkg-config --cflags-only-I pixman-1`   \
+                $(NULL)
 
 #if defined(DarwinArchitecture) && ((OSMajorVersion == 6 && OSMinorVersion < 3) || OSMajorVersion < 6)
   NO_EXT_DEFS = -DMISSING_GL_EXTS
-- 
cgit v1.2.3