mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
Provide glthread/lock.h implementation in terms of Guile threads.
Fixes <http://bugs.gnu.org/14404>. Thanks to Paul Eggert <eggert@cs.ucla.edu> for the suggestion. * m4/gnulib-cache.m4: Avoid 'lock' module. * m4/lock.m4, m4/threadlib.m4, lib/glthread/threadlib.c, lib/glthread/lock.c: Remove. * lib/glthread/lock.h: Rewrite in terms of libguile/threads.h. * m4/gnulib-common.m4, m4/gnulib-comp.m4, lib/Makefile.am, lib/unistd.in.h, maint.mk : Update, from Gnulib v0.1-92-g546ff82. * configure.ac (GNULIB_LOCK): Define 'GNULIB_LOCK'. Define 'USE_POSIX_THREADS' when building with pthread support. * Makefile.am (noinst_HEADERS): New variable. (BUILT_SOURCES): Add libguile/scmconfig.h. (libguile/scmconfig.h): New target.
This commit is contained in:
parent
de7aa61ac4
commit
8f7887d616
13 changed files with 148 additions and 2512 deletions
15
Makefile.am
15
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
|
||||
|
@ -94,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:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue