X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/a6e60a9571711cf90ec9cf547125cb1495e58bca..HEAD:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3705762f0..8f9e014c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
 ## Process this file with automake to produce Makefile.in.
 ##
-##  	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+##  	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2007,
+##        2008, 2009, 2010, 2011, 2012, 2013,
+##        2014 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -24,26 +26,69 @@
 #
 AUTOMAKE_OPTIONS = 1.10
 
-SUBDIRS = lib meta libguile guile-readline emacs \
-	  srfi examples test-suite benchmark-suite am \
-	  module doc testsuite
+SUBDIRS =					\
+	lib					\
+	meta					\
+	libguile				\
+	module					\
+	guile-readline				\
+	examples				\
+	emacs					\
+	test-suite				\
+	benchmark-suite				\
+	gc-benchmarks				\
+	am					\
+	doc
 
 libguileincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)
 libguileinclude_HEADERS = libguile.h
 
-EXTRA_DIST = LICENSE HACKING GUILE-VERSION		\
-	     m4/ChangeLog-2008 \
-	     m4/autobuild.m4 ChangeLog-2008
+schemelibdir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)
+schemelib_DATA = libguile/guile-procedures.txt
+
+# Our own implementation of Gnulib's lock interface.
+noinst_HEADERS = lib/glthread/lock.h
+
+# Our lib/glthreads/lock.h header indirectly includes
+# libguile/scmconfig.h.  Make sure it is built before we recurse into
+# lib/.
+BUILT_SOURCES = libguile/scmconfig.h
+libguile/scmconfig.h:
+	$(MAKE) -C libguile scmconfig.h
+
+# Build it from here so that all the modules are compiled by the time we
+# build it.
+libguile/guile-procedures.txt: libguile/guile-procedures.texi
+	$(AM_V_GEN)						\
+	$(top_builddir)/meta/guile --no-auto-compile		\
+	  "$(srcdir)/libguile/texi-fragments-to-docstrings"	\
+	  "$(builddir)/libguile/guile-procedures.texi"		\
+	  > $@.tmp
+	@mv $@.tmp $@
+
+EXTRA_DIST = LICENSE HACKING GUILE-VERSION			\
+	     m4/ChangeLog-2008					\
+	     m4/gnulib-cache.m4					\
+	     ChangeLog-2008					\
+	     .version						\
+	     gnulib-local/lib/localcharset.h.diff		\
+	     gnulib-local/lib/localcharset.c.diff		\
+	     gnulib-local/m4/clock_time.m4.diff			\
+	     gnulib-local/build-aux/git-version-gen.diff	\
+	     libguile/texi-fragments-to-docstrings		\
+	     gdbinit
 
 TESTS = check-guile
+TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 
 ACLOCAL_AMFLAGS = -I m4
 
+CLEANFILES = libguile/guile-procedures.txt
 DISTCLEANFILES = check-guile.log
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-error-on-warning
 
-dist-hook: gen-ChangeLog
+dist-hook: gen-ChangeLog gen-tarball-version
 
 clean-local:
 	rm -rf cache/
@@ -60,4 +105,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