From 3ab28297ce6aa46dfc5f023a405e0ed8247aa881 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Mon, 18 Oct 2021 22:54:32 +0200
Subject: Imakefiles: whitespace fixes

---
 nx-X11/programs/Xserver/Imakefile                  | 12 ++---
 nx-X11/programs/Xserver/hw/nxagent/Imakefile       | 55 +++++++++++-----------
 .../programs/Xserver/hw/nxagent/compext/Imakefile  | 18 +++----
 3 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 390ad538b..72ed8484c 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -31,10 +31,10 @@ NULL =
 
 #include <Server.tmpl>
 
-/* On most systems the linker requires the libraries in dependency order. 
+/* On most systems the linker requires the libraries in dependency order.
    But we have no real order because there are cycles. We fix this by adding
-   some libraries twice on the commandline. dependLib will add the 
-   dependency library to the commandline if the link order is important */ 
+   some libraries twice on the commandline. dependLib will add the
+   dependency library to the commandline if the link order is important */
 #if 1 /* This is currently enabled for all systems */
 #define dependLib(x) x
 #else
@@ -43,7 +43,7 @@ NULL =
 
 #if defined(XorgVersion)
 /* Do not strip server binaries */
-INSTPGMFLAGS = 
+INSTPGMFLAGS =
 #endif
 
 #define PreFbLibs $(DIX) $(OS) $(XPDDX)
@@ -136,7 +136,7 @@ INSTPGMFLAGS =
              FB = fb/LibraryTargetName(fb)
          DAMAGE = miext/damage/LibraryTargetName(damage)
          SHADOW = miext/shadow/LibraryTargetName(shadow)
-          LAYER = miext/layer/LibraryTargetName(layer) 
+          LAYER = miext/layer/LibraryTargetName(layer)
 #if !HasFfs && (defined(mingwArchitecture) || defined(cygwinArchitecture))
              /* Order of libraries is important when linking in mingw or
               * cygwin. libmi.a requires ffs from libdix.a. So it is added
@@ -147,7 +147,7 @@ INSTPGMFLAGS =
 #endif
    MIINITEXTOBJ = mi/miinitext.o
             DIX = dix/LibraryTargetName(dix)
-#if UsbMouseSupport 
+#if UsbMouseSupport
 #if !HasLibUsb
             USB = $(XF86OSSRC)/bsd/libusb/LibraryTargetName(usb)
 #else
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index 4e48f62f5..710bfba80 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -1,10 +1,9 @@
 #include <Server.tmpl>
 
-
 NULL =
 
 SUBDIRS = compext \
-          $(NULL)
+	  $(NULL)
 
 SRCS =  \
 	NXwindow.c \
@@ -17,9 +16,9 @@ SRCS =  \
 	NXglyph.c \
 	NXpicture.c \
 	NXshm.c \
-        NXglxext.c \
-        NXxvdisp.c \
-        NXresource.c \
+	NXglxext.c \
+	NXxvdisp.c \
+	NXresource.c \
 	NXmitrap.c \
 	Args.c \
 	Binder.c \
@@ -73,9 +72,9 @@ OBJS =  \
 	NXglyph.o \
 	NXpicture.o \
 	NXshm.o \
-        NXglxext.o \
-        NXxvdisp.o \
-        NXresource.o \
+	NXglxext.o \
+	NXxvdisp.o \
+	NXresource.o \
 	NXmitrap.o \
 	Args.o \
 	Binder.o \
@@ -240,26 +239,26 @@ NX_DEFINES = \
 #endif
 
 DEFINES = \
-        -g $(OS_DEFINES) $(EXT_DEFINES) $(NX_DEFINES) \
-        -UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UXF86DRI \
-        -DNXAGENT_SERVER \
-        -DNXAGENT_RENDER_CLEANUP \
-        -DNXAGENT_FIXKEYS \
-        -DNXAGENT_CLIPBOARD \
-        -DNXAGENT_WAKEUP=1000 \
-        -DNXAGENT_ONSTART \
-        -DNXAGENT_ARTSD \
-        -UNX_DEBUG_INPUT \
-        -DRANDR_10_INTERFACE=1 \
-        -DRANDR_12_INTERFACE=1 \
-        -DRANDR_13_INTERFACE=1 \
-        -DRANDR_14_INTERFACE=1 \
-        -DRANDR_15_INTERFACE=1 \
-        -DPANORAMIX \
-        -UDEBUG_TREE \
-        -DX2GO \
-        -DSYSTEMFONTDIR=\"$(SYSTEMFONTDIR)\" \
-        $(NULL)
+	-g $(OS_DEFINES) $(EXT_DEFINES) $(NX_DEFINES) \
+	-UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UXF86DRI \
+	-DNXAGENT_SERVER \
+	-DNXAGENT_RENDER_CLEANUP \
+	-DNXAGENT_FIXKEYS \
+	-DNXAGENT_CLIPBOARD \
+	-DNXAGENT_WAKEUP=1000 \
+	-DNXAGENT_ONSTART \
+	-DNXAGENT_ARTSD \
+	-UNX_DEBUG_INPUT \
+	-DRANDR_10_INTERFACE=1 \
+	-DRANDR_12_INTERFACE=1 \
+	-DRANDR_13_INTERFACE=1 \
+	-DRANDR_14_INTERFACE=1 \
+	-DRANDR_15_INTERFACE=1 \
+	-DPANORAMIX \
+	-UDEBUG_TREE \
+	-DX2GO \
+	-DSYSTEMFONTDIR=\"$(SYSTEMFONTDIR)\" \
+	$(NULL)
 
 all:: $(OBJS)
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile
index 407baab80..ea34def78 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile
@@ -30,16 +30,16 @@ OBJS =	\
 	Z.o \
 	$(NULL)
 
-   INCLUDES = -I$(SERVERSRC)/include \
-              -I$(XBUILDINCDIR) \
-              -I../../../../../lib/include/X11 \
-              `pkg-config --cflags-only-I pixman-1` \
-              $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --cflags-only-I 'zlib') \
-              `pkg-config --cflags-only-I libpng` \
-              $(NULL)
+INCLUDES = -I$(SERVERSRC)/include \
+	   -I$(XBUILDINCDIR) \
+	   -I../../../../../lib/include/X11 \
+	   `pkg-config --cflags-only-I pixman-1` \
+	   $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --cflags-only-I 'zlib') \
+	   `pkg-config --cflags-only-I libpng` \
+	   $(NULL)
 
-   LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln \
-              $(NULL)
+LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln \
+	   $(NULL)
 
 NormalLibraryObjectRule()
 NormalLibraryTarget(compext,$(OBJS))
-- 
cgit v1.2.3