From c189f6efce2fe1b84c7792875b2805fa331ee84f Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 21 Apr 2015 10:57:56 +0200
Subject: imake cleanup: Break up multiple vars into invidual lines to ease
 further work on patches / pull requests.

---
 nx-X11/include/extensions/Imakefile | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

(limited to 'nx-X11/include/extensions/Imakefile')

diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile
index 24c034103..6d13efef3 100644
--- a/nx-X11/include/extensions/Imakefile
+++ b/nx-X11/include/extensions/Imakefile
@@ -6,6 +6,8 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $
 
 XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.55 2003/04/21 12:32:06 sven Exp $
 
+NULL =
+
 #if BuildScreenSaverExt || BuildScreenSaverLibrary
 SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
 #endif
@@ -65,15 +67,27 @@ XRESHEADERS = XRes.h XResproto.h
 XEVIEHEADERS = Xevie.h Xeviestr.h
 #endif
 
-EXTRAHEADERS = $(SCREENSAVERHEADERS) $(XF86MISCHEADERS) $(XF86BIGFONTHEADERS) \
-	       $(XF86VIDMODEHEADERS) $(XF86DGAHEADERS) $(XINERAMAHEADERS) \
-	       $(LBXHEADERS) $(XVHEADERS) $(XVMCHEADERS) $(XF86RUSHHEADERS) \
-	       $(FONTCACHEHEADERS) $(RENDERHEADERS) $(RANDRHEADERS) \
-	       $(XFIXESHEADERS) $(DAMAGEHEADERS) $(COMPOSITEHEADERS) \
-	       $(XEVIEHEADERS) \
-	       $(XTRAPHEADERS) $(XRESHEADERS)
-
-
+EXTRAHEADERS = \
+	$(SCREENSAVERHEADERS) \
+	$(XF86MISCHEADERS) \
+	$(XF86BIGFONTHEADERS) \
+	$(XF86VIDMODEHEADERS) \
+	$(XF86DGAHEADERS) \
+	$(XINERAMAHEADERS) \
+	$(LBXHEADERS) \
+	$(XVHEADERS) \
+	$(XVMCHEADERS) \
+	$(XF86RUSHHEADERS) \
+	$(FONTCACHEHEADERS) \
+	$(RENDERHEADERS) \
+	$(RANDRHEADERS) \
+	$(XFIXESHEADERS) \
+	$(DAMAGEHEADERS) \
+	$(COMPOSITEHEADERS) \
+	$(XEVIEHEADERS) \
+	$(XTRAPHEADERS) \
+	$(XRESHEADERS) \
+	$(NULL)
 
 HEADERS = Xext.h \
 	xcmiscstr.h \
@@ -94,7 +108,8 @@ HEADERS = Xext.h \
 	sync.h syncstr.h \
 	Xcup.h Xcupstr.h \
 	dpms.h dpmsstr.h \
-	XEVI.h XEVIstr.h
+	XEVI.h XEVIstr.h \
+	$(NULL)
 
 all::
 
-- 
cgit v1.2.3


From 662a89545f3e953a47f176cf64e574350643d446 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 22 Apr 2015 00:37:47 +0200
Subject: imake cleanup: Drop references to X11 build-logic that is not present
 in nx-X11.

---
 nx-X11/include/extensions/Imakefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'nx-X11/include/extensions/Imakefile')

diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile
index 6d13efef3..3f2992b77 100644
--- a/nx-X11/include/extensions/Imakefile
+++ b/nx-X11/include/extensions/Imakefile
@@ -8,7 +8,7 @@ XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.55 2003/04/21 12:32:06 sven
 
 NULL =
 
-#if BuildScreenSaverExt || BuildScreenSaverLibrary
+#if BuildScreenSaverExt
 SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
 #endif
 
@@ -24,11 +24,11 @@ XF86VIDMODEHEADERS = xf86vmode.h xf86vmstr.h
 #if BuildXF86DGA || BuildXF86DGALibrary
 XF86DGAHEADERS = xf86dga.h xf86dgastr.h xf86dga1.h xf86dga1str.h
 #endif
-#if BuildLBX || BuildXextLib
+#if BuildXextLib
 LBXHEADERS = XLbx.h lbxbuf.h lbxbufstr.h lbxdeltastr.h lbximage.h lbxopts.h \
 	     lbxstr.h lbxzlib.h
 #endif
-#if BuildXvExt || BuildXvLibrary
+#if BuildXvExt
 XVHEADERS = Xv.h Xvlib.h Xvproto.h
 XVMCHEADERS = XvMC.h XvMClib.h XvMCproto.h vldXvMC.h
 #endif
@@ -56,14 +56,14 @@ COMPOSITEHEADERS = composite.h compositeproto.h
 #if BuildRandR || BuildRandRLibrary
 RANDRHEADERS = randr.h randrproto.h
 #endif
-#if BuildXTrap || BuildXTrapLibrary
+#if BuildXTrap
 XTRAPHEADERS = xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \
 	xtraplibp.h xtrapproto.h
 #endif
 #if BuildXResExt || BuildXResLibrary
 XRESHEADERS = XRes.h XResproto.h
 #endif
-#if BuildXevie || BuildXevieLibrary
+#if BuildXevie
 XEVIEHEADERS = Xevie.h Xeviestr.h
 #endif
 
-- 
cgit v1.2.3