Aggregate `Makefile.am' files under `lang/'.

* lang/Makefile.am (SUBDIRS): Remove.
  (elisp_sources): Aggregate the value of `elisp_SOURCES' formerly found
  in sub-directories' `Makefile.am'.

5 files changed, 47 insertions, 138 deletions

diff --git a/configure.in b/configure.in
index fce493a19..d2ac7b0c2 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
 
@@ -1542,9 +1542,6 @@ AC_CONFIG_FILES([
   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
diff --git a/lang/Makefile.am b/lang/Makefile.am
index 5c02db63c..6dc2e2902 100644
--- a/lang/Makefile.am
+++ b/lang/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 ##
-##  	Copyright (C) 2000, 2006 Free Software Foundation, Inc.
+##  	Copyright (C) 2000, 2006, 2009 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##   
@@ -21,4 +21,48 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = elisp
+# These should be installed and distributed.
+
+elisp_sources =					\
+	elisp/base.scm				\
+	elisp/example.el			\
+	elisp/interface.scm			\
+	elisp/transform.scm			\
+	elisp/variables.scm			\
+						\
+	elisp/primitives/buffers.scm		\
+	elisp/primitives/char-table.scm		\
+	elisp/primitives/features.scm		\
+	elisp/primitives/fns.scm		\
+	elisp/primitives/format.scm		\
+	elisp/primitives/guile.scm		\
+	elisp/primitives/keymaps.scm		\
+	elisp/primitives/lists.scm		\
+	elisp/primitives/load.scm		\
+	elisp/primitives/match.scm		\
+	elisp/primitives/numbers.scm		\
+	elisp/primitives/pure.scm		\
+	elisp/primitives/read.scm		\
+	elisp/primitives/signal.scm		\
+	elisp/primitives/strings.scm		\
+	elisp/primitives/symprop.scm		\
+	elisp/primitives/syntax.scm		\
+	elisp/primitives/system.scm		\
+	elisp/primitives/time.scm		\
+						\
+	elisp/internals/evaluation.scm		\
+	elisp/internals/format.scm		\
+	elisp/internals/fset.scm		\
+	elisp/internals/lambda.scm		\
+	elisp/internals/load.scm		\
+	elisp/internals/null.scm		\
+	elisp/internals/set.scm			\
+	elisp/internals/signal.scm		\
+	elisp/internals/time.scm		\
+	elisp/internals/trace.scm
+
+subpkgdatadir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/lang
+nobase_subpkgdata_DATA = $(elisp_sources)
+TAGS_FILES = $(nobase_subpkgdata_DATA)
+
+EXTRA_DIST = $(elisp_sources) elisp/ChangeLog-2008
diff --git a/lang/elisp/Makefile.am b/lang/elisp/Makefile.am
deleted file mode 100644
index 6f1e82fc5..000000000
--- a/lang/elisp/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-##
-##  	Copyright (C) 1998, 1999, 2000, 2001, 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 = internals primitives
-
-# These should be installed and distributed.
-
-elisp_sources = \
-	base.scm \
-	example.el \
-	interface.scm \
-	transform.scm \
-	variables.scm
-
-subpkgdatadir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/lang/elisp
-subpkgdata_DATA = $(elisp_sources)
-TAGS_FILES = $(subpkgdata_DATA)
-
-EXTRA_DIST = $(elisp_sources) ChangeLog-2008
diff --git a/lang/elisp/internals/Makefile.am b/lang/elisp/internals/Makefile.am
deleted file mode 100644
index 2022a90c3..000000000
--- a/lang/elisp/internals/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-##
-##  	Copyright (C) 1998, 1999, 2000, 2001, 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.
-
-elisp_sources = \
-	evaluation.scm \
-	format.scm \
-	fset.scm \
-	lambda.scm \
-	load.scm \
-	null.scm \
-	set.scm \
-	signal.scm \
-	time.scm \
-	trace.scm
-
-subpkgdatadir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/lang/elisp/internals
-subpkgdata_DATA = $(elisp_sources)
-TAGS_FILES = $(subpkgdata_DATA)
-
-EXTRA_DIST = $(elisp_sources)
diff --git a/lang/elisp/primitives/Makefile.am b/lang/elisp/primitives/Makefile.am
deleted file mode 100644
index b2f62a50a..000000000
--- a/lang/elisp/primitives/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-##
-##  	Copyright (C) 1998, 1999, 2000, 2001, 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.
-
-elisp_sources = \
-	buffers.scm \
-	char-table.scm \
-	features.scm \
-	fns.scm \
-	format.scm \
-	guile.scm \
-	keymaps.scm \
-	lists.scm \
-	load.scm \
-	match.scm \
-	numbers.scm \
-	pure.scm \
-	read.scm \
-	signal.scm \
-	strings.scm \
-	symprop.scm \
-	syntax.scm \
-	system.scm \
-	time.scm
-
-subpkgdatadir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/lang/elisp/primitives
-subpkgdata_DATA = $(elisp_sources)
-TAGS_FILES = $(subpkgdata_DATA)
-
-EXTRA_DIST = $(elisp_sources)