Aggregate makefiles for `module/system' and `module/language'.

* am/guilec (.scm.go): Create the target's directory, in case
  $(builddir) != $(srcdir).

* configure.in: Don't output any makefile under `module/system' or
  `module/language'.

* module/Makefile.am (SUBDIRS): Remove `language' and `system'.  Add `.'
  to the front.
  (modpath, SOURCES, SCHEME_LANG_SOURCES, ECMASCRIPT_LANG_SOURCES,
  GHIL_LANG_SOURCES, GLIL_LANG_SOURCES, ASSEMBLY_LANG_SOURCES,
  BYTECODE_LANG_SOURCES, OBJCODE_LANG_SOURCES, VALUE_LANG_SOURCES): New
  variables, taken from former `Makefile.am' files in sub-directories.

15 files changed, 88 insertions, 60 deletions

diff --git a/am/guilec b/am/guilec
index 618eb4b02..939ea76c4 100644
--- a/am/guilec
+++ b/am/guilec
@@ -9,4 +9,5 @@ CLEANFILES = $(GOBJECTS)
 
 SUFFIXES = .scm .go
 .scm.go:
+	$(MKDIR_P) `dirname $@`
 	$(top_builddir)/pre-inst-guile-env $(top_builddir)/guile-tools compile -o "$@" "$<"
diff --git a/configure.in b/configure.in
index 42e412db1..b9d46e665 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl
 
 define(GUILE_CONFIGURE_COPYRIGHT,[[
 
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 This file is part of GUILE
 
@@ -1550,18 +1550,6 @@ AC_CONFIG_FILES([
   test-suite/Makefile
   test-suite/standalone/Makefile
   module/Makefile
-  module/system/Makefile
-  module/system/base/Makefile
-  module/system/vm/Makefile
-  module/system/repl/Makefile
-  module/language/Makefile
-  module/language/scheme/Makefile
-  module/language/ghil/Makefile
-  module/language/glil/Makefile
-  module/language/assembly/Makefile
-  module/language/bytecode/Makefile
-  module/language/objcode/Makefile
-  module/language/value/Makefile
   module/ice-9/Makefile
   module/ice-9/debugger/Makefile
   module/ice-9/debugging/Makefile
diff --git a/module/Makefile.am b/module/Makefile.am
index 0dbb1b9cc..bf137ba48 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -1 +1,86 @@
-SUBDIRS = system language ice-9 srfi oop
+## Process this file with automake to produce Makefile.in.
+##
+##  	Copyright (C) 2009 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
+
+# Build the compiler and VM support first to avoid stack overflows
+# when building the rest.
+SUBDIRS = . ice-9 srfi oop
+
+# We're at the root of the module hierarchy.
+modpath =
+
+SOURCES =								\
+  system/base/pmatch.scm system/base/syntax.scm				\
+  system/base/compile.scm system/base/language.scm			\
+									\
+  system/vm/debug.scm system/vm/frame.scm system/vm/instruction.scm	\
+  system/vm/objcode.scm system/vm/profile.scm system/vm/program.scm	\
+  system/vm/trace.scm system/vm/vm.scm					\
+									\
+  system/repl/repl.scm system/repl/common.scm				\
+  system/repl/command.scm						\
+									\
+  language/ghil.scm language/glil.scm language/assembly.scm		\
+									\
+  $(SCHEME_LANG_SOURCES) $(ECMASCRIPT_LANG_SOURCES)			\
+  $(GHIL_LANG_SOURCES) $(GLIL_LANG_SOURCES)				\
+  $(ASSEMBLY_LANG_SOURCES) $(BYTECODE_LANG_SOURCES)			\
+  $(OBJCODE_LANG_SOURCES) $(VALUE_LANG_SOURCES)
+
+SCHEME_LANG_SOURCES =						\
+  language/scheme/compile-ghil.scm language/scheme/spec.scm	\
+  language/scheme/inline.scm
+
+GHIL_LANG_SOURCES =					\
+  language/ghil/spec.scm language/ghil/compile-glil.scm
+
+GLIL_LANG_SOURCES =						\
+  language/glil/spec.scm language/glil/compile-assembly.scm
+
+ASSEMBLY_LANG_SOURCES =				\
+  language/assembly/spec.scm			\
+  language/assembly/compile-bytecode.scm	\
+  language/assembly/decompile-bytecode.scm	\
+  language/assembly/disassemble.scm
+
+BYTECODE_LANG_SOURCES =				\
+  language/bytecode/spec.scm
+
+OBJCODE_LANG_SOURCES =				\
+  language/objcode/spec.scm
+
+VALUE_LANG_SOURCES =				\
+  language/value/spec.scm
+
+ECMASCRIPT_LANG_SOURCES =			\
+  language/ecmascript/parse-lalr.scm		\
+  language/ecmascript/tokenize.scm		\
+  language/ecmascript/parse.scm			\
+  language/ecmascript/spec.scm			\
+  language/ecmascript/impl.scm			\
+  language/ecmascript/base.scm			\
+  language/ecmascript/function.scm		\
+  language/ecmascript/array.scm			\
+  language/ecmascript/compile-ghil.scm
+
+NOCOMP_SOURCES =				\
+  system/repl/describe.scm
+
+include $(top_srcdir)/am/guilec
diff --git a/module/language/Makefile.am b/module/language/Makefile.am
deleted file mode 100644
index eaa3a8626..000000000
--- a/module/language/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS=scheme ghil glil assembly bytecode objcode value
-SOURCES=ghil.scm glil.scm assembly.scm \
-	ecmascript/parse-lalr.scm \
-	ecmascript/tokenize.scm \
-	ecmascript/parse.scm \
-	ecmascript/spec.scm \
-	ecmascript/impl.scm \
-	ecmascript/base.scm \
-	ecmascript/function.scm \
-	ecmascript/array.scm \
-	ecmascript/compile-ghil.scm
-modpath = language
-include $(top_srcdir)/am/guilec
diff --git a/module/language/assembly/Makefile.am b/module/language/assembly/Makefile.am
deleted file mode 100644
index 081aab384..000000000
--- a/module/language/assembly/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = spec.scm compile-bytecode.scm decompile-bytecode.scm disassemble.scm
-modpath = language/assembly
-include $(top_srcdir)/am/guilec
diff --git a/module/language/bytecode/Makefile.am b/module/language/bytecode/Makefile.am
deleted file mode 100644
index d0ee6a656..000000000
--- a/module/language/bytecode/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = spec.scm
-modpath = language/bytecode
-include $(top_srcdir)/am/guilec
diff --git a/module/language/ghil/Makefile.am b/module/language/ghil/Makefile.am
deleted file mode 100644
index 2b505f604..000000000
--- a/module/language/ghil/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = spec.scm compile-glil.scm
-modpath = language/ghil
-include $(top_srcdir)/am/guilec
diff --git a/module/language/glil/Makefile.am b/module/language/glil/Makefile.am
deleted file mode 100644
index d3f5e8d61..000000000
--- a/module/language/glil/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = spec.scm compile-assembly.scm
-modpath = language/glil
-include $(top_srcdir)/am/guilec
diff --git a/module/language/objcode/Makefile.am b/module/language/objcode/Makefile.am
deleted file mode 100644
index 6d81c41c1..000000000
--- a/module/language/objcode/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = spec.scm
-modpath = language/objcode
-include $(top_srcdir)/am/guilec
diff --git a/module/language/scheme/Makefile.am b/module/language/scheme/Makefile.am
deleted file mode 100644
index ca1d662f4..000000000
--- a/module/language/scheme/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = compile-ghil.scm spec.scm inline.scm
-modpath = language/scheme
-include $(top_srcdir)/am/guilec
diff --git a/module/language/value/Makefile.am b/module/language/value/Makefile.am
deleted file mode 100644
index 9e87c8a78..000000000
--- a/module/language/value/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = spec.scm
-modpath = language/value
-include $(top_srcdir)/am/guilec
diff --git a/module/system/Makefile.am b/module/system/Makefile.am
deleted file mode 100644
index 316b8807b..000000000
--- a/module/system/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = base vm repl
diff --git a/module/system/base/Makefile.am b/module/system/base/Makefile.am
deleted file mode 100644
index 349811dd5..000000000
--- a/module/system/base/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = pmatch.scm syntax.scm compile.scm language.scm
-modpath = system/base
-include $(top_srcdir)/am/guilec
diff --git a/module/system/repl/Makefile.am b/module/system/repl/Makefile.am
deleted file mode 100644
index 781617511..000000000
--- a/module/system/repl/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-NOCOMP_SOURCES = describe.scm
-SOURCES = repl.scm common.scm command.scm
-modpath = system/repl
-include $(top_srcdir)/am/guilec
diff --git a/module/system/vm/Makefile.am b/module/system/vm/Makefile.am
deleted file mode 100644
index a99559441..000000000
--- a/module/system/vm/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SOURCES = debug.scm frame.scm instruction.scm objcode.scm \
-	  profile.scm program.scm trace.scm vm.scm
-modpath = system/vm
-include $(top_srcdir)/am/guilec