-EXTRA_DIST = LICENSE HACKING GUILE-VERSION \
- m4/ChangeLog-2008 FAQ guile-1.8.pc.in \
- m4/autobuild.m4 ChangeLog-2008
+# 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