X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/51ab250ff4b9f8c95a4f9f7e50dc08c7177c7343..bbb2ecd1d1966766aa5f3fed7d5084b46cf1e8a7:/libguile/Makefile.am

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 00f319f1e..5ffb6f67d 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -1,23 +1,23 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##  	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+##  	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
-##   GUILE is free software; you can redistribute it and/or modify
-##   it under the terms of the GNU General Public License as
-##   published by the Free Software Foundation; either version 2, or
+##   GUILE is free software; you can redistribute it and/or modify it
+##   under the terms of the GNU Lesser General Public License as
+##   published by the Free Software Foundation; either version 3, or
 ##   (at your option) any later version.
 ##
 ##   GUILE is distributed in the hope that it will be useful, but
 ##   WITHOUT ANY WARRANTY; without even the implied warranty of
 ##   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-##   GNU General Public License for more details.
+##   GNU Lesser General Public License for more details.
 ##
-##   You should have received a copy of the GNU General Public
-##   License along with GUILE; see the file COPYING.  If not, write
-##   to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-##   Floor, Boston, MA 02110-1301 USA
+##   You should have received a copy of the GNU Lesser General Public
+##   License along with GUILE; see the file COPYING.LESSER.  If not,
+##   write to the Free Software Foundation, Inc., 51 Franklin Street,
+##   Fifth Floor, Boston, MA 02110-1301 USA
 
 AUTOMAKE_OPTIONS = gnu
 
@@ -32,10 +32,10 @@ DEFAULT_INCLUDES =
 ## Check for headers in $(srcdir)/.., so that #include
 ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
 ## building.  Also look for Gnulib headers in `lib'.
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)		\
-	      -I$(top_srcdir)/lib -I$(top_builddir)/lib
+AM_CPPFLAGS = -DBUILDING_LIBGUILE=1 -I$(top_srcdir) -I$(top_builddir) \
+	      -I$(top_srcdir)/lib -I$(top_builddir)/lib $(LIBFFI_CFLAGS)
 
-AM_CFLAGS = $(GCC_CFLAGS)
+AM_CFLAGS = $(GCC_CFLAGS) $(CFLAG_VISIBILITY)
 
 ## The Gnulib Libtool archive.
 gnulib_library = $(top_builddir)/lib/libgnu.la
@@ -43,8 +43,7 @@ gnulib_library = $(top_builddir)/lib/libgnu.la
 ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \
    --regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/'
 
-lib_LTLIBRARIES = libguile.la						\
-		  libguile-i18n-v-@LIBGUILE_I18N_MAJOR@.la
+lib_LTLIBRARIES = libguile.la
 bin_PROGRAMS = guile
 
 noinst_PROGRAMS = guile_filter_doc_snarfage gen-scmconfig
@@ -85,7 +84,7 @@ c-tokenize.$(OBJEXT): c-tokenize.c
 	if [ "$(cross_compiling)" = "yes" ]; then \
 		$(CC_FOR_BUILD) $(DEFS) $(AM_CPPFLAGS) -c -o $@ $<; \
 	else \
-		$(filter-out -Werror,$(COMPILE)) -c -o $@ $<; \
+		$(COMPILE) -c -o $@ $<; \
 	fi
 
 ## Override default rule; this should run on BUILD host.
@@ -105,87 +104,316 @@ guile_LDFLAGS = $(GUILE_CFLAGS)
 
 libguile_la_CFLAGS = $(GUILE_CFLAGS) $(AM_CFLAGS)
 
-libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c	\
-    chars.c continuations.c convert.c debug.c deprecation.c		\
-    deprecated.c discouraged.c dynwind.c eq.c error.c	\
-    eval.c evalext.c extensions.c feature.c fluids.c fports.c		\
-    futures.c gc.c gc-mark.c gc-segment.c gc-malloc.c gc-card.c		\
-    gc-freelist.c gc_os_dep.c gdbint.c gettext.c gc-segment-table.c     \
-    goops.c gsubr.c		\
-    guardians.c hash.c hashtab.c hooks.c init.c inline.c		\
-    ioext.c keywords.c lang.c list.c load.c macros.c mallocs.c		\
-    modules.c numbers.c objects.c objprop.c options.c pairs.c ports.c	\
-    print.c procprop.c procs.c properties.c random.c rdelim.c read.c	\
-    root.c rw.c scmsigs.c script.c simpos.c smob.c sort.c srcprop.c	\
-    stackchk.c stacks.c stime.c strings.c srfi-4.c srfi-13.c srfi-14.c	\
-    strorder.c strports.c struct.c symbols.c threads.c null-threads.c	\
-    throw.c values.c variable.c vectors.c version.c vports.c weaks.c	\
-    ramap.c unif.c
-
-# vm-related sources
-libguile_la_SOURCES += frames.c instructions.c objcodes.c programs.c vm.c
-
-libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_SOURCES = i18n.c
-libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_CFLAGS =	\
-   $(libguile_la_CFLAGS)
-libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_LIBADD =	\
-   libguile.la $(gnulib_library)
-libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_LDFLAGS =	\
-   -module -L$(builddir) -lguile				\
-   -version-info @LIBGUILE_I18N_INTERFACE@
-
-DOT_X_FILES = alist.x arbiters.x async.x backtrace.x boolean.x chars.x	\
-    continuations.x debug.x deprecation.x deprecated.x discouraged.x	\
-    dynl.x dynwind.x eq.x error.x eval.x evalext.x	\
-    extensions.x feature.x fluids.x fports.x futures.x gc.x gc-mark.x	\
-    gc-segment.x gc-malloc.x gc-card.x gettext.x goops.x		\
-    gsubr.x guardians.x gc-segment-table.x                              \
-    hash.x hashtab.x hooks.x i18n.x init.x ioext.x keywords.x lang.x	\
-    list.x load.x macros.x mallocs.x modules.x numbers.x objects.x	\
-    objprop.x options.x pairs.x ports.x print.x procprop.x procs.x	\
-    properties.x random.x rdelim.x read.x root.x rw.x scmsigs.x		\
-    script.x simpos.x smob.x sort.x srcprop.x stackchk.x stacks.x	\
-    stime.x strings.x srfi-4.x srfi-13.x srfi-14.x strorder.x		\
-    strports.x struct.x symbols.x threads.x throw.x values.x		\
-    variable.x vectors.x version.x vports.x weaks.x ramap.x unif.x
+libguile_la_SOURCES =				\
+	alist.c					\
+	arbiters.c				\
+	array-handle.c				\
+	array-map.c				\
+	arrays.c				\
+	async.c					\
+	backtrace.c				\
+	boolean.c				\
+	bitvectors.c				\
+	bytevectors.c				\
+	chars.c					\
+	control.c				\
+	continuations.c				\
+	debug.c					\
+	deprecated.c				\
+	deprecation.c				\
+	discouraged.c				\
+	dynwind.c				\
+	eq.c					\
+	error.c					\
+	eval.c					\
+	evalext.c				\
+	extensions.c				\
+	feature.c				\
+	fluids.c				\
+	foreign.c				\
+	fports.c				\
+	frames.c				\
+	gc-malloc.c				\
+	gc.c					\
+	gdbint.c				\
+	gettext.c				\
+	generalized-arrays.c			\
+	generalized-vectors.c			\
+	goops.c					\
+	gsubr.c					\
+	guardians.c				\
+	hash.c					\
+	hashtab.c				\
+	hooks.c					\
+	i18n.c					\
+	init.c					\
+	inline.c				\
+	instructions.c				\
+	ioext.c					\
+	keywords.c				\
+	lang.c					\
+	list.c					\
+	load.c					\
+	macros.c				\
+	mallocs.c				\
+	memoize.c				\
+	modules.c				\
+	null-threads.c				\
+	numbers.c				\
+	objcodes.c				\
+	objprop.c				\
+	options.c				\
+	pairs.c					\
+	ports.c					\
+	print.c					\
+	procprop.c				\
+	procs.c					\
+	programs.c				\
+	promises.c				\
+	properties.c				\
+	r6rs-ports.c				\
+	random.c				\
+	rdelim.c				\
+	read.c					\
+	root.c					\
+	rw.c					\
+	scmsigs.c				\
+	script.c				\
+	simpos.c				\
+	smob.c					\
+	sort.c					\
+	srcprop.c				\
+	srfi-13.c				\
+	srfi-14.c				\
+	srfi-4.c				\
+	stackchk.c				\
+	stacks.c				\
+	stime.c					\
+	strings.c				\
+	strorder.c				\
+	strports.c				\
+	struct.c				\
+	symbols.c				\
+	threads.c				\
+	throw.c					\
+	trees.c					\
+	uniform.c				\
+	values.c				\
+	variable.c				\
+	vectors.c				\
+	version.c				\
+	vm.c					\
+	vports.c				\
+	weaks.c
+
+DOT_X_FILES =					\
+	alist.x					\
+	arbiters.x				\
+	array-handle.x				\
+	array-map.x				\
+	arrays.x				\
+	async.x					\
+	backtrace.x				\
+	boolean.x				\
+	bitvectors.x				\
+	bytevectors.x				\
+	chars.x					\
+	control.x				\
+	continuations.x				\
+	debug.x					\
+	deprecated.x				\
+	deprecation.x				\
+	discouraged.x				\
+	dynl.x					\
+	dynwind.x				\
+	eq.x					\
+	error.x					\
+	eval.x					\
+	evalext.x				\
+	extensions.x				\
+	feature.x				\
+	fluids.x				\
+	foreign.x				\
+	fports.x				\
+	gc-malloc.x				\
+	gc.x					\
+	gettext.x				\
+	generalized-arrays.x			\
+	generalized-vectors.x			\
+	goops.x					\
+	gsubr.x					\
+	guardians.x				\
+	hash.x					\
+	hashtab.x				\
+	hooks.x					\
+	i18n.x					\
+	init.x					\
+	ioext.x					\
+	keywords.x				\
+	lang.x					\
+	list.x					\
+	load.x					\
+	macros.x				\
+	mallocs.x				\
+	memoize.x				\
+	modules.x				\
+	numbers.x				\
+	objprop.x				\
+	options.x				\
+	pairs.x					\
+	ports.x					\
+	print.x					\
+	procprop.x				\
+	procs.x					\
+	promises.x				\
+	properties.x				\
+	r6rs-ports.x				\
+	random.x				\
+	rdelim.x				\
+	read.x					\
+	root.x					\
+	rw.x					\
+	scmsigs.x				\
+	script.x				\
+	simpos.x				\
+	smob.x					\
+	sort.x					\
+	srcprop.x				\
+	srfi-13.x				\
+	srfi-14.x				\
+	srfi-4.x				\
+	stackchk.x				\
+	stacks.x				\
+	stime.x					\
+	strings.x				\
+	strorder.x				\
+	strports.x				\
+	struct.x				\
+	symbols.x				\
+	threads.x				\
+	throw.x					\
+	trees.x					\
+	uniform.x				\
+	values.x				\
+	variable.x				\
+	vectors.x				\
+	version.x				\
+	vports.x				\
+	weaks.x
 
 # vm-related snarfs
 DOT_X_FILES += frames.x instructions.x objcodes.x programs.x vm.x
 
 EXTRA_DOT_X_FILES = @EXTRA_DOT_X_FILES@
 
-DOT_DOC_FILES = alist.doc arbiters.doc async.doc backtrace.doc		\
-    boolean.doc chars.doc continuations.doc debug.doc deprecation.doc	\
-    deprecated.doc discouraged.doc dynl.doc dynwind.doc			\
-    eq.doc error.doc eval.doc evalext.doc		\
-    extensions.doc feature.doc fluids.doc fports.doc futures.doc	\
-    gc.doc goops.doc gsubr.doc gc-mark.doc gc-segment.doc \
-    gc-malloc.doc gc-card.doc gettext.doc gc-segment-table.doc          \
-    guardians.doc hash.doc hashtab.doc					\
-    hooks.doc i18n.doc init.doc ioext.doc keywords.doc lang.doc		\
-    list.doc load.doc macros.doc mallocs.doc modules.doc numbers.doc	\
-    objects.doc objprop.doc options.doc pairs.doc ports.doc print.doc	\
-    procprop.doc procs.doc properties.doc random.doc rdelim.doc		\
-    read.doc root.doc rw.doc scmsigs.doc script.doc simpos.doc		\
-    smob.doc sort.doc srcprop.doc stackchk.doc stacks.doc stime.doc	\
-    strings.doc srfi-4.doc srfi-13.doc srfi-14.doc strorder.doc		\
-    strports.doc struct.doc symbols.doc threads.doc throw.doc		\
-    values.doc variable.doc vectors.doc version.doc vports.doc		\
-    weaks.doc ramap.doc unif.doc
+DOT_DOC_FILES = 				\
+	alist.doc				\
+	arbiters.doc				\
+	array-handle.doc			\
+	array-map.doc				\
+	arrays.doc				\
+	async.doc				\
+	backtrace.doc				\
+	boolean.doc				\
+	bitvectors.doc				\
+	bytevectors.doc				\
+	chars.doc				\
+	control.doc				\
+	continuations.doc			\
+	debug.doc				\
+	deprecated.doc				\
+	deprecation.doc				\
+	discouraged.doc				\
+	dynl.doc				\
+	dynwind.doc				\
+	eq.doc					\
+	error.doc				\
+	eval.doc				\
+	evalext.doc				\
+	extensions.doc				\
+	feature.doc				\
+	fluids.doc				\
+	foreign.doc				\
+	fports.doc				\
+	gc-malloc.doc				\
+	gc.doc					\
+	gettext.doc				\
+	generalized-arrays.doc			\
+	generalized-vectors.doc			\
+	goops.doc				\
+	gsubr.doc				\
+	guardians.doc				\
+	hash.doc				\
+	hashtab.doc				\
+	hooks.doc				\
+	i18n.doc				\
+	init.doc				\
+	ioext.doc				\
+	keywords.doc				\
+	lang.doc				\
+	list.doc				\
+	load.doc				\
+	macros.doc				\
+	mallocs.doc				\
+	memoize.doc				\
+	modules.doc				\
+	numbers.doc				\
+	objprop.doc				\
+	options.doc				\
+	pairs.doc				\
+	ports.doc				\
+	print.doc				\
+	procprop.doc				\
+	procs.doc				\
+	promises.doc				\
+	properties.doc				\
+	r6rs-ports.doc				\
+	random.doc				\
+	rdelim.doc				\
+	read.doc				\
+	root.doc				\
+	rw.doc					\
+	scmsigs.doc				\
+	script.doc				\
+	simpos.doc				\
+	smob.doc				\
+	sort.doc				\
+	srcprop.doc				\
+	srfi-13.doc				\
+	srfi-14.doc				\
+	srfi-4.doc				\
+	stackchk.doc				\
+	stacks.doc				\
+	stime.doc				\
+	strings.doc				\
+	strorder.doc				\
+	strports.doc				\
+	struct.doc				\
+	symbols.doc				\
+	threads.doc				\
+	throw.doc				\
+	trees.doc				\
+	uniform.doc				\
+	values.doc				\
+	variable.doc				\
+	vectors.doc				\
+	version.doc				\
+	vports.doc				\
+	weaks.doc
 
 EXTRA_DOT_DOC_FILES = @EXTRA_DOT_DOC_FILES@
 
 DOT_I_FILES = vm-i-system.i vm-i-scheme.i vm-i-loader.i
 
 .c.i:
-	grep '^VM_DEFINE' $< > $@
+	$(GREP) '^VM_DEFINE' $< > $@
 
 BUILT_SOURCES = cpp_err_symbols.c cpp_sig_symbols.c libpath.h \
     version.h scmconfig.h \
     $(DOT_I_FILES) $(DOT_X_FILES) $(EXTRA_DOT_X_FILES)
 
 EXTRA_libguile_la_SOURCES = _scm.h		\
-    inet_aton.c memmove.c putenv.c strerror.c	\
+    memmove.c strerror.c			\
     dynl.c regex-posix.c			\
     filesys.c posix.c net_db.c socket.c		\
     debug-malloc.c mkstemp.c			\
@@ -202,46 +430,155 @@ install-exec-hook:
 ## compile, since they are #included.  So instead we list them here.
 ## Perhaps we can deal with them normally once the merge seems to be
 ## working.
-noinst_HEADERS = convert.i.c					\
-                 conv-integer.i.c conv-uinteger.i.c		\
-                 eval.i.c					\
-                 srfi-4.i.c					\
+noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c		\
+                 ieee-754.h					\
+                 srfi-14.i.c					\
                  quicksort.i.c                                  \
                  win32-uname.h win32-dirent.h win32-socket.h	\
-	         private-gc.h private-options.h
+		 private-gc.h private-options.h
 
 # vm instructions
 noinst_HEADERS += vm-engine.c vm-i-system.c vm-i-scheme.c vm-i-loader.c
 
 libguile_la_DEPENDENCIES = @LIBLOBJS@
-libguile_la_LIBADD = @LIBLOBJS@ $(gnulib_library)
-libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined
+libguile_la_LIBADD =				\
+  @LIBLOBJS@ $(gnulib_library) $(LTLIBGMP)	\
+  $(LTLIBUNISTRING) $(LTLIBICONV) $(LTLIBINTL)
+libguile_la_LDFLAGS =											\
+  @LTLIBINTL@ $(LIBFFI_LIBS) $(INET_NTOP_LIB) $(INET_PTON_LIB)						\
+  $(GETADDRINFO_LIB) $(HOSTENT_LIB) $(SERVENT_LIB)							\
+  -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@	\
+  -export-dynamic -no-undefined										\
+  $(GNU_LD_FLAGS)
+
+if HAVE_LD_VERSION_SCRIPT
+
+libguile_la_LDFLAGS += -Wl,--version-script="$(srcdir)/libguile.map"
+
+endif HAVE_LD_VERSION_SCRIPT
+
 
 # These are headers visible as <guile/mumble.h>
 pkginclude_HEADERS = 
 
 # These are headers visible as <libguile/mumble.h>.
 modincludedir = $(includedir)/libguile
-modinclude_HEADERS = __scm.h alist.h arbiters.h async.h backtrace.h	\
-    boolean.h chars.h continuations.h convert.h debug.h debug-malloc.h	\
-    deprecation.h deprecated.h discouraged.h dynl.h dynwind.h		\
-    eq.h error.h eval.h evalext.h extensions.h		\
-    feature.h filesys.h fluids.h fports.h futures.h gc.h		\
-    gdb_interface.h gdbint.h gettext.h goops.h				\
-    gsubr.h guardians.h hash.h						\
-    hashtab.h hooks.h i18n.h init.h inline.h ioext.h iselect.h		\
-    keywords.h lang.h list.h load.h macros.h mallocs.h modules.h	\
-    net_db.h numbers.h objects.h objprop.h options.h pairs.h ports.h	\
-    posix.h regex-posix.h print.h procprop.h procs.h properties.h	\
-    random.h ramap.h rdelim.h read.h root.h rw.h scmsigs.h validate.h	\
-    script.h simpos.h smob.h snarf.h socket.h sort.h srcprop.h		\
-    stackchk.h stacks.h stime.h strings.h srfi-4.h srfi-13.h srfi-14.h	\
-    strorder.h strports.h struct.h symbols.h tags.h threads.h		\
-    pthread-threads.h null-threads.h throw.h unif.h values.h		\
-    variable.h vectors.h vports.h weaks.h
-
-modinclude_HEADERS += vm-bootstrap.h frames.h instructions.h objcodes.h	\
-    programs.h vm.h vm-engine.h vm-expand.h
+modinclude_HEADERS =				\
+	__scm.h					\
+	alist.h					\
+	arbiters.h				\
+	array-handle.h				\
+	array-map.h				\
+	arrays.h				\
+	async.h					\
+	backtrace.h				\
+	bdw-gc.h				\
+	boolean.h				\
+	bitvectors.h				\
+	bytevectors.h				\
+	chars.h					\
+	control.h				\
+	continuations.h				\
+	debug-malloc.h				\
+	debug.h					\
+	deprecated.h				\
+	deprecation.h				\
+	discouraged.h				\
+	dynl.h					\
+	dynwind.h				\
+	eq.h					\
+	error.h					\
+	eval.h					\
+	evalext.h				\
+	extensions.h				\
+	feature.h				\
+	filesys.h				\
+	fluids.h				\
+	foreign.h				\
+	fports.h				\
+	frames.h				\
+	gc.h					\
+	gdb_interface.h				\
+	gdbint.h				\
+	gettext.h				\
+	generalized-arrays.h			\
+	generalized-vectors.h			\
+	goops.h					\
+	gsubr.h					\
+	guardians.h				\
+	hash.h					\
+	hashtab.h				\
+	hooks.h					\
+	i18n.h					\
+	init.h					\
+	inline.h				\
+	instructions.h				\
+	ioext.h					\
+	iselect.h				\
+	keywords.h				\
+	lang.h					\
+	list.h					\
+	load.h					\
+	macros.h				\
+	mallocs.h				\
+	memoize.h				\
+	modules.h				\
+	net_db.h				\
+	null-threads.h				\
+	numbers.h				\
+	objcodes.h				\
+	objprop.h				\
+	options.h				\
+	pairs.h					\
+	ports.h					\
+	posix.h					\
+	print.h					\
+	procprop.h				\
+	procs.h					\
+	programs.h				\
+	promises.h				\
+	properties.h				\
+	pthread-threads.h			\
+	r6rs-ports.h				\
+	random.h				\
+	rdelim.h				\
+	read.h					\
+	regex-posix.h				\
+	root.h					\
+	rw.h					\
+	scmsigs.h				\
+	script.h				\
+	simpos.h				\
+	smob.h					\
+	snarf.h					\
+	socket.h				\
+	sort.h					\
+	srcprop.h				\
+	srfi-13.h				\
+	srfi-14.h				\
+	srfi-4.h				\
+	stackchk.h				\
+	stacks.h				\
+	stime.h					\
+	strings.h				\
+	strorder.h				\
+	strports.h				\
+	struct.h				\
+	symbols.h				\
+	tags.h					\
+	threads.h				\
+	throw.h					\
+	trees.h					\
+	validate.h				\
+	uniform.h				\
+	values.h				\
+	variable.h				\
+	vectors.h				\
+	vm-engine.h				\
+	vm-expand.h				\
+	vm.h					\
+	vports.h				\
+	weaks.h
 
 nodist_modinclude_HEADERS = version.h scmconfig.h
 
@@ -256,14 +593,14 @@ EXTRA_DIST = ChangeLog-scm ChangeLog-threads		\
     cpp_errno.c cpp_err_symbols.in cpp_err_symbols.c			\
     cpp_sig_symbols.c cpp_sig_symbols.in cpp_cnvt.awk			\
     c-tokenize.lex version.h.in						\
-    scmconfig.h.top libgettext.h measure-hwm.scm
+    scmconfig.h.top libgettext.h unidata_to_charset.pl libguile.map
 #    $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \
 #    guile-procedures.txt guile.texi
 
 ## We use @-...-@ as the substitution brackets here, instead of the
 ## usual @...@, so autoconf doesn't go and substitute the values
 ## directly into the left-hand sides of the sed substitutions.  *sigh*
-version.h: version.h.in
+version.h: version.h.in $(top_builddir)/config.status
 	sed < $(srcdir)/version.h.in > $@.tmp \
 	  -e s:@-GUILE_MAJOR_VERSION-@:${GUILE_MAJOR_VERSION}: \
 	  -e s:@-GUILE_MINOR_VERSION-@:${GUILE_MINOR_VERSION}: \
@@ -278,6 +615,10 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	@echo '#define SCM_PKGDATA_DIR "$(pkgdatadir)"' >> libpath.tmp
 	@echo '#define SCM_LIBRARY_DIR "$(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)"'>>libpath.tmp
 	@echo '#define SCM_SITE_DIR "$(pkgdatadir)/site"' >> libpath.tmp
+	@echo '#define SCM_LIB_DIR "$(libdir)"' >> libpath.tmp
+	@echo '#define SCM_EXTENSIONS_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions"' >> libpath.tmp
+	@echo '#define SCM_CCACHE_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/ccache"' >> libpath.tmp
+	@echo '#define SCM_EFFECTIVE_VERSION "$(GUILE_EFFECTIVE_VERSION)"' >> libpath.tmp
 	@echo '#define SCM_BUILD_INFO { \' >> libpath.tmp
 	@echo '	{ "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp
 	@echo ' { "top_srcdir",    "@top_srcdir_absolute@" }, \' >> libpath.tmp
@@ -291,13 +632,15 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	@echo '	{ "sharedstatedir", "@sharedstatedir@" }, \' >> libpath.tmp
 	@echo '	{ "localstatedir", "@localstatedir@" }, \' >> libpath.tmp
 	@echo '	{ "libdir",	   "@libdir@" }, \' >> libpath.tmp
+	@echo '	{ "ccachedir",	   SCM_CCACHE_DIR }, \' >> libpath.tmp
 	@echo '	{ "infodir",	   "@infodir@" }, \' >> libpath.tmp
 	@echo '	{ "mandir",	   "@mandir@" }, \' >> libpath.tmp
 	@echo '	{ "includedir",	   "@includedir@" }, \' >> libpath.tmp
-	@echo '	{ "pkgdatadir",	   "$(datadir)/@PACKAGE@" }, \' >> libpath.tmp
-	@echo '	{ "pkglibdir",	   "$(libdir)/@PACKAGE@" }, \' >> libpath.tmp
-	@echo '	{ "pkgincludedir", "$(includedir)/@PACKAGE@" }, \' \
+	@echo '	{ "pkgdatadir",	   "$(pkgdatadir)" }, \' >> libpath.tmp
+	@echo '	{ "pkglibdir",	   "$(pkglibdir)" }, \' >> libpath.tmp
+	@echo '	{ "pkgincludedir", "$(pkgincludedir)" }, \' \
 		>> libpath.tmp
+	@echo ' { "extensionsdir", "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions" }, \' >> libpath.tmp
 	@echo '	{ "guileversion", "@GUILE_VERSION@" }, \' >> libpath.tmp
 	@echo '	{ "libguileinterface", "@LIBGUILE_INTERFACE@" }, \' \
 		>> libpath.tmp
@@ -326,10 +669,8 @@ error.x: cpp_err_symbols.c
 posix.x: cpp_sig_symbols.c
 load.x: libpath.h
 
-include $(top_srcdir)/am/pre-inst-guile
-
 alldotdocfiles    = $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES)
-snarf2checkedtexi = GUILE="$(GUILE_FOR_BUILD)" $(top_srcdir)/scripts/snarf-check-and-output-texi
+snarf2checkedtexi = GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/uninstalled-env guile-tools snarf-check-and-output-texi
 dotdoc2texi       = cat $(alldotdocfiles) | $(snarf2checkedtexi)
 
 guile.texi: $(alldotdocfiles) guile$(EXEEXT)
@@ -351,29 +692,6 @@ guile-procedures.txt: guile-procedures.texi
 
 endif
 
-# Stack limit calibration for `make check'.  (For why we do this, see
-# the comments in measure-hwm.scm.)  We're relying here on a couple of
-# bits of Automake magic.
-#
-# 1. The fact that "libguile" comes before "test-suite" in SUBDIRS in
-# our toplevel Makefile.am.  This ensures that the
-# stack-limit-calibration.scm "test" will be run before any of the
-# tests under test-suite.
-#
-# 2. The fact that each test is invoked as $TESTS_ENVIRONMENT $test.
-# This allows us to ensure that the test will be considered to have
-# passed, by using `true' as TESTS_ENVIRONMENT.
-#
-# Why don't we care about the test "actually passing"?  Because the
-# important thing about stack-limit-calibration.scm is just that it is
-# generated in the first place, so that other tests under test-suite
-# can use it.
-TESTS = stack-limit-calibration.scm
-TESTS_ENVIRONMENT = true
-
-stack-limit-calibration.scm: measure-hwm.scm guile$(EXEEXT)
-	$(preinstguile) -s $(srcdir)/measure-hwm.scm > $@
-
 c-tokenize.c: c-tokenize.lex
 	flex -t $(srcdir)/c-tokenize.lex > $@ || { rm $@; false; }
 
@@ -396,10 +714,10 @@ cpp_sig_symbols.c: cpp_sig_symbols.in cpp_cnvt.awk
 ## Create a new version of the cpp_sig_symbols.in file, including all SIGXXX
 ## macros defined on this platform.
 check_signals:
-	gcc -undef -dM -E $(srcdir)/cpp_signal.c | egrep ' SIG[A-Z]+' \
+	gcc -undef -dM -E $(srcdir)/cpp_signal.c | $(EGREP) ' SIG[A-Z]+' \
 	  | cut -f2 -d' ' | sort > cpp_sig_symbols_here
 	diff -u $(srcdir)/cpp_sig_symbols.in cpp_sig_symbols_here \
-          | egrep '^\+S' \
+          | $(EGREP) '^\+S' \
 	  | cut -c2- > cpp_sig_symbols_diff
 	if test -s cpp_sig_symbols_diff ; then \
 	  cat $(srcdir)/cpp_sig_symbols.in cpp_sig_symbols_diff \
@@ -411,10 +729,10 @@ check_signals:
 
 ## Likewise for cpp_err_symbols.in.
 check_errnos:
-	gcc -undef -dM -E $(srcdir)/cpp_errno.c | egrep ' E.+' \
+	gcc -undef -dM -E $(srcdir)/cpp_errno.c | $(EGREP) ' E.+' \
 	  | cut -f2 -d' ' | sort > cpp_err_symbols_here
 	diff -u $(srcdir)/cpp_err_symbols.in cpp_err_symbols_here \
-          | egrep '^\+E' \
+          | $(EGREP) '^\+E' \
 	  | cut -c2- > cpp_err_symbols_diff
 	if test -s cpp_err_symbols_diff ; then \
 	  cat $(srcdir)/cpp_err_symbols.in cpp_err_symbols_diff \
@@ -428,8 +746,9 @@ MOSTLYCLEANFILES = \
 	cpp_err_symbols_here cpp_err_symbols_diff cpp_err_symbols_new \
 	cpp_sig_symbols_here cpp_sig_symbols_diff cpp_sig_symbols_new \
 	version.h version.h.tmp \
-	scmconfig.h scmconfig.h.tmp stack-limit-calibration.scm
+	scmconfig.h scmconfig.h.tmp
 
-CLEANFILES = libpath.h *.x *.doc guile-procedures.txt guile-procedures.texi guile.texi
+CLEANFILES = libpath.h *.x *.doc guile-procedures.txt guile-procedures.texi guile.texi \
+	vm-i-*.i
 
 MAINTAINERCLEANFILES = c-tokenize.c