move ice-9/ and oop/ under module/

Moved ice-9/ and oop/ under module/, with the idea being that we have only scheme under module/. Adjusted configure.in and Makefile.am appropriately. Put oop/ at the end of the compilation order.
2025-04-29 19:30:36 +02:00 · 2008-11-01 12:44:21 +01:00 · 2008-11-01 12:44:21 +01:00 · 00d0489205
commit 00d0489205
parent 5192c9e89b
95 changed files with 8 additions and 8 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -24,9 +24,9 @@
 #
 AUTOMAKE_OPTIONS = 1.10

-SUBDIRS = lib oop libguile guile-config guile-readline emacs \
+SUBDIRS = lib libguile guile-config guile-readline emacs \
 	  scripts srfi doc examples test-suite benchmark-suite lang am \
-	  module ice-9 testsuite
+	  module testsuite

 bin_SCRIPTS = guile-tools

--- a/configure.in
+++ b/configure.in
@ -1540,16 +1540,11 @@ AC_CONFIG_FILES([
  examples/safe/Makefile
  examples/scripts/Makefile
  guile-config/Makefile
-  ice-9/Makefile
-  ice-9/debugger/Makefile
-  ice-9/debugging/Makefile
  lang/Makefile
  lang/elisp/Makefile
  lang/elisp/internals/Makefile
  lang/elisp/primitives/Makefile
  libguile/Makefile
-  oop/Makefile
-  oop/goops/Makefile
  scripts/Makefile
  srfi/Makefile
  test-suite/Makefile
@ -1562,6 +1557,11 @@ AC_CONFIG_FILES([
  module/system/repl/Makefile
  module/language/Makefile
  module/language/scheme/Makefile
+  module/ice-9/Makefile
+  module/ice-9/debugger/Makefile
+  module/ice-9/debugging/Makefile
+  module/oop/Makefile
+  module/oop/goops/Makefile
  testsuite/Makefile
 ])

--- a/module/Makefile.am
+++ b/module/Makefile.am
@ -1 +1 @@
-SUBDIRS = system language
+SUBDIRS = system language ice-9 oop
--- a/module/ice-9/ChangeLog-2008
+++ b/module/ice-9/ChangeLog-2008
--- a/module/ice-9/Makefile.am
+++ b/module/ice-9/Makefile.am
--- a/module/ice-9/README
+++ b/module/ice-9/README
--- a/module/ice-9/and-let-star.scm
+++ b/module/ice-9/and-let-star.scm
--- a/module/ice-9/arrays.scm
+++ b/module/ice-9/arrays.scm
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
--- a/module/ice-9/buffered-input.scm
+++ b/module/ice-9/buffered-input.scm
--- a/module/ice-9/calling.scm
+++ b/module/ice-9/calling.scm
--- a/module/ice-9/channel.scm
+++ b/module/ice-9/channel.scm
--- a/module/ice-9/common-list.scm
+++ b/module/ice-9/common-list.scm
--- a/module/ice-9/compile-psyntax.scm
+++ b/module/ice-9/compile-psyntax.scm
--- a/module/ice-9/debug.scm
+++ b/module/ice-9/debug.scm
--- a/module/ice-9/debugger.scm
+++ b/module/ice-9/debugger.scm
--- a/module/ice-9/debugger/Makefile.am
+++ b/module/ice-9/debugger/Makefile.am
--- a/module/ice-9/debugger/command-loop.scm
+++ b/module/ice-9/debugger/command-loop.scm
--- a/module/ice-9/debugger/commands.scm
+++ b/module/ice-9/debugger/commands.scm
--- a/module/ice-9/debugger/state.scm
+++ b/module/ice-9/debugger/state.scm
--- a/module/ice-9/debugger/trc.scm
+++ b/module/ice-9/debugger/trc.scm
--- a/module/ice-9/debugger/utils.scm
+++ b/module/ice-9/debugger/utils.scm
--- a/module/ice-9/debugging/Makefile.am
+++ b/module/ice-9/debugging/Makefile.am
--- a/module/ice-9/debugging/breakpoints.scm
+++ b/module/ice-9/debugging/breakpoints.scm
--- a/module/ice-9/debugging/example-fns.scm
+++ b/module/ice-9/debugging/example-fns.scm
--- a/module/ice-9/debugging/ice-9-debugger-extensions.scm
+++ b/module/ice-9/debugging/ice-9-debugger-extensions.scm
--- a/module/ice-9/debugging/load-hooks.scm
+++ b/module/ice-9/debugging/load-hooks.scm
--- a/module/ice-9/debugging/steps.scm
+++ b/module/ice-9/debugging/steps.scm
--- a/module/ice-9/debugging/trace.scm
+++ b/module/ice-9/debugging/trace.scm
--- a/module/ice-9/debugging/traps.scm
+++ b/module/ice-9/debugging/traps.scm
--- a/module/ice-9/debugging/trc.scm
+++ b/module/ice-9/debugging/trc.scm
--- a/module/ice-9/deprecated.scm
+++ b/module/ice-9/deprecated.scm
--- a/module/ice-9/documentation.scm
+++ b/module/ice-9/documentation.scm
--- a/module/ice-9/emacs.scm
+++ b/module/ice-9/emacs.scm
--- a/module/ice-9/expect.scm
+++ b/module/ice-9/expect.scm
--- a/module/ice-9/format.scm
+++ b/module/ice-9/format.scm
--- a/module/ice-9/ftw.scm
+++ b/module/ice-9/ftw.scm
--- a/module/ice-9/gap-buffer.scm
+++ b/module/ice-9/gap-buffer.scm
--- a/module/ice-9/gds-client.scm
+++ b/module/ice-9/gds-client.scm
--- a/module/ice-9/gds-server.scm
+++ b/module/ice-9/gds-server.scm
--- a/module/ice-9/getopt-long.scm
+++ b/module/ice-9/getopt-long.scm
--- a/module/ice-9/hcons.scm
+++ b/module/ice-9/hcons.scm
--- a/module/ice-9/history.scm
+++ b/module/ice-9/history.scm
--- a/module/ice-9/i18n.scm
+++ b/module/ice-9/i18n.scm
--- a/module/ice-9/lineio.scm
+++ b/module/ice-9/lineio.scm
--- a/module/ice-9/list.scm
+++ b/module/ice-9/list.scm
--- a/module/ice-9/ls.scm
+++ b/module/ice-9/ls.scm
--- a/module/ice-9/mapping.scm
+++ b/module/ice-9/mapping.scm
--- a/module/ice-9/match.scm
+++ b/module/ice-9/match.scm
--- a/module/ice-9/networking.scm
+++ b/module/ice-9/networking.scm
--- a/module/ice-9/null.scm
+++ b/module/ice-9/null.scm
--- a/module/ice-9/occam-channel.scm
+++ b/module/ice-9/occam-channel.scm
--- a/module/ice-9/optargs.scm
+++ b/module/ice-9/optargs.scm
--- a/module/ice-9/poe.scm
+++ b/module/ice-9/poe.scm
--- a/module/ice-9/popen.scm
+++ b/module/ice-9/popen.scm
--- a/module/ice-9/posix.scm
+++ b/module/ice-9/posix.scm
--- a/module/ice-9/pretty-print.scm
+++ b/module/ice-9/pretty-print.scm
--- a/module/ice-9/psyntax-pp.scm
+++ b/module/ice-9/psyntax-pp.scm
--- a/module/ice-9/psyntax.scm
+++ b/module/ice-9/psyntax.scm
--- a/module/ice-9/q.scm
+++ b/module/ice-9/q.scm
--- a/module/ice-9/r4rs.scm
+++ b/module/ice-9/r4rs.scm
--- a/module/ice-9/r5rs.scm
+++ b/module/ice-9/r5rs.scm
--- a/module/ice-9/rdelim.scm
+++ b/module/ice-9/rdelim.scm
--- a/module/ice-9/receive.scm
+++ b/module/ice-9/receive.scm
--- a/module/ice-9/regex.scm
+++ b/module/ice-9/regex.scm
--- a/module/ice-9/runq.scm
+++ b/module/ice-9/runq.scm
--- a/module/ice-9/rw.scm
+++ b/module/ice-9/rw.scm
--- a/module/ice-9/safe-r5rs.scm
+++ b/module/ice-9/safe-r5rs.scm
--- a/module/ice-9/safe.scm
+++ b/module/ice-9/safe.scm
--- a/module/ice-9/serialize.scm
+++ b/module/ice-9/serialize.scm
--- a/module/ice-9/session.scm
+++ b/module/ice-9/session.scm
--- a/module/ice-9/slib.scm
+++ b/module/ice-9/slib.scm
--- a/module/ice-9/stack-catch.scm
+++ b/module/ice-9/stack-catch.scm
--- a/module/ice-9/streams.scm
+++ b/module/ice-9/streams.scm
--- a/module/ice-9/string-fun.scm
+++ b/module/ice-9/string-fun.scm
--- a/module/ice-9/syncase.scm
+++ b/module/ice-9/syncase.scm
--- a/module/ice-9/test.scm
+++ b/module/ice-9/test.scm
--- a/module/ice-9/threads.scm
+++ b/module/ice-9/threads.scm
--- a/module/ice-9/time.scm
+++ b/module/ice-9/time.scm
--- a/module/ice-9/weak-vector.scm
+++ b/module/ice-9/weak-vector.scm
--- a/module/oop/ChangeLog-2008
+++ b/module/oop/ChangeLog-2008
--- a/module/oop/Makefile.am
+++ b/module/oop/Makefile.am
--- a/module/oop/goops.scm
+++ b/module/oop/goops.scm
--- a/module/oop/goops/Makefile.am
+++ b/module/oop/goops/Makefile.am
--- a/module/oop/goops/accessors.scm
+++ b/module/oop/goops/accessors.scm
--- a/module/oop/goops/active-slot.scm
+++ b/module/oop/goops/active-slot.scm
--- a/module/oop/goops/compile.scm
+++ b/module/oop/goops/compile.scm
--- a/module/oop/goops/composite-slot.scm
+++ b/module/oop/goops/composite-slot.scm
--- a/module/oop/goops/describe.scm
+++ b/module/oop/goops/describe.scm
--- a/module/oop/goops/dispatch.scm
+++ b/module/oop/goops/dispatch.scm
--- a/module/oop/goops/internal.scm
+++ b/module/oop/goops/internal.scm
--- a/module/oop/goops/save.scm
+++ b/module/oop/goops/save.scm
--- a/module/oop/goops/simple.scm
+++ b/module/oop/goops/simple.scm
--- a/module/oop/goops/stklos.scm
+++ b/module/oop/goops/stklos.scm
--- a/module/oop/goops/util.scm
+++ b/module/oop/goops/util.scm