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.

diff --git a/Makefile.am b/Makefile.am
index c6a6944..6554b07 100644 (file)
--- 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
 

diff --git a/configure.in b/configure.in
index 8664ceb..56b74e2 100644 (file)
--- 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
 ])
 

diff --git a/module/Makefile.am b/module/Makefile.am
index 06fde9a..feefcdf 100644 (file)
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -1 +1 @@
-SUBDIRS = system language
+SUBDIRS = system language ice-9 oop

diff --git a/ice-9/ChangeLog-2008 b/module/ice-9/ChangeLog-2008
similarity index 100%
rename from ice-9/ChangeLog-2008
rename to module/ice-9/ChangeLog-2008

diff --git a/ice-9/Makefile.am b/module/ice-9/Makefile.am
similarity index 100%
rename from ice-9/Makefile.am
rename to module/ice-9/Makefile.am

diff --git a/ice-9/README b/module/ice-9/README
similarity index 100%
rename from ice-9/README
rename to module/ice-9/README

diff --git a/ice-9/and-let-star.scm b/module/ice-9/and-let-star.scm
similarity index 100%
rename from ice-9/and-let-star.scm
rename to module/ice-9/and-let-star.scm

diff --git a/ice-9/arrays.scm b/module/ice-9/arrays.scm
similarity index 100%
rename from ice-9/arrays.scm
rename to module/ice-9/arrays.scm

diff --git a/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
similarity index 100%
rename from ice-9/boot-9.scm
rename to module/ice-9/boot-9.scm

diff --git a/ice-9/buffered-input.scm b/module/ice-9/buffered-input.scm
similarity index 100%
rename from ice-9/buffered-input.scm
rename to module/ice-9/buffered-input.scm

diff --git a/ice-9/calling.scm b/module/ice-9/calling.scm
similarity index 100%
rename from ice-9/calling.scm
rename to module/ice-9/calling.scm

diff --git a/ice-9/channel.scm b/module/ice-9/channel.scm
similarity index 100%
rename from ice-9/channel.scm
rename to module/ice-9/channel.scm

diff --git a/ice-9/common-list.scm b/module/ice-9/common-list.scm
similarity index 100%
rename from ice-9/common-list.scm
rename to module/ice-9/common-list.scm

diff --git a/ice-9/compile-psyntax.scm b/module/ice-9/compile-psyntax.scm
similarity index 100%
rename from ice-9/compile-psyntax.scm
rename to module/ice-9/compile-psyntax.scm

diff --git a/ice-9/debug.scm b/module/ice-9/debug.scm
similarity index 100%
rename from ice-9/debug.scm
rename to module/ice-9/debug.scm

diff --git a/ice-9/debugger.scm b/module/ice-9/debugger.scm
similarity index 100%
rename from ice-9/debugger.scm
rename to module/ice-9/debugger.scm

diff --git a/ice-9/debugger/Makefile.am b/module/ice-9/debugger/Makefile.am
similarity index 100%
rename from ice-9/debugger/Makefile.am
rename to module/ice-9/debugger/Makefile.am

diff --git a/ice-9/debugger/command-loop.scm b/module/ice-9/debugger/command-loop.scm
similarity index 100%
rename from ice-9/debugger/command-loop.scm
rename to module/ice-9/debugger/command-loop.scm

diff --git a/ice-9/debugger/commands.scm b/module/ice-9/debugger/commands.scm
similarity index 100%
rename from ice-9/debugger/commands.scm
rename to module/ice-9/debugger/commands.scm

diff --git a/ice-9/debugger/state.scm b/module/ice-9/debugger/state.scm
similarity index 100%
rename from ice-9/debugger/state.scm
rename to module/ice-9/debugger/state.scm

diff --git a/ice-9/debugger/trc.scm b/module/ice-9/debugger/trc.scm
similarity index 100%
rename from ice-9/debugger/trc.scm
rename to module/ice-9/debugger/trc.scm

diff --git a/ice-9/debugger/utils.scm b/module/ice-9/debugger/utils.scm
similarity index 100%
rename from ice-9/debugger/utils.scm
rename to module/ice-9/debugger/utils.scm

diff --git a/ice-9/debugging/Makefile.am b/module/ice-9/debugging/Makefile.am
similarity index 100%
rename from ice-9/debugging/Makefile.am
rename to module/ice-9/debugging/Makefile.am

diff --git a/ice-9/debugging/breakpoints.scm b/module/ice-9/debugging/breakpoints.scm
similarity index 100%
rename from ice-9/debugging/breakpoints.scm
rename to module/ice-9/debugging/breakpoints.scm

diff --git a/ice-9/debugging/example-fns.scm b/module/ice-9/debugging/example-fns.scm
similarity index 100%
rename from ice-9/debugging/example-fns.scm
rename to module/ice-9/debugging/example-fns.scm

diff --git a/ice-9/debugging/ice-9-debugger-extensions.scm b/module/ice-9/debugging/ice-9-debugger-extensions.scm
similarity index 100%
rename from ice-9/debugging/ice-9-debugger-extensions.scm
rename to module/ice-9/debugging/ice-9-debugger-extensions.scm

diff --git a/ice-9/debugging/load-hooks.scm b/module/ice-9/debugging/load-hooks.scm
similarity index 100%
rename from ice-9/debugging/load-hooks.scm
rename to module/ice-9/debugging/load-hooks.scm

diff --git a/ice-9/debugging/steps.scm b/module/ice-9/debugging/steps.scm
similarity index 100%
rename from ice-9/debugging/steps.scm
rename to module/ice-9/debugging/steps.scm

diff --git a/ice-9/debugging/trace.scm b/module/ice-9/debugging/trace.scm
similarity index 100%
rename from ice-9/debugging/trace.scm
rename to module/ice-9/debugging/trace.scm

diff --git a/ice-9/debugging/traps.scm b/module/ice-9/debugging/traps.scm
similarity index 100%
rename from ice-9/debugging/traps.scm
rename to module/ice-9/debugging/traps.scm

diff --git a/ice-9/debugging/trc.scm b/module/ice-9/debugging/trc.scm
similarity index 100%
rename from ice-9/debugging/trc.scm
rename to module/ice-9/debugging/trc.scm

diff --git a/ice-9/deprecated.scm b/module/ice-9/deprecated.scm
similarity index 100%
rename from ice-9/deprecated.scm
rename to module/ice-9/deprecated.scm

diff --git a/ice-9/documentation.scm b/module/ice-9/documentation.scm
similarity index 100%
rename from ice-9/documentation.scm
rename to module/ice-9/documentation.scm

diff --git a/ice-9/emacs.scm b/module/ice-9/emacs.scm
similarity index 100%
rename from ice-9/emacs.scm
rename to module/ice-9/emacs.scm

diff --git a/ice-9/expect.scm b/module/ice-9/expect.scm
similarity index 100%
rename from ice-9/expect.scm
rename to module/ice-9/expect.scm

diff --git a/ice-9/format.scm b/module/ice-9/format.scm
similarity index 100%
rename from ice-9/format.scm
rename to module/ice-9/format.scm

diff --git a/ice-9/ftw.scm b/module/ice-9/ftw.scm
similarity index 100%
rename from ice-9/ftw.scm
rename to module/ice-9/ftw.scm

diff --git a/ice-9/gap-buffer.scm b/module/ice-9/gap-buffer.scm
similarity index 100%
rename from ice-9/gap-buffer.scm
rename to module/ice-9/gap-buffer.scm

diff --git a/ice-9/gds-client.scm b/module/ice-9/gds-client.scm
similarity index 100%
rename from ice-9/gds-client.scm
rename to module/ice-9/gds-client.scm

diff --git a/ice-9/gds-server.scm b/module/ice-9/gds-server.scm
similarity index 100%
rename from ice-9/gds-server.scm
rename to module/ice-9/gds-server.scm

diff --git a/ice-9/getopt-long.scm b/module/ice-9/getopt-long.scm
similarity index 100%
rename from ice-9/getopt-long.scm
rename to module/ice-9/getopt-long.scm

diff --git a/ice-9/hcons.scm b/module/ice-9/hcons.scm
similarity index 100%
rename from ice-9/hcons.scm
rename to module/ice-9/hcons.scm

diff --git a/ice-9/history.scm b/module/ice-9/history.scm
similarity index 100%
rename from ice-9/history.scm
rename to module/ice-9/history.scm

diff --git a/ice-9/i18n.scm b/module/ice-9/i18n.scm
similarity index 100%
rename from ice-9/i18n.scm
rename to module/ice-9/i18n.scm

diff --git a/ice-9/lineio.scm b/module/ice-9/lineio.scm
similarity index 100%
rename from ice-9/lineio.scm
rename to module/ice-9/lineio.scm

diff --git a/ice-9/list.scm b/module/ice-9/list.scm
similarity index 100%
rename from ice-9/list.scm
rename to module/ice-9/list.scm

diff --git a/ice-9/ls.scm b/module/ice-9/ls.scm
similarity index 100%
rename from ice-9/ls.scm
rename to module/ice-9/ls.scm

diff --git a/ice-9/mapping.scm b/module/ice-9/mapping.scm
similarity index 100%
rename from ice-9/mapping.scm
rename to module/ice-9/mapping.scm

diff --git a/ice-9/match.scm b/module/ice-9/match.scm
similarity index 100%
rename from ice-9/match.scm
rename to module/ice-9/match.scm

diff --git a/ice-9/networking.scm b/module/ice-9/networking.scm
similarity index 100%
rename from ice-9/networking.scm
rename to module/ice-9/networking.scm

diff --git a/ice-9/null.scm b/module/ice-9/null.scm
similarity index 100%
rename from ice-9/null.scm
rename to module/ice-9/null.scm

diff --git a/ice-9/occam-channel.scm b/module/ice-9/occam-channel.scm
similarity index 100%
rename from ice-9/occam-channel.scm
rename to module/ice-9/occam-channel.scm

diff --git a/ice-9/optargs.scm b/module/ice-9/optargs.scm
similarity index 100%
rename from ice-9/optargs.scm
rename to module/ice-9/optargs.scm

diff --git a/ice-9/poe.scm b/module/ice-9/poe.scm
similarity index 100%
rename from ice-9/poe.scm
rename to module/ice-9/poe.scm

diff --git a/ice-9/popen.scm b/module/ice-9/popen.scm
similarity index 100%
rename from ice-9/popen.scm
rename to module/ice-9/popen.scm

diff --git a/ice-9/posix.scm b/module/ice-9/posix.scm
similarity index 100%
rename from ice-9/posix.scm
rename to module/ice-9/posix.scm

diff --git a/ice-9/pretty-print.scm b/module/ice-9/pretty-print.scm
similarity index 100%
rename from ice-9/pretty-print.scm
rename to module/ice-9/pretty-print.scm

diff --git a/ice-9/psyntax-pp.scm b/module/ice-9/psyntax-pp.scm
similarity index 100%
rename from ice-9/psyntax-pp.scm
rename to module/ice-9/psyntax-pp.scm

diff --git a/ice-9/psyntax.scm b/module/ice-9/psyntax.scm
similarity index 100%
rename from ice-9/psyntax.scm
rename to module/ice-9/psyntax.scm

diff --git a/ice-9/q.scm b/module/ice-9/q.scm
similarity index 100%
rename from ice-9/q.scm
rename to module/ice-9/q.scm

diff --git a/ice-9/r4rs.scm b/module/ice-9/r4rs.scm
similarity index 100%
rename from ice-9/r4rs.scm
rename to module/ice-9/r4rs.scm

diff --git a/ice-9/r5rs.scm b/module/ice-9/r5rs.scm
similarity index 100%
rename from ice-9/r5rs.scm
rename to module/ice-9/r5rs.scm

diff --git a/ice-9/rdelim.scm b/module/ice-9/rdelim.scm
similarity index 100%
rename from ice-9/rdelim.scm
rename to module/ice-9/rdelim.scm

diff --git a/ice-9/receive.scm b/module/ice-9/receive.scm
similarity index 100%
rename from ice-9/receive.scm
rename to module/ice-9/receive.scm

diff --git a/ice-9/regex.scm b/module/ice-9/regex.scm
similarity index 100%
rename from ice-9/regex.scm
rename to module/ice-9/regex.scm

diff --git a/ice-9/runq.scm b/module/ice-9/runq.scm
similarity index 100%
rename from ice-9/runq.scm
rename to module/ice-9/runq.scm

diff --git a/ice-9/rw.scm b/module/ice-9/rw.scm
similarity index 100%
rename from ice-9/rw.scm
rename to module/ice-9/rw.scm

diff --git a/ice-9/safe-r5rs.scm b/module/ice-9/safe-r5rs.scm
similarity index 100%
rename from ice-9/safe-r5rs.scm
rename to module/ice-9/safe-r5rs.scm

diff --git a/ice-9/safe.scm b/module/ice-9/safe.scm
similarity index 100%
rename from ice-9/safe.scm
rename to module/ice-9/safe.scm

diff --git a/ice-9/serialize.scm b/module/ice-9/serialize.scm
similarity index 100%
rename from ice-9/serialize.scm
rename to module/ice-9/serialize.scm

diff --git a/ice-9/session.scm b/module/ice-9/session.scm
similarity index 100%
rename from ice-9/session.scm
rename to module/ice-9/session.scm

diff --git a/ice-9/slib.scm b/module/ice-9/slib.scm
similarity index 100%
rename from ice-9/slib.scm
rename to module/ice-9/slib.scm

diff --git a/ice-9/stack-catch.scm b/module/ice-9/stack-catch.scm
similarity index 100%
rename from ice-9/stack-catch.scm
rename to module/ice-9/stack-catch.scm

diff --git a/ice-9/streams.scm b/module/ice-9/streams.scm
similarity index 100%
rename from ice-9/streams.scm
rename to module/ice-9/streams.scm

diff --git a/ice-9/string-fun.scm b/module/ice-9/string-fun.scm
similarity index 100%
rename from ice-9/string-fun.scm
rename to module/ice-9/string-fun.scm

diff --git a/ice-9/syncase.scm b/module/ice-9/syncase.scm
similarity index 100%
rename from ice-9/syncase.scm
rename to module/ice-9/syncase.scm

diff --git a/ice-9/test.scm b/module/ice-9/test.scm
similarity index 100%
rename from ice-9/test.scm
rename to module/ice-9/test.scm

diff --git a/ice-9/threads.scm b/module/ice-9/threads.scm
similarity index 100%
rename from ice-9/threads.scm
rename to module/ice-9/threads.scm

diff --git a/ice-9/time.scm b/module/ice-9/time.scm
similarity index 100%
rename from ice-9/time.scm
rename to module/ice-9/time.scm

diff --git a/ice-9/weak-vector.scm b/module/ice-9/weak-vector.scm
similarity index 100%
rename from ice-9/weak-vector.scm
rename to module/ice-9/weak-vector.scm

diff --git a/oop/ChangeLog-2008 b/module/oop/ChangeLog-2008
similarity index 100%
rename from oop/ChangeLog-2008
rename to module/oop/ChangeLog-2008

diff --git a/oop/Makefile.am b/module/oop/Makefile.am
similarity index 100%
rename from oop/Makefile.am
rename to module/oop/Makefile.am

diff --git a/oop/goops.scm b/module/oop/goops.scm
similarity index 100%
rename from oop/goops.scm
rename to module/oop/goops.scm

diff --git a/oop/goops/Makefile.am b/module/oop/goops/Makefile.am
similarity index 100%
rename from oop/goops/Makefile.am
rename to module/oop/goops/Makefile.am

diff --git a/oop/goops/accessors.scm b/module/oop/goops/accessors.scm
similarity index 100%
rename from oop/goops/accessors.scm
rename to module/oop/goops/accessors.scm

diff --git a/oop/goops/active-slot.scm b/module/oop/goops/active-slot.scm
similarity index 100%
rename from oop/goops/active-slot.scm
rename to module/oop/goops/active-slot.scm

diff --git a/oop/goops/compile.scm b/module/oop/goops/compile.scm
similarity index 100%
rename from oop/goops/compile.scm
rename to module/oop/goops/compile.scm

diff --git a/oop/goops/composite-slot.scm b/module/oop/goops/composite-slot.scm
similarity index 100%
rename from oop/goops/composite-slot.scm
rename to module/oop/goops/composite-slot.scm

diff --git a/oop/goops/describe.scm b/module/oop/goops/describe.scm
similarity index 100%
rename from oop/goops/describe.scm
rename to module/oop/goops/describe.scm

diff --git a/oop/goops/dispatch.scm b/module/oop/goops/dispatch.scm
similarity index 100%
rename from oop/goops/dispatch.scm
rename to module/oop/goops/dispatch.scm

diff --git a/oop/goops/internal.scm b/module/oop/goops/internal.scm
similarity index 100%
rename from oop/goops/internal.scm
rename to module/oop/goops/internal.scm

diff --git a/oop/goops/save.scm b/module/oop/goops/save.scm
similarity index 100%
rename from oop/goops/save.scm
rename to module/oop/goops/save.scm

diff --git a/oop/goops/simple.scm b/module/oop/goops/simple.scm
similarity index 100%
rename from oop/goops/simple.scm
rename to module/oop/goops/simple.scm

diff --git a/oop/goops/stklos.scm b/module/oop/goops/stklos.scm
similarity index 100%
rename from oop/goops/stklos.scm
rename to module/oop/goops/stklos.scm

diff --git a/oop/goops/util.scm b/module/oop/goops/util.scm
similarity index 100%
rename from oop/goops/util.scm
rename to module/oop/goops/util.scm