Merge remote-tracking branch 'origin/stable-2.0'

[bpt/guile.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c0fd8c3..c62950a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in.
 ##
-##     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+##     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2007,
+##        2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -24,23 +25,45 @@
 #
 AUTOMAKE_OPTIONS = 1.10
 
-SUBDIRS = lib meta libguile guile-readline emacs \
-         srfi doc examples test-suite benchmark-suite lang am \
-         module testsuite
+SUBDIRS =                                      \
+       lib                                     \
+       meta                                    \
+       libguile                                \
+       module                                  \
+       guile-readline                          \
+       examples                                \
+       emacs                                   \
+       test-suite                              \
+       benchmark-suite                         \
+       gc-benchmarks                           \
+       am                                      \
+       doc
 
-include_HEADERS = libguile.h
+libguileincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)
+libguileinclude_HEADERS = libguile.h
 
 EXTRA_DIST = LICENSE HACKING GUILE-VERSION             \
-            m4/ChangeLog-2008 FAQ \
-            m4/autobuild.m4 ChangeLog-2008
+            m4/ChangeLog-2008                          \
+            ChangeLog-2008                             \
+            .version                                   \
+            gnulib-local/lib/localcharset.h.diff       \
+            gnulib-local/lib/localcharset.c.diff
 
 TESTS = check-guile
+TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 
 ACLOCAL_AMFLAGS = -I m4
 
 DISTCLEANFILES = check-guile.log
 
-dist-hook: gen-ChangeLog
+DISTCHECK_CONFIGURE_FLAGS = --enable-error-on-warning
+
+dist-hook: gen-ChangeLog gen-tarball-version
+
+clean-local:
+       rm -rf cache/
+
+CONFIG_STATUS_DEPENDENCIES = GUILE-VERSION
 
 gen_start_rev = 61db429e251bfd2f75cb4632972e0238056eb24b
 .PHONY: gen-ChangeLog
@@ -52,4 +75,10 @@ gen-ChangeLog:
          mv $(distdir)/cl-t $(distdir)/ChangeLog;                      \
        fi
 
+BUILT_SOURCES = $(top_srcdir)/.version
+$(top_srcdir)/.version:
+       echo $(VERSION) > $@-t && mv $@-t $@
+gen-tarball-version:
+       echo $(VERSION) > $(distdir)/.tarball-version
+
 # Makefile.am ends here