imake cleanup: Break up multiple vars into invidual lines to ease further work…

nx-X11/config/Imakefile

@@ -6,7 +6,13 @@ XCOMM $XFree86: xc/config/Imakefile,v 1.3 2001/01/17 16:22:29 dawes Exp $
 #undef BootstrapCleanSubdirs
 #define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)"
 
-BOOTSTRAPSUBDIRS = imake makedepend
+NULL =
+
+BOOTSTRAPSUBDIRS = \
+	imake \
+	makedepend \
+	$(NULL)
+
 SUBDIRS = cf $(BOOTSTRAPSUBDIRS)
 
 #if (defined(XFree86VersionString) || defined(XorgVersionString)) \

nx-X11/include/Imakefile

@@ -4,6 +4,9 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $
 
 
 XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $
+
+NULL =
+
 #define IHaveSubdirs
 #define PassCDebugFlags /**/
 
@@ -23,7 +26,8 @@ EXTRA_HEADERS = Xw32defs.h Xwinsock.h Xwindows.h
 EXTRA_HEADERS = Xwindows.h
 #endif
 
-HEADERS = DECkeysym.h \
+HEADERS = \
+	DECkeysym.h \
 	HPkeysym.h \
 	Sunkeysym.h \
 	X.h \
@@ -46,7 +50,8 @@ HEADERS = DECkeysym.h \
 	ap_keysym.h \
 	keysym.h \
 	keysymdef.h \
-	$(EXTRA_HEADERS)
+	$(EXTRA_HEADERS) \
+	$(NULL)
 
 all::
 

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::
 

nx-X11/lib/GL/GL/Imakefile

@@ -242,5 +242,3 @@ InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
 ProfiledLibraryTarget($(LIBNAME),$(POBJS))
 InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
 #endif
-
-

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))

nx-X11/lib/GL/mesa/Imakefile

@@ -12,6 +12,8 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $
  * driver modules.
  */
 
+NULL =
+
 #if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
 #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
 #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
@@ -63,8 +65,17 @@ LibraryObjectRule()
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-SUBDIRS = $(ASM_SUBDIRS) array_cache main math swrast swrast_setup tnl tnl_dd shader
-
+SUBDIRS = \
+	$(ASM_SUBDIRS) \
+	array_cache \
+	main \
+	math \
+	swrast \
+	swrast_setup \
+	tnl \
+	tnl_dd \
+	shader \
+	$(NULL)
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))

nx-X11/lib/Imakefile

@@ -9,6 +9,8 @@ XCOMM $XFree86: xc/lib/Imakefile,v 3.74 2003/04/14 20:37:07 herrb Exp $
 #define IHaveSubdirs
 #define PassCDebugFlags
 
+NULL =
+
 #if BuildXaw6 && BuildLibraries
 XAW6LIBDIR = Xaw6
 #endif
@@ -142,8 +144,12 @@ APPLELIBDIR = apple
 WINDOWSLIBDIR = windows
 #endif
 
-XF86EXTLIBS = $(XF86MISCLIBDIR) $(XF86VMLIBDIR) \
-		$(XF86DGALIBDIR) $(XF86RUSHLIBDIR)
+XF86EXTLIBS = \
+	$(XF86MISCLIBDIR) \
+	$(XF86VMLIBDIR) \
+	$(XF86DGALIBDIR) \
+	$(XF86RUSHLIBDIR) \
+	$(NULL)
 
 #if BuildLBX
 LBXUTILDIR = lbxutil
@@ -179,20 +185,57 @@ XTSTLIBDIR = Xtst
 #endif
 
 
-LINTSUBDIRS = $(XAULIBDIR) $(X11LIBDIR) \
-             $(OLDXLIBDIR) $(ICELIBDIR) $(SMLIBDIR) $(XEXTLIBDIR) $(XTLIBDIR) \
-             $(SSLIBDIR) $(XF86MISCLIBDIR) $(XF86VMLIBDIR) $(XF86DGALIBDIR) \
-             $(XF86RUSHLIBDIR) $(XMULIBDIR) $(XMUULIBDIR) $(XPMLIBDIR) \
-             $(XAW6LIBDIR) $(XAW7LIBDIR) $(XAWLIBDIR) \
-             $(XINPUTLIBDIR) $(XTSTLIBDIR) $(FSLIBDIR) $(XKBLIBDIR) \
-             $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(EXPATBUILDDIR) \
-             $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \
-             $(DPSLIBDIR) $(PSRESLIBDIR) $(DPSTKLIBDIR) $(XINERAMADIR) \
-             $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) \
-	     $(XVMCLIBDIR) $(RANDRLIBDIR) $(XTRAPLIBDIR) \
-	     $(XRESLIBDIR) $(APPLELIBDIR) $(DMXLIBDIR) $(WINDOWSLIBDIR) \
-	     $(XEVIELIBDIR) $(XFIXESLIBDIR) $(DAMAGELIBDIR) \
-	     $(XCURSORLIBDIR) $(COMPOSITELIBDIR)
+LINTSUBDIRS = \
+	$(XAULIBDIR) \
+	$(X11LIBDIR) \
+	$(OLDXLIBDIR) \
+	$(ICELIBDIR) \
+	$(SMLIBDIR) \
+	$(XEXTLIBDIR) \
+	$(XTLIBDIR) \
+	$(SSLIBDIR) \
+	$(XF86MISCLIBDIR) \
+	$(XF86VMLIBDIR) \
+	$(XF86DGALIBDIR) \
+	$(XF86RUSHLIBDIR) \
+	$(XMULIBDIR) \
+	$(XMUULIBDIR) \
+	$(XPMLIBDIR) \
+	$(XAW6LIBDIR) \
+	$(XAW7LIBDIR) \
+	$(XAWLIBDIR) \
+	$(XINPUTLIBDIR) \
+	$(XTSTLIBDIR) \
+	$(FSLIBDIR) \
+	$(XKBLIBDIR) \
+	$(XKBUILIBDIR) \
+	$(LBXUTILDIR) \
+	$(XALIBDIR) \
+	$(EXPATBUILDDIR) \
+	$(XVLIBDIR) \
+	$(GLXLIBDIR) \
+	$(GLULIBDIR) \
+	$(GLWLIBDIR) \
+	$(DPSLIBDIR) \
+	$(PSRESLIBDIR) \
+	$(DPSTKLIBDIR) \
+	$(XINERAMADIR) \
+	$(ZLIBDIR) \
+	$(REGEXDIR) \
+	$(RENDERLIBDIR) \
+	$(XVMCLIBDIR) \
+	$(RANDRLIBDIR) \
+	$(XTRAPLIBDIR) \
+	$(XRESLIBDIR) \
+	$(APPLELIBDIR) \
+	$(DMXLIBDIR) \
+	$(WINDOWSLIBDIR) \
+	$(XEVIELIBDIR) \
+	$(XFIXESLIBDIR) \
+	$(DAMAGELIBDIR) \
+	$(XCURSORLIBDIR) \
+	$(COMPOSITELIBDIR) \
+	$(NULL)
 
 SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS)