Remove recursive Makefile for 'benchmark-suite'.

* benchmark-suite/Makefile.am: Rename to...
* benchmark-suite/local.mk: ... this.  Prefix file names with %D%.
(EXTRA_DIST): Use '+=' and add 'README'.
* Makefile.am: Include it.
* configure.ac: Don't output 'benchmark-suite/Makefile'.

Makefile.am

@@ -37,7 +37,6 @@ SUBDIRS =					\
 	guile-readline				\
 	examples				\
 	test-suite				\
-	benchmark-suite				\
 	doc
 
 DIST_SUBDIRS = $(SUBDIRS) prebuilt
@@ -142,6 +141,7 @@ $(top_srcdir)/.version:
 gen-tarball-version:
 	echo $(VERSION) > $(distdir)/.tarball-version
 
+include benchmark-suite/local.mk
 include gc-benchmarks/local.mk
 
 # Makefile.am ends here

benchmark-suite/Makefile.am

@@ -1,24 +0,0 @@
-SCM_BENCHMARKS = benchmarks/0-reference.bm		\
-		 benchmarks/arithmetic.bm		\
-		 benchmarks/bytevector-io.bm	        \
-		 benchmarks/bytevectors.bm		\
-		 benchmarks/chars.bm			\
-		 benchmarks/continuations.bm		\
-		 benchmarks/hash.bm			\
-                 benchmarks/if.bm			\
-                 benchmarks/logand.bm			\
-		 benchmarks/ports.bm			\
-		 benchmarks/r6rs-arithmetic.bm		\
-		 benchmarks/read.bm			\
-		 benchmarks/srfi-1.bm			\
-		 benchmarks/srfi-13.bm			\
-		 benchmarks/structs.bm			\
-		 benchmarks/subr.bm			\
-		 benchmarks/vectors.bm			\
-		 benchmarks/vlists.bm			\
-		 benchmarks/write.bm			\
-		 benchmarks/strings.bm
-
-EXTRA_DIST = guile-benchmark benchmark-suite/lib.scm 	\
-	     $(SCM_BENCHMARKS)				\
-	     ChangeLog-2008

benchmark-suite/local.mk

@@ -0,0 +1,28 @@
+SCM_BENCHMARKS =				\
+  %D%/benchmarks/0-reference.bm			\
+  %D%/benchmarks/arithmetic.bm			\
+  %D%/benchmarks/bytevector-io.bm		\
+  %D%/benchmarks/bytevectors.bm			\
+  %D%/benchmarks/chars.bm			\
+  %D%/benchmarks/continuations.bm		\
+  %D%/benchmarks/hash.bm			\
+  %D%/benchmarks/if.bm				\
+  %D%/benchmarks/logand.bm			\
+  %D%/benchmarks/ports.bm			\
+  %D%/benchmarks/r6rs-arithmetic.bm		\
+  %D%/benchmarks/read.bm			\
+  %D%/benchmarks/srfi-1.bm			\
+  %D%/benchmarks/srfi-13.bm			\
+  %D%/benchmarks/structs.bm			\
+  %D%/benchmarks/subr.bm			\
+  %D%/benchmarks/vectors.bm			\
+  %D%/benchmarks/vlists.bm			\
+  %D%/benchmarks/write.bm			\
+  %D%/benchmarks/strings.bm
+
+EXTRA_DIST +=					\
+  %D%/guile-benchmark				\
+  %D%/benchmark-suite/lib.scm			\
+  $(SCM_BENCHMARKS)				\
+  %D%/ChangeLog-2008				\
+  %D%/README

configure.ac

@@ -1467,7 +1467,6 @@ AC_CONFIG_FILES([libguile/gen-scmconfig.h])
 AC_CONFIG_FILES([
   Makefile
   lib/Makefile
-  benchmark-suite/Makefile
   doc/Makefile
   doc/r5rs/Makefile
   doc/ref/Makefile