Parallel make-target-contrib

Use a Makefile with dependencies to allow building the contribs in
parallel.
SBCL_MAKE_JOBS=-jX controls the number of jobs, the same as for the C
runtime.

contrib/Makefile

@@ -0,0 +1,44 @@
+vpath %.fasl ../obj/sbcl-home/contrib/
+
+all: asdf.fasl sb-posix.fasl sb-bsd-sockets.fasl sb-introspect.fasl sb-cltl2.fasl \
+     sb-aclrepl.fasl sb-sprof.fasl sb-capstone.fasl sb-md5.fasl sb-capstone.fasl \
+     sb-executable.fasl sb-gmp.fasl sb-mpfr.fasl sb-queue.fasl sb-rotate-byte.fasl \
+     sb-simple-streams.fasl sb-concurrency.fasl sb-cover.fasl
+asdf.fasl:
+	sh ./build-contrib $(basename $(@F))
+sb-grovel.fasl: asdf.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-rt.fasl: asdf.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-posix.fasl: asdf.fasl sb-grovel.fasl sb-rt.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-bsd-sockets.fasl: asdf.fasl sb-rt.fasl sb-posix.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-cltl2.fasl: asdf.fasl sb-rt.fasl sb-posix.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-aclrepl.fasl: asdf.fasl sb-rt.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-concurrency.fasl: asdf.fasl sb-rt.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-sprof.fasl: asdf.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-introspect.fasl: asdf.fasl sb-rt.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-capstone.fasl: asdf.fasl sb-rt.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-md5.fasl: asdf.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-cover.fasl: asdf.fasl sb-md5.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-executable.fasl: asdf.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-gmp.fasl: asdf.fasl sb-rt.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-mpfr.fasl: asdf.fasl sb-rt.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-queue.fasl: asdf.fasl sb-concurrency.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-rotate-byte.fasl: asdf.fasl
+	sh ./build-contrib $(basename $(@F))
+sb-simple-streams.fasl: asdf.fasl sb-posix.fasl sb-bsd-sockets.fasl
+	sh ./build-contrib $(basename $(@F))

contrib/asdf-module.mk

@@ -29,7 +29,6 @@ export CC SBCL EXTRA_CFLAGS
 all: $(FASL) $(ASD)
 
 $(FASL)::
-	$(MAKE) -C ../asdf
 	$(SBCL) --eval '(setf (sb-ext:readtable-base-char-preference *readtable*) :both)' \
 		--load ../asdf-stub.lisp \
 		--eval '(asdf::build-asdf-contrib "$(SYSTEM)")'

contrib/build-contrib

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+mkdir -p ../obj/asdf-cache/$@/
+
+if $GNUMAKE -j1 -C $@ test < /dev/null 2>&1 && touch ../obj/asdf-cache/$@/test-passed.test-report ; then
+	:
+else
+	exit $?
+fi | tee ../output/building-contrib.$@

make-target-contrib.sh

@@ -55,42 +55,21 @@ export SBCL SBCL_BUILDING_CONTRIB
 # as SB-RT and SB-GROVEL, but FIXME: there's probably a better
 # solution.  -- CSR, 2003-05-30
 if [ -z "$DONT_CLEAN_SBCL_CONTRIB" ] ; then
-  find contrib/ obj/asdf-cache/ obj/sbcl-home/contrib/ \
-    \( -name '*.fasl' -o \
-       -name '*.FASL' -o \
-       -name 'foo.c' -o \
-       -name 'FOO.C' -o \
-       -name 'a.out' -o \
-       -name 'A.OUT' -o \
-       -name 'alien.so' -o \
-       -name 'ALIEN.SO' -o \
-       -name '*.o' -o \
-       -name '*.O' \) \
-    -print | xargs rm -f
+  rm -fr obj/sbcl-home/contrib/
+  rm -fr obj/asdf-cache/
 fi
 
 find output -name 'building-contrib.*' -print | xargs rm -f
 
 # Ignore all source registries.
 if [ -z "$*" ]; then
-    contribs_to_build="`cd contrib ; echo *`"
+    $GNUMAKE $SBCL_MAKE_JOBS -C contrib
 else
-    contribs_to_build="$*"
+    for x in "$@"; do
+        $GNUMAKE -C contrib $x.fasl
+    done
 fi
 
-for i in $contribs_to_build; do
-    test -d contrib/$i && test -f contrib/$i/Makefile || continue;
-    test -f contrib/$i/test-passed && rm contrib/$i/test-passed # remove old convention
-    test -f obj/asdf-cache/$i/test-passed.test-report && rm obj/asdf-cache/$i/test-passed.test-report
-    mkdir -p obj/asdf-cache/$i/
-    # hack to get exit codes right.
-    if $GNUMAKE -C contrib/$i test < /dev/null 2>&1 && touch obj/asdf-cache/$i/test-passed.test-report ; then
-	:
-    else
-	exit $?
-    fi | tee output/building-contrib.`basename $i` 
-done
-
 # Otherwise report expected failures:
 HEADER_HAS_BEEN_PRINTED=false
 for dir in `cd obj/asdf-cache/ ; echo *`; do