From 5088a6d1389aff29ec144eabda36971ac39587b0 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 8 Apr 2016 10:01:30 +0200
Subject: Xserver/mi/Imakefile: Serialize parameters and make Imakefile changes
 more trackable.

---
 nx-X11/programs/Xserver/mi/Imakefile | 129 ++++++++++++++++++++++++++---------
 1 file changed, 98 insertions(+), 31 deletions(-)

diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index 0d70c46ae..46ec25e5c 100644
--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/nx-X11/programs/Xserver/mi/Imakefile
@@ -16,12 +16,10 @@
 /**************************************************************************/
 
 XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:36 cpqbld Exp $
-
-
-
-
 XCOMM $XFree86: xc/programs/Xserver/mi/Imakefile,v 3.34 2002/05/22 21:38:31 herrb Exp $
 
+NULL =
+
 #include <Server.tmpl>
 
 #if ! HasCbrt
@@ -40,27 +38,85 @@ MIINITEXTSRC = miinitext.c
 MIINITEXTOBJ = miinitext.o
 #endif
 
-SRCS =  $(CBRT_SRC) mivaltree.c mipolyseg.c mipolyrect.c \
-	mipoly.c mipolycon.c mipolygen.c mipolyutil.c \
-	mifillrct.c miwideline.c mispans.c \
-	miarc.c mizerarc.c mifillarc.c \
-	miwindow.c micursor.c \
-	mipolytext.c mibitblt.c mipolypnt.c mipushpxl.c \
-	miexpose.c miglblt.c mizerline.c mizerclip.c mifpolycon.c \
-	midash.c mibstore.c mibank.c $(MIINITEXTSRC) mieq.c \
-	mipointer.c misprite.c midispcur.c miscrinit.c miclipn.c migc.c \
-	micmap.c mioverlay.c
-
-OBJS =	$(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \
-	mipoly.o mipolycon.o mipolygen.o mipolyutil.o \
-	mifillrct.o miwideline.o mispans.o \
-	miarc.o mizerarc.o mifillarc.o \
-	miwindow.o micursor.o \
-	mipolytext.o mibitblt.o mipolypnt.o mipushpxl.o \
-	miexpose.o miglblt.o mizerline.o mizerclip.o mifpolycon.o \
-	midash.o mibstore.o mibank.o $(MIINITEXTOBJ) mieq.o \
-	mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o \
-	micmap.o mioverlay.o
+SRCS =  $(CBRT_SRC)             \
+        mivaltree.c             \
+        mipolyseg.c             \
+        mipolyrect.c            \
+        mipoly.c                \
+        mipolycon.c             \
+        mipolygen.c             \
+        mipolyutil.c            \
+        mifillrct.c             \
+        miwideline.c            \
+        mispans.c               \
+        miarc.c                 \
+        mizerarc.c              \
+        mifillarc.c             \
+        miwindow.c              \
+        micursor.c              \
+        mipolytext.c            \
+        mibitblt.c              \
+        mipolypnt.c             \
+        mipushpxl.c             \
+        miexpose.c              \
+        miglblt.c               \
+        mizerline.c             \
+        mizerclip.c             \
+        mifpolycon.c            \
+        midash.c                \
+        mibstore.c              \
+        mibank.c                \
+        $(MIINITEXTSRC)         \
+        mieq.c                  \
+        mipointer.c             \
+        misprite.c              \
+        midispcur.c             \
+        miscrinit.c             \
+        miclipn.c               \
+        migc.c                  \
+        micmap.c                \
+        mioverlay.c             \
+        $(NULL)
+
+OBJS =  $(CBRT_OBJ)             \
+        mivaltree.o             \
+        mipolyseg.o             \
+        mipolyrect.o            \
+        mipoly.o                \
+        mipolycon.o             \
+        mipolygen.o             \
+        mipolyutil.o            \
+        mifillrct.o             \
+        miwideline.o            \
+        mispans.o               \
+        miarc.o                 \
+        mizerarc.o              \
+        mifillarc.o             \
+        miwindow.o              \
+        micursor.o              \
+        mipolytext.o            \
+        mibitblt.o              \
+        mipolypnt.o             \
+        mipushpxl.o             \
+        miexpose.o              \
+        miglblt.o               \
+        mizerline.o             \
+        mizerclip.o             \
+        mifpolycon.o            \
+        midash.o                \
+        mibstore.o              \
+        mibank.o                \
+        $(MIINITEXTOBJ)         \
+        mieq.o                  \
+        mipointer.o             \
+        misprite.o              \
+        midispcur.o             \
+        miscrinit.o             \
+        miclipn.o               \
+        migc.o                  \
+        micmap.o                \
+        mioverlay.o             \
+        $(NULL)
 
 #if defined(XorgVersion)
 /* 
@@ -83,16 +139,27 @@ EXT_DEFINES = ExtensionDefines \
 
 EXT_DEFINES = ExtensionDefines -UXINPUT \
 	-UXFree86LOADER
-
 #endif
 
 #endif
 
-INCLUDES = -I. -I../include -I../render \
-	    -I../xfixes -I../damageext -I../miext/damage \
-           -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext \
-           `pkg-config --cflags-only-I pixman-1`
-LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
+INCLUDES = -I.                  \
+           -I../include         \
+           -I../render          \
+           -I../xfixes          \
+           -I../damageext       \
+           -I../miext/damage    \
+           -I$(XINCLUDESRC)     \
+           -I$(EXTINCSRC)       \
+           -I$(SERVERSRC)/Xext  \
+           `pkg-config --cflags-only-I pixman-1` \
+           $(NULL)
+
+LINTLIBS =                      \
+           ../dix/llib-ldix.ln  \
+           ../os/llib-los.ln    \
+           $(NULL)
+
 DEFINES  = $(FFS_DEFINES)
 
 NormalLibraryObjectRule()
-- 
cgit v1.2.3