summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in6
-rw-r--r--module/Makefile.am140
-rw-r--r--module/ice-9/Makefile.am70
-rw-r--r--module/ice-9/debugger/Makefile.am31
-rw-r--r--module/ice-9/debugging/Makefile.am33
-rw-r--r--module/oop/Makefile.am30
-rw-r--r--module/oop/goops/Makefile.am30
7 files changed, 135 insertions, 205 deletions
diff --git a/configure.in b/configure.in
index 354e93c54..553d68814 100644
--- a/configure.in
+++ b/configure.in
@@ -1542,12 +1542,6 @@ AC_CONFIG_FILES([
test-suite/standalone/Makefile
meta/Makefile
module/Makefile
- module/ice-9/Makefile
- module/ice-9/debugger/Makefile
- module/ice-9/debugging/Makefile
- module/srfi/Makefile
- module/oop/Makefile
- module/oop/goops/Makefile
testsuite/Makefile
])
diff --git a/module/Makefile.am b/module/Makefile.am
index ee552762a..95dc75ac2 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -19,16 +19,19 @@
## to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
## Floor, Boston, MA 02110-1301 USA
-# Build the compiler and VM support first to avoid stack overflows
-# when building the rest.
-SUBDIRS = . ice-9 srfi oop
-
include $(top_srcdir)/am/guilec
# We're at the root of the module hierarchy.
modpath =
+# Compile psyntax and boot-9 first, so that we get the speed benefit in
+# the rest of the compilation. Also, if there is too much switching back
+# and forth between interpreted and compiled code, we end up using more
+# of the C stack than the interpreter would have; so avoid that by
+# putting these core modules first.
+
SOURCES = \
+ ice-9/psyntax-pp.scm \
system/base/pmatch.scm system/base/syntax.scm \
system/base/compile.scm system/base/language.scm \
\
@@ -48,8 +51,25 @@ SOURCES = \
$(ASSEMBLY_LANG_SOURCES) $(BYTECODE_LANG_SOURCES) \
$(OBJCODE_LANG_SOURCES) $(VALUE_LANG_SOURCES) \
\
+ $(ICE_9_SOURCES) \
+ $(SRFI_SOURCES) \
+ $(OOP_SOURCES) \
+ \
$(SCRIPTS_SOURCES)
+## test.scm is not currently installed.
+EXTRA_DIST += ice-9/test.scm ice-9/compile-psyntax.scm ice-9/ChangeLog-2008
+
+# We expect this to never be invoked when there is not already
+# ice-9/psyntax-pp.scm in %load-path, since compile-psyntax.scm depends
+# on ice-9/syncase.scm, which does `(load-from-path "ice-9/psyntax-pp.scm")'.
+# In other words, to bootstrap this file, you need to do something like:
+# GUILE_LOAD_PATH=/usr/local/share/guile/1.5.4 make psyntax-pp.scm
+include $(top_srcdir)/am/pre-inst-guile
+ice-9/psyntax-pp.scm: ice-9/psyntax.scm
+ $(preinstguile) -s $(srcdir)/ice-9/compile-psyntax.scm \
+ $(srcdir)/ice-9/psyntax.scm $(srcdir)/ice-9/psyntax-pp.scm
+
SCHEME_LANG_SOURCES = \
language/scheme/amatch.scm language/scheme/expand.scm \
language/scheme/compile-ghil.scm language/scheme/spec.scm \
@@ -109,8 +129,118 @@ SCRIPTS_SOURCES = \
scripts/read-rfc822.scm \
scripts/snarf-guile-m4-docs.scm
+ICE_9_SOURCES = \
+ ice-9/boot-9.scm \
+ ice-9/r4rs.scm \
+ ice-9/r5rs.scm \
+ ice-9/and-let-star.scm \
+ ice-9/calling.scm \
+ ice-9/common-list.scm \
+ ice-9/debug.scm \
+ ice-9/debugger.scm \
+ ice-9/documentation.scm \
+ ice-9/emacs.scm \
+ ice-9/expand-support.scm \
+ ice-9/expect.scm \
+ ice-9/format.scm \
+ ice-9/getopt-long.scm \
+ ice-9/hcons.scm \
+ ice-9/i18n.scm \
+ ice-9/lineio.scm \
+ ice-9/ls.scm \
+ ice-9/mapping.scm \
+ ice-9/match.scm \
+ ice-9/networking.scm \
+ ice-9/null.scm \
+ ice-9/occam-channel.scm \
+ ice-9/optargs.scm \
+ ice-9/poe.scm \
+ ice-9/popen.scm \
+ ice-9/posix.scm \
+ ice-9/q.scm \
+ ice-9/rdelim.scm \
+ ice-9/receive.scm \
+ ice-9/regex.scm \
+ ice-9/runq.scm \
+ ice-9/rw.scm \
+ ice-9/safe-r5rs.scm \
+ ice-9/safe.scm \
+ ice-9/session.scm \
+ ice-9/slib.scm \
+ ice-9/stack-catch.scm \
+ ice-9/streams.scm \
+ ice-9/string-fun.scm \
+ ice-9/syncase.scm \
+ ice-9/threads.scm \
+ ice-9/buffered-input.scm \
+ ice-9/time.scm \
+ ice-9/history.scm \
+ ice-9/channel.scm \
+ ice-9/pretty-print.scm \
+ ice-9/ftw.scm \
+ ice-9/gap-buffer.scm \
+ ice-9/weak-vector.scm \
+ ice-9/deprecated.scm \
+ ice-9/list.scm \
+ ice-9/serialize.scm \
+ ice-9/gds-server.scm
+
+SRFI_SOURCES = \
+ srfi/srfi-1.scm \
+ srfi/srfi-2.scm \
+ srfi/srfi-4.scm \
+ srfi/srfi-6.scm \
+ srfi/srfi-8.scm \
+ srfi/srfi-9.scm \
+ srfi/srfi-10.scm \
+ srfi/srfi-11.scm \
+ srfi/srfi-13.scm \
+ srfi/srfi-14.scm \
+ srfi/srfi-16.scm \
+ srfi/srfi-17.scm \
+ srfi/srfi-19.scm \
+ srfi/srfi-26.scm \
+ srfi/srfi-31.scm \
+ srfi/srfi-34.scm \
+ srfi/srfi-35.scm \
+ srfi/srfi-37.scm \
+ srfi/srfi-39.scm \
+ srfi/srfi-60.scm \
+ srfi/srfi-69.scm \
+ srfi/srfi-88.scm
+
EXTRA_DIST += scripts/ChangeLog-2008
EXTRA_DIST += scripts/README
+OOP_SOURCES = \
+ oop/goops.scm \
+ oop/goops/active-slot.scm \
+ oop/goops/compile.scm \
+ oop/goops/composite-slot.scm \
+ oop/goops/describe.scm \
+ oop/goops/dispatch.scm \
+ oop/goops/internal.scm \
+ oop/goops/save.scm \
+ oop/goops/stklos.scm \
+ oop/goops/util.scm \
+ oop/goops/accessors.scm \
+ oop/goops/simple.scm
+
+EXTRA_DIST += oop/ChangeLog-2008
+
NOCOMP_SOURCES = \
- system/repl/describe.scm
+ ice-9/gds-client.scm \
+ ice-9/psyntax.scm \
+ system/repl/describe.scm \
+ ice-9/debugger/command-loop.scm \
+ ice-9/debugger/commands.scm \
+ ice-9/debugger/state.scm \
+ ice-9/debugger/trc.scm \
+ ice-9/debugger/utils.scm \
+ ice-9/debugging/example-fns.scm \
+ ice-9/debugging/ice-9-debugger-extensions.scm \
+ ice-9/debugging/steps.scm \
+ ice-9/debugging/trace.scm \
+ ice-9/debugging/traps.scm \
+ ice-9/debugging/trc.scm \
+ srfi/srfi-18.scm
diff --git a/module/ice-9/Makefile.am b/module/ice-9/Makefile.am
deleted file mode 100644
index a93ec817b..000000000
--- a/module/ice-9/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-##
-## Copyright (C) 1998,1999,2000,2001,2003, 2004, 2006, 2008 Free Software Foundation, Inc.
-##
-## This file is part of GUILE.
-##
-## GUILE is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2, or
-## (at your option) any later version.
-##
-## GUILE is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public
-## License along with GUILE; see the file COPYING. If not, write
-## to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-## Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = debugger debugging
-
-# These should be installed and distributed.
-modpath = ice-9
-# Compile psyntax and boot-9 first, so that we get the speed benefit in
-# the rest of the compilation. Also, if there is too much switching back
-# and forth between interpreted and compiled code, we end up using more
-# of the C stack than the interpreter would have; so avoid that by
-# putting these core modules first.
-SOURCES = psyntax-pp.scm expand-support.scm boot-9.scm \
- and-let-star.scm calling.scm common-list.scm \
- debug.scm debugger.scm documentation.scm emacs.scm expect.scm \
- format.scm getopt-long.scm hcons.scm i18n.scm \
- lineio.scm ls.scm mapping.scm match.scm \
- networking.scm null.scm occam-channel.scm optargs.scm poe.scm \
- popen.scm posix.scm q.scm r4rs.scm r5rs.scm \
- rdelim.scm receive.scm regex.scm runq.scm rw.scm \
- safe-r5rs.scm safe.scm session.scm slib.scm stack-catch.scm \
- streams.scm string-fun.scm syncase.scm threads.scm \
- buffered-input.scm time.scm history.scm channel.scm \
- pretty-print.scm ftw.scm gap-buffer.scm \
- weak-vector.scm deprecated.scm list.scm serialize.scm \
- gds-server.scm
-
-# gds-client is tight with the memoizer, so punt on it until it can be
-# made portable.
-#
-# psyntax.scm needs help. fortunately it's only needed when recompiling
-# psyntax-pp.scm.
-NOCOMP_SOURCES = gds-client.scm psyntax.scm
-
-include $(top_srcdir)/am/guilec
-
-## test.scm is not currently installed.
-EXTRA_DIST += test.scm compile-psyntax.scm ChangeLog-2008
-
-TAGS_FILES = $(SOURCES)
-
-# We expect this to never be invoked when there is not already
-# ice-9/psyntax-pp.scm in %load-path, since compile-psyntax.scm depends
-# on ice-9/syncase.scm, which does `(load-from-path "ice-9/psyntax-pp.scm")'.
-# In other words, to bootstrap this file, you need to do something like:
-# GUILE_LOAD_PATH=/usr/local/share/guile/1.5.4 make psyntax-pp.scm
-include $(top_srcdir)/am/pre-inst-guile
-psyntax-pp.scm: psyntax.scm
- $(preinstguile) -s $(srcdir)/compile-psyntax.scm \
- $(srcdir)/psyntax.scm $(srcdir)/psyntax-pp.scm
diff --git a/module/ice-9/debugger/Makefile.am b/module/ice-9/debugger/Makefile.am
deleted file mode 100644
index 7ef09a025..000000000
--- a/module/ice-9/debugger/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-##
-## Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
-##
-## This file is part of GUILE.
-##
-## GUILE is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2, or
-## (at your option) any later version.
-##
-## GUILE is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public
-## License along with GUILE; see the file COPYING. If not, write
-## to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-## Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS = gnu
-
-# These should be installed and distributed.
-ice9_debugger_sources = command-loop.scm commands.scm state.scm trc.scm utils.scm
-
-subpkgdatadir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/ice-9/debugger
-subpkgdata_DATA = $(ice9_debugger_sources)
-TAGS_FILES = $(subpkgdata_DATA)
-
-EXTRA_DIST = $(ice9_debugger_sources)
diff --git a/module/ice-9/debugging/Makefile.am b/module/ice-9/debugging/Makefile.am
deleted file mode 100644
index 44d86d3cf..000000000
--- a/module/ice-9/debugging/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-##
-## Copyright (C) 2006 Free Software Foundation, Inc.
-##
-## This file is part of GUILE.
-##
-## GUILE is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2, or
-## (at your option) any later version.
-##
-## GUILE is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public
-## License along with GUILE; see the file COPYING. If not, write
-## to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-## Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS = gnu
-
-# These should be installed and distributed.
-ice9_debugging_sources = example-fns.scm \
- ice-9-debugger-extensions.scm \
- steps.scm trace.scm traps.scm trc.scm
-
-subpkgdatadir = $(pkgdatadir)/${GUILE_EFFECTIVE_VERSION}/ice-9/debugging
-subpkgdata_DATA = $(ice9_debugging_sources)
-TAGS_FILES = $(subpkgdata_DATA)
-
-EXTRA_DIST = $(ice9_debugging_sources)
diff --git a/module/oop/Makefile.am b/module/oop/Makefile.am
deleted file mode 100644
index 83c342abc..000000000
--- a/module/oop/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-##
-## Copyright (C) 2000, 2004, 2006, 2008 Free Software Foundation, Inc.
-##
-## This file is part of GUILE.
-##
-## GUILE is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2, or
-## (at your option) any later version.
-##
-## GUILE is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public
-## License along with GUILE; see the file COPYING. If not, write
-## to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-## Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = goops
-
-modpath = oop
-SOURCES = goops.scm
-include $(top_srcdir)/am/guilec
-
-EXTRA_DIST += ChangeLog-2008
diff --git a/module/oop/goops/Makefile.am b/module/oop/goops/Makefile.am
deleted file mode 100644
index 0c90ac49f..000000000
--- a/module/oop/goops/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-##
-## Copyright (C) 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
-##
-## This file is part of GUILE.
-##
-## GUILE is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2, or
-## (at your option) any later version.
-##
-## GUILE is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public
-## License along with GUILE; see the file COPYING. If not, write
-## to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-## Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS = gnu
-
-modpath = oop/goops
-SOURCES = \
- active-slot.scm compile.scm composite-slot.scm describe.scm \
- dispatch.scm internal.scm save.scm stklos.scm util.scm \
- accessors.scm simple.scm
-
-include $(top_srcdir)/am/guilec