Aggregate makefiles under `ice-9'.

* configure.in: Remove `ice-9/{debugger,debugging}/Makefile' from
  `AC_CONFIG_FILES'.

* ice-9/Makefile.am (SUBDIRS): Remove.
  (ice9_debugger_sources, ice9_debugging_sources): New variables.
  (subpkgdata_DATA): Remove
  (nobase_subpkgdata_DATA): New.
  (TAGS_FILES): Point to $(nobase_subpkgdata_DATA).
  (EXTRA_DIST): Add `$(ice9_debugger_sources) $(ice9_debugging_sources)'.

4 files changed, 17 insertions, 72 deletions

diff --git a/configure.in b/configure.in
index 12f87ac01..59ebefcbf 100644
--- a/configure.in
+++ b/configure.in
@@ -1564,8 +1564,6 @@ AC_CONFIG_FILES([
   examples/Makefile
   guile-config/Makefile
   ice-9/Makefile
-  ice-9/debugger/Makefile
-  ice-9/debugging/Makefile
   lang/Makefile
   libguile/Makefile
   oop/Makefile
diff --git a/ice-9/Makefile.am b/ice-9/Makefile.am
index 4db47d326..e111fc13a 100644
--- a/ice-9/Makefile.am
+++ b/ice-9/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 ##
-##   Copyright (C) 1998,1999,2000,2001,2003, 2004, 2006, 2008 Free Software Foundation, Inc.
+##   Copyright (C) 1998,1999,2000,2001,2003, 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -21,8 +21,6 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = debugger debugging
-
 # These should be installed and distributed.
 ice9_sources =								   \
 	and-let-star.scm boot-9.scm calling.scm common-list.scm		   \
@@ -38,12 +36,25 @@ ice9_sources =								   \
 	weak-vector.scm deprecated.scm list.scm serialize.scm		   \
 	gds-client.scm gds-server.scm
 
+ice9_debugger_sources =						\
+  debugger/command-loop.scm debugger/commands.scm		\
+  debugger/state.scm debugger/trc.scm debugger/utils.scm
+
+ice9_debugging_sources =					\
+  debugging/example-fns.scm					\
+  debugging/ice-9-debugger-extensions.scm			\
+  debugging/steps.scm debugging/trace.scm debugging/traps.scm	\
+  debugging/trc.scm
+
 subpkgdatadir = $(pkgdatadir)/${GUILE_EFFECTIVE_VERSION}/ice-9
-subpkgdata_DATA = $(ice9_sources)
-TAGS_FILES = $(subpkgdata_DATA)
+nobase_subpkgdata_DATA =						\
+  $(ice9_sources) $(ice9_debugger_sources) $(ice9_debugging_sources)
+
+TAGS_FILES = $(nobase_subpkgdata_DATA)
 
 ## test.scm is not currently installed.
-EXTRA_DIST = $(ice9_sources) test.scm compile-psyntax.scm ChangeLog-2008
+EXTRA_DIST = test.scm compile-psyntax.scm ChangeLog-2008		\
+  $(ice9_sources) $(ice9_debugger_sources) $(ice9_debugging_sources)
 
 # We expect this to never be invoked when there is not already
 # ice-9/psyntax.pp in %load-path, since compile-psyntax.scm depends
diff --git a/ice-9/debugger/Makefile.am b/ice-9/debugger/Makefile.am
deleted file mode 100644
index 7ef09a025..000000000
--- a/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/ice-9/debugging/Makefile.am b/ice-9/debugging/Makefile.am
deleted file mode 100644
index 44d86d3cf..000000000
--- a/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)