Merge branch 'wingo'

[bpt/guile.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5d6a7cf..0e61f53 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,24 +24,20 @@
 #
 AUTOMAKE_OPTIONS = 1.10
 
-SUBDIRS = lib oop libguile ice-9 guile-config guile-readline emacs \
+SUBDIRS = lib meta libguile guile-readline emacs \
          scripts srfi doc examples test-suite benchmark-suite lang am \
          module testsuite
 
-bin_SCRIPTS = guile-tools
-
 include_HEADERS = libguile.h
 
-EXTRA_DIST = LICENSE HACKING GUILE-VERSION \
-            m4/ChangeLog FAQ guile-1.8.pc.in
+EXTRA_DIST = LICENSE HACKING GUILE-VERSION             \
+            m4/ChangeLog-2008 FAQ \
+            m4/autobuild.m4 ChangeLog-2008
 
 TESTS = check-guile
 
-ACLOCAL_AMFLAGS = -I guile-config -I m4
+ACLOCAL_AMFLAGS = -I m4
 
 DISTCLEANFILES = check-guile.log
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = guile-1.8.pc
-
 # Makefile.am ends here