Merge branch 'wingo'

[bpt/guile.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 98b1c7e..0e61f53 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, 2002, 2006 Free Software Foundation, Inc.
+##     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2007, 2008 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -24,20 +24,19 @@
 #
 AUTOMAKE_OPTIONS = 1.10
 
-SUBDIRS = oop libguile ice-9 guile-config guile-readline emacs \
-         scripts srfi doc examples test-suite benchmark-suite lang am
-
-bin_SCRIPTS = guile-tools
+SUBDIRS = lib meta libguile guile-readline emacs \
+         scripts srfi doc examples test-suite benchmark-suite lang am \
+         module testsuite
 
 include_HEADERS = libguile.h
 
-# automake sometimes forgets to distribute acconfig.h,
-# apparently depending on the phase of the moon.
-EXTRA_DIST = LICENSE HACKING GUILE-VERSION ANON-CVS SNAPSHOTS BUGS
+EXTRA_DIST = LICENSE HACKING GUILE-VERSION             \
+            m4/ChangeLog-2008 FAQ \
+            m4/autobuild.m4 ChangeLog-2008
 
 TESTS = check-guile
 
-ACLOCAL_AMFLAGS = -I guile-config
+ACLOCAL_AMFLAGS = -I m4
 
 DISTCLEANFILES = check-guile.log