merge from 1.8 branch

[bpt/guile.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c352d4b..a4da850 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 ##
-##     Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+##     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -16,12 +16,13 @@
 ##
 ##   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., 59 Temple Place, Suite
-##   330, Boston, MA 02111-1307 USA
+##   to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+##   Floor, Boston, MA 02110-1301 USA
 
+AUTOMAKE_OPTIONS = 1.5
 
-SUBDIRS = ice-9 oop qt libltdl libguile guile-config guile-readline \
-         scripts srfi doc examples
+SUBDIRS = oop libguile ice-9 guile-config guile-readline       \
+         scripts srfi doc examples test-suite benchmark-suite lang am
 
 bin_SCRIPTS = guile-tools
 
@@ -29,10 +30,12 @@ include_HEADERS = libguile.h
 
 # automake sometimes forgets to distribute acconfig.h,
 # apparently depending on the phase of the moon.
-EXTRA_DIST = qthreads.m4 HACKING GUILE-VERSION ANON-CVS SNAPSHOTS TODO \
-            test-suite $(ACLOCAL) acconfig.h
+EXTRA_DIST = HACKING GUILE-VERSION ANON-CVS SNAPSHOTS BUGS
 
 TESTS = check-guile
 
-# The rule will cd to $(top_srcdir).
-ACLOCAL = ./guile-aclocal.sh
+ACLOCAL_AMFLAGS = -I guile-config
+
+DISTCLEANFILES = check-guile.log
+
+# Makefile.am ends here