diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index 9627155..2545ef8 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST=README bench.ss benchall.ss rn100 parsing-data.ss \ - summarize.pl rnrs-benchmarks.ss bib simplex.ss \ + summarize.pl rnrs-benchmarks.ss bib \ rnrs-benchmarks/slatex-data/test.tex \ rnrs-benchmarks/slatex-data/slatex.sty \ rnrs-benchmarks/ack.ss \ diff --git a/benchmarks/Makefile.in b/benchmarks/Makefile.in index c31bbe8..4d102ce 100644 --- a/benchmarks/Makefile.in +++ b/benchmarks/Makefile.in @@ -146,7 +146,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = README bench.ss benchall.ss rn100 parsing-data.ss \ - summarize.pl rnrs-benchmarks.ss bib simplex.ss \ + summarize.pl rnrs-benchmarks.ss bib \ rnrs-benchmarks/slatex-data/test.tex \ rnrs-benchmarks/slatex-data/slatex.sty \ rnrs-benchmarks/ack.ss \ @@ -224,9 +224,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign benchmarks/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu benchmarks/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign benchmarks/Makefile + $(AUTOMAKE) --gnu benchmarks/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/doc/Makefile.in b/doc/Makefile.in index 0bd0110..c23cab6 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -171,9 +171,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign doc/Makefile + $(AUTOMAKE) --gnu doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/lib/Makefile.in b/lib/Makefile.in index ce28e78..892c61c 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -181,9 +181,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign lib/Makefile + $(AUTOMAKE) --gnu lib/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/scheme/Makefile.am b/scheme/Makefile.am index d92a7c5..d00fb97 100644 --- a/scheme/Makefile.am +++ b/scheme/Makefile.am @@ -1,8 +1,8 @@ nodist_pkglib_DATA=ikarus.boot -EXTRA_DIST=ikarus.boot.4.prebuilt ikarus.boot.8.prebuilt \ - ikarus.enumerations.ss \ +EXTRA_DIST=ikarus.boot.4.prebuilt ikarus.boot.8.prebuilt last-revision \ + ikarus.enumerations.ss run-tests.ss \ ikarus.exceptions.ss ikarus.apply.ss ikarus.bytevectors.ss \ ikarus.cafe.ss ikarus.chars.ss ikarus.code-objects.ss \ ikarus.codecs.ss ikarus.collect.ss ikarus.command-line.ss \ @@ -25,16 +25,81 @@ EXTRA_DIST=ikarus.boot.4.prebuilt ikarus.boot.8.prebuilt \ psyntax.compat.ss psyntax.config.ss psyntax.expander.ss \ psyntax.internal.ss psyntax.library-manager.ss \ unicode/unicode-char-cases.ss unicode/unicode-charinfo.ss \ + unicode-data.ss unicode/unicode-data.ss \ + unicode/UNIDATA/CaseFolding.txt \ + unicode/UNIDATA/NormalizationTest.txt \ + unicode/UNIDATA/SpecialCasing.txt \ + unicode/UNIDATA/WordBreakProperty.txt \ + unicode/UNIDATA/CompositionExclusions.txt \ + unicode/UNIDATA/PropList.txt \ + unicode/UNIDATA/UnicodeData.txt \ ikarus.io.ss ikarus.time-and-date.ss ikarus.not-yet-implemented.ss \ ikarus.string-to-number.ss ikarus.compiler.source-optimizer.ss \ ikarus.compiler.tag-annotation-analysis.ss ikarus.ontology.ss \ ikarus.reader.annotated.ss ikarus.pointers.ss ikarus.equal.ss \ - ikarus.symbol-table.ss ikarus.apropos.ss ikarus.include-src.ss - + ikarus.symbol-table.ss ikarus.apropos.ss ikarus.include-src.ss \ + tests/SRFI-1.ss \ + tests/bignum-to-flonum.ss \ + tests/bignums.ss \ + tests/bitwise.ss \ + tests/bytevectors.ss \ + tests/case-folding.ss \ + tests/div-and-mod.ss \ + tests/enums.ss \ + tests/fasl.ss \ + tests/fixnums.ss \ + tests/fldiv-and-mod.ss \ + tests/framework.ss \ + tests/guardians.ss \ + tests/hashtables.ss \ + tests/io.ss \ + tests/lists.ss \ + tests/normalization.ss \ + tests/numerics.ss \ + tests/parse-flonums.ss \ + tests/pointers.ss \ + tests/r6rs-records-procedural.ss \ + tests/reader.ss \ + tests/repl.ss \ + tests/rn100 \ + tests/set-position.ss \ + tests/sorting.ss \ + tests/string-to-number.ss \ + tests/strings.ss \ + tests/symbol-table.ss \ + tests/tests-1.1-req.scm \ + tests/tests-1.2-req.scm \ + tests/tests-1.3-req.scm \ + tests/tests-1.4-req.scm \ + tests/tests-1.5-req.scm \ + tests/tests-1.6-req.scm \ + tests/tests-1.7-req.scm \ + tests/tests-1.8-req.scm \ + tests/tests-1.9-req.scm \ + tests/tests-2.1-req.scm \ + tests/tests-2.2-req.scm \ + tests/tests-2.3-req.scm \ + tests/tests-2.4-req.scm \ + tests/tests-2.6-req.scm \ + tests/tests-2.8-req.scm \ + tests/tests-2.9-req.scm \ + tests/tests-3.1-req.scm \ + tests/tests-3.2-req.scm \ + tests/tests-3.3-req.scm \ + tests/tests-3.4-req.scm \ + tests/tests-4.1-req.scm \ + tests/tests-4.2-req.scm \ + tests/tests-4.3-req.scm \ + tests/tests-5.1-req.scm \ + tests/tests-5.2-req.scm \ + tests/tests-5.3-req.scm \ + tests/tests-5.6-req.scm \ + tests/unicode.ss + all: $(nodist_pkglib_DATA) revno = "$(shell sed 's/ .*//' ../.bzr/branch/last-revision 2>/dev/null)" -last-revision: $(shell ls ../.bzr/branch/last-revision 2>/dev/null) +$(srcdir)/last-revision: $(shell ls ../.bzr/branch/last-revision 2>/dev/null) echo $(revno) >$@ sizeofvoidp = $(shell grep SIZEOF_VOID_P ../config.h | sed "s/.*\(.\)/\1/g") diff --git a/scheme/Makefile.in b/scheme/Makefile.in index 7fe5e88..dd583a9 100644 --- a/scheme/Makefile.in +++ b/scheme/Makefile.in @@ -156,8 +156,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ nodist_pkglib_DATA = ikarus.boot -EXTRA_DIST = ikarus.boot.4.prebuilt ikarus.boot.8.prebuilt \ - ikarus.enumerations.ss \ +EXTRA_DIST = ikarus.boot.4.prebuilt ikarus.boot.8.prebuilt last-revision \ + ikarus.enumerations.ss run-tests.ss \ ikarus.exceptions.ss ikarus.apply.ss ikarus.bytevectors.ss \ ikarus.cafe.ss ikarus.chars.ss ikarus.code-objects.ss \ ikarus.codecs.ss ikarus.collect.ss ikarus.command-line.ss \ @@ -180,11 +180,76 @@ EXTRA_DIST = ikarus.boot.4.prebuilt ikarus.boot.8.prebuilt \ psyntax.compat.ss psyntax.config.ss psyntax.expander.ss \ psyntax.internal.ss psyntax.library-manager.ss \ unicode/unicode-char-cases.ss unicode/unicode-charinfo.ss \ + unicode-data.ss unicode/unicode-data.ss \ + unicode/UNIDATA/CaseFolding.txt \ + unicode/UNIDATA/NormalizationTest.txt \ + unicode/UNIDATA/SpecialCasing.txt \ + unicode/UNIDATA/WordBreakProperty.txt \ + unicode/UNIDATA/CompositionExclusions.txt \ + unicode/UNIDATA/PropList.txt \ + unicode/UNIDATA/UnicodeData.txt \ ikarus.io.ss ikarus.time-and-date.ss ikarus.not-yet-implemented.ss \ ikarus.string-to-number.ss ikarus.compiler.source-optimizer.ss \ ikarus.compiler.tag-annotation-analysis.ss ikarus.ontology.ss \ ikarus.reader.annotated.ss ikarus.pointers.ss ikarus.equal.ss \ - ikarus.symbol-table.ss ikarus.apropos.ss ikarus.include-src.ss + ikarus.symbol-table.ss ikarus.apropos.ss ikarus.include-src.ss \ + tests/SRFI-1.ss \ + tests/bignum-to-flonum.ss \ + tests/bignums.ss \ + tests/bitwise.ss \ + tests/bytevectors.ss \ + tests/case-folding.ss \ + tests/div-and-mod.ss \ + tests/enums.ss \ + tests/fasl.ss \ + tests/fixnums.ss \ + tests/fldiv-and-mod.ss \ + tests/framework.ss \ + tests/guardians.ss \ + tests/hashtables.ss \ + tests/io.ss \ + tests/lists.ss \ + tests/normalization.ss \ + tests/numerics.ss \ + tests/parse-flonums.ss \ + tests/pointers.ss \ + tests/r6rs-records-procedural.ss \ + tests/reader.ss \ + tests/repl.ss \ + tests/rn100 \ + tests/set-position.ss \ + tests/sorting.ss \ + tests/string-to-number.ss \ + tests/strings.ss \ + tests/symbol-table.ss \ + tests/tests-1.1-req.scm \ + tests/tests-1.2-req.scm \ + tests/tests-1.3-req.scm \ + tests/tests-1.4-req.scm \ + tests/tests-1.5-req.scm \ + tests/tests-1.6-req.scm \ + tests/tests-1.7-req.scm \ + tests/tests-1.8-req.scm \ + tests/tests-1.9-req.scm \ + tests/tests-2.1-req.scm \ + tests/tests-2.2-req.scm \ + tests/tests-2.3-req.scm \ + tests/tests-2.4-req.scm \ + tests/tests-2.6-req.scm \ + tests/tests-2.8-req.scm \ + tests/tests-2.9-req.scm \ + tests/tests-3.1-req.scm \ + tests/tests-3.2-req.scm \ + tests/tests-3.3-req.scm \ + tests/tests-3.4-req.scm \ + tests/tests-4.1-req.scm \ + tests/tests-4.2-req.scm \ + tests/tests-4.3-req.scm \ + tests/tests-5.1-req.scm \ + tests/tests-5.2-req.scm \ + tests/tests-5.3-req.scm \ + tests/tests-5.6-req.scm \ + tests/unicode.ss revno = "$(shell sed 's/ .*//' ../.bzr/branch/last-revision 2>/dev/null)" sizeofvoidp = $(shell grep SIZEOF_VOID_P ../config.h | sed "s/.*\(.\)/\1/g") @@ -202,9 +267,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scheme/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scheme/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign scheme/Makefile + $(AUTOMAKE) --gnu scheme/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -375,7 +440,7 @@ uninstall-am: uninstall-nodist_pkglibDATA all: $(nodist_pkglib_DATA) -last-revision: $(shell ls ../.bzr/branch/last-revision 2>/dev/null) +$(srcdir)/last-revision: $(shell ls ../.bzr/branch/last-revision 2>/dev/null) echo $(revno) >$@ ikarus.config.ss: Makefile last-revision ../config.h diff --git a/scheme/last-revision b/scheme/last-revision index c102fe8..11ad811 100644 --- a/scheme/last-revision +++ b/scheme/last-revision @@ -1 +1 @@ -1756 +1758 diff --git a/src/Makefile.in b/src/Makefile.in index c347c79..ec5d48c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -207,9 +207,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/Makefile + $(AUTOMAKE) --gnu src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \