X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/6cfdc6b87881a592b7ad99db8d9ea0ee13a4101b..a50eda40dfca0461d7ad6f013fa55d2c14f1d2c6:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 737897bcf..8f9e014c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,8 @@
 ## Process this file with automake to produce Makefile.in.
 ##
 ##  	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2007,
-##        2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+##        2008, 2009, 2010, 2011, 2012, 2013,
+##        2014 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -45,6 +46,16 @@ libguileinclude_HEADERS = libguile.h
 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
@@ -52,7 +63,8 @@ libguile/guile-procedures.txt: libguile/guile-procedures.texi
 	$(top_builddir)/meta/guile --no-auto-compile		\
 	  "$(srcdir)/libguile/texi-fragments-to-docstrings"	\
 	  "$(builddir)/libguile/guile-procedures.texi"		\
-	  > libguile/guile-procedures.txt
+	  > $@.tmp
+	@mv $@.tmp $@
 
 EXTRA_DIST = LICENSE HACKING GUILE-VERSION			\
 	     m4/ChangeLog-2008					\
@@ -63,13 +75,15 @@ EXTRA_DIST = LICENSE HACKING GUILE-VERSION			\
 	     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
+	     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
@@ -91,7 +105,7 @@ gen-ChangeLog:
 	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
 	fi
 
-BUILT_SOURCES = $(top_srcdir)/.version
+BUILT_SOURCES += $(top_srcdir)/.version
 $(top_srcdir)/.version:
 	echo $(VERSION) > $@-t && mv $@-t $@
 gen-tarball-version: