Optimization for xorg/lib/Makefile

[Bernd Ernesti <veego%NetBSD.org@localhost>]

Hi,

the Makefile should be changed to make it a little easier for finding a
directory and more important to remove one .WAIT from that list.

Also adding more directories before using the first .WAIT (27 instead of
only 9). Both changes should make it a little bit faster for a parallel
build.

libXft unfortunally needs 5 levels of waits:
 libexpat, libfreetype, libXdmcp & libXau (which have no other dependencies) ->
 libX11 (depends on libXdmcp & libXau), libfontconfig (depends on libexpat & 
libfreetype) ->
 libXext (depends on libXdmcp, libXau & libX11) ->
 libXrender (depends on libXdmcp, libXau, libX11 & libXext) ->
 libXrandr (depends on libXdmcp, libXau, libX11, libXext & libXrender)

(Leaving out libz and libc which are not a concern here)

So we need at least 5 .WAIT.

I did move each .WAIT to its own line to make it easier to find them, but
wouldn't mind to have them at the end of the line.

cube pointed out that my last change for src/external/mit/xorg/Makefile
didn't make much sense because that targets aren't in use so I attached
another patch for that Makefile to remove these targets.

Bernd

Index: Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/Makefile,v
retrieving revision 1.5
diff -b -u -r1.5 Makefile
--- Makefile    1 Nov 2008 18:42:51 -0000       1.5
+++ Makefile    1 Nov 2008 22:30:16 -0000
@@ -2,16 +2,21 @@
 
 # build libraries for xorg
 
-SUBDIR=        libFS libICE libXau libXdmcp libdrm freetype libfontenc expat \
-       libOSMesa .WAIT \
-       fontconfig libSM libX11 .WAIT \
-       libXext .WAIT \
-       libXfixes libxkbfile libXt libXScrnSaver libXevie libXi libXinerama \
-       libXp libXrender libXres libXtst libXv libXxf86dga libXxf86misc \
-       libXxf86vm libXfontcache xkbdata liblbxutil .WAIT \
-       libXcomposite libXdamage libXcursor libXrandr libXTrap libXmu \
-       libXmuu libXpm pixman \
-       libXprintUtil libXprintAppUtil libXfont libXvMC libxkbui .WAIT \
-       libXft libXaw6 libXaw7 libXaw libGL .WAIT dri libGLU libGLw
+SUBDIR=        dri expat libfontenc freetype libFS libICE libOSMesa libXres \
+       libXau libXcomposite libXdamage libXdmcp libXevie libXfixes \
+       libXinerama libXprintAppUtil libXprintUtil libXvMC libXxf86dga \
+       libXxf86misc libXxf86vm libdrm liblbxutil libxkbfile libxkbui \
+       pixman xkbdata \
+       .WAIT \
+       fontconfig libSM libX11 \
+       .WAIT \
+       libXScrnSaver libXext libXi libXt \
+       .WAIT \
+       libGL libXTrap libXfont libXfontcache libXmu libXmuu libXp \
+       libXpm libXrender libXtst libXv \
+       .WAIT \
+       libGLU libGLw libXaw6 libXaw7 libXaw libXcursor libXrandr \
+       .WAIT \
+       libXft
 
 .include <bsd.subdir.mk>

Index: Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/Makefile,v
retrieving revision 1.4
diff -b -u -r1.4 Makefile
--- Makefile    27 Oct 2008 20:32:41 -0000      1.4
+++ Makefile    1 Nov 2008 22:03:16 -0000
@@ -36,11 +36,7 @@
        ${MAKEDIRTARGET} . ${targ}
 .endfor
 
-.for dir in    tools lib/libXdmcp lib/libXau lib/libX11 lib/libICE lib/libSM \
-               lib/libXext lib/libXpm lib/libXt lib/libXrender lib/libXfixes \
-               lib/libXdamage lib/libdrm lib/libXxf86vm lib/libGL lib/libXmu \
-               lib/expat lib/freetype lib/fontconfig lib/libXp lib/libXrandr \
-               lib
+.for dir in    tools lib
 do-${dir:S/\//-/g}:
 .  for targ in dependall install
        ${MAKEDIRTARGET} ${dir} ${targ}