merge from 1.8 branch

[bpt/guile.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
dissimilarity index 82%
index 8230f5e..a4da850 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,41 @@
-## Process this file with automake to produce Makefile.in.
-
-SUBDIRS = ice-9 qt libguile
-
-## FIXME: in the future there will be direct automake support for
-## doing this.  When that happens, switch over.
-aclocaldir = $(datadir)/aclocal
-aclocal_DATA = guile.m4 threads.m4
-
-EXTRA_DIST = $(aclocal_DATA) ltconfig ltmain.sh acconfig.h \
-       HACKING GUILE-VERSION
+## Process this file with automake to produce Makefile.in.
+##
+##     Copyright (C) 1998, 1999, 2000, 2001, 2002, 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 = 1.5
+
+SUBDIRS = oop libguile ice-9 guile-config guile-readline       \
+         scripts srfi doc examples test-suite benchmark-suite lang am
+
+bin_SCRIPTS = guile-tools
+
+include_HEADERS = libguile.h
+
+# automake sometimes forgets to distribute acconfig.h,
+# apparently depending on the phase of the moon.
+EXTRA_DIST = HACKING GUILE-VERSION ANON-CVS SNAPSHOTS BUGS
+
+TESTS = check-guile
+
+ACLOCAL_AMFLAGS = -I guile-config
+
+DISTCLEANFILES = check-guile.log
+
+# Makefile.am ends here