civodul pushed a commit to branch main
in repository guile.
commit 99e727addee6acababe18c7fa7b5a0fb2516817c
Author: Ludovic Courtès <l...@gnu.org>
AuthorDate: Sun Jul 16 22:02:30 2023 +0200
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 | 2 +-
benchmark-suite/Makefile.am | 24 ------------------------
benchmark-suite/local.mk | 28 ++++++++++++++++++++++++++++
configure.ac | 1 -
4 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 3b742a41c..eb3541c34 100644
--- a/Makefile.am
+++ b/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
diff --git a/benchmark-suite/Makefile.am b/benchmark-suite/Makefile.am
deleted file mode 100644
index 47bd0365d..000000000
--- a/benchmark-suite/Makefile.am
+++ /dev/null
@@ -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
diff --git a/benchmark-suite/local.mk b/benchmark-suite/local.mk
new file mode 100644
index 000000000..b74f783f1
--- /dev/null
+++ b/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
diff --git a/configure.ac b/configure.ac
index 1b96951c5..f644dd2c5 100644
--- a/configure.ac
+++ b/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
