HCoop
/
bpt
/
guile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add printers for prompts and with-fluids objects
[bpt/guile.git]
/
libguile
/
Makefile.am
diff --git
a/libguile/Makefile.am
b/libguile/Makefile.am
index
fc6bb6f
..
5ffb6f6
100644
(file)
--- a/
libguile/Makefile.am
+++ b/
libguile/Makefile.am
@@
-1,6
+1,6
@@
## Process this file with Automake to create Makefile.in
##
## Process this file with Automake to create Makefile.in
##
-## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 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.
##
##
## This file is part of GUILE.
##
@@
-33,7
+33,7
@@
DEFAULT_INCLUDES =
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
## building. Also look for Gnulib headers in `lib'.
AM_CPPFLAGS = -DBUILDING_LIBGUILE=1 -I$(top_srcdir) -I$(top_builddir) \
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
## building. Also look for Gnulib headers in `lib'.
AM_CPPFLAGS = -DBUILDING_LIBGUILE=1 -I$(top_srcdir) -I$(top_builddir) \
- -I$(top_srcdir)/lib -I$(top_builddir)/lib
+ -I$(top_srcdir)/lib -I$(top_builddir)/lib
$(LIBFFI_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS) $(CFLAG_VISIBILITY)
AM_CFLAGS = $(GCC_CFLAGS) $(CFLAG_VISIBILITY)
@@
-84,7
+84,7
@@
c-tokenize.$(OBJEXT): c-tokenize.c
if [ "$(cross_compiling)" = "yes" ]; then \
$(CC_FOR_BUILD) $(DEFS) $(AM_CPPFLAGS) -c -o $@ $<; \
else \
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.
fi
## Override default rule; this should run on BUILD host.
@@
-116,6
+116,7
@@
libguile_la_SOURCES = \
bitvectors.c \
bytevectors.c \
chars.c \
bitvectors.c \
bytevectors.c \
chars.c \
+ control.c \
continuations.c \
debug.c \
deprecated.c \
continuations.c \
debug.c \
deprecated.c \
@@
-129,6
+130,7
@@
libguile_la_SOURCES = \
extensions.c \
feature.c \
fluids.c \
extensions.c \
feature.c \
fluids.c \
+ foreign.c \
fports.c \
frames.c \
gc-malloc.c \
fports.c \
frames.c \
gc-malloc.c \
@@
-154,6
+156,7
@@
libguile_la_SOURCES = \
load.c \
macros.c \
mallocs.c \
load.c \
macros.c \
mallocs.c \
+ memoize.c \
modules.c \
null-threads.c \
numbers.c \
modules.c \
null-threads.c \
numbers.c \
@@
-166,6
+169,7
@@
libguile_la_SOURCES = \
procprop.c \
procs.c \
programs.c \
procprop.c \
procs.c \
programs.c \
+ promises.c \
properties.c \
r6rs-ports.c \
random.c \
properties.c \
r6rs-ports.c \
random.c \
@@
-192,6
+196,7
@@
libguile_la_SOURCES = \
symbols.c \
threads.c \
throw.c \
symbols.c \
threads.c \
throw.c \
+ trees.c \
uniform.c \
values.c \
variable.c \
uniform.c \
values.c \
variable.c \
@@
-213,6
+218,7
@@
DOT_X_FILES = \
bitvectors.x \
bytevectors.x \
chars.x \
bitvectors.x \
bytevectors.x \
chars.x \
+ control.x \
continuations.x \
debug.x \
deprecated.x \
continuations.x \
debug.x \
deprecated.x \
@@
-227,6
+233,7
@@
DOT_X_FILES = \
extensions.x \
feature.x \
fluids.x \
extensions.x \
feature.x \
fluids.x \
+ foreign.x \
fports.x \
gc-malloc.x \
gc.x \
fports.x \
gc-malloc.x \
gc.x \
@@
-248,6
+255,7
@@
DOT_X_FILES = \
load.x \
macros.x \
mallocs.x \
load.x \
macros.x \
mallocs.x \
+ memoize.x \
modules.x \
numbers.x \
objprop.x \
modules.x \
numbers.x \
objprop.x \
@@
-257,6
+265,7
@@
DOT_X_FILES = \
print.x \
procprop.x \
procs.x \
print.x \
procprop.x \
procs.x \
+ promises.x \
properties.x \
r6rs-ports.x \
random.x \
properties.x \
r6rs-ports.x \
random.x \
@@
-283,6
+292,7
@@
DOT_X_FILES = \
symbols.x \
threads.x \
throw.x \
symbols.x \
threads.x \
throw.x \
+ trees.x \
uniform.x \
values.x \
variable.x \
uniform.x \
values.x \
variable.x \
@@
-308,6
+318,7
@@
DOT_DOC_FILES = \
bitvectors.doc \
bytevectors.doc \
chars.doc \
bitvectors.doc \
bytevectors.doc \
chars.doc \
+ control.doc \
continuations.doc \
debug.doc \
deprecated.doc \
continuations.doc \
debug.doc \
deprecated.doc \
@@
-322,6
+333,7
@@
DOT_DOC_FILES = \
extensions.doc \
feature.doc \
fluids.doc \
extensions.doc \
feature.doc \
fluids.doc \
+ foreign.doc \
fports.doc \
gc-malloc.doc \
gc.doc \
fports.doc \
gc-malloc.doc \
gc.doc \
@@
-343,6
+355,7
@@
DOT_DOC_FILES = \
load.doc \
macros.doc \
mallocs.doc \
load.doc \
macros.doc \
mallocs.doc \
+ memoize.doc \
modules.doc \
numbers.doc \
objprop.doc \
modules.doc \
numbers.doc \
objprop.doc \
@@
-352,6
+365,7
@@
DOT_DOC_FILES = \
print.doc \
procprop.doc \
procs.doc \
print.doc \
procprop.doc \
procs.doc \
+ promises.doc \
properties.doc \
r6rs-ports.doc \
random.doc \
properties.doc \
r6rs-ports.doc \
random.doc \
@@
-378,6
+392,7
@@
DOT_DOC_FILES = \
symbols.doc \
threads.doc \
throw.doc \
symbols.doc \
threads.doc \
throw.doc \
+ trees.doc \
uniform.doc \
values.doc \
variable.doc \
uniform.doc \
values.doc \
variable.doc \
@@
-391,14
+406,14
@@
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:
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 \
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 \
dynl.c regex-posix.c \
filesys.c posix.c net_db.c socket.c \
debug-malloc.c mkstemp.c \
@@
-416,21
+431,24
@@
install-exec-hook:
## Perhaps we can deal with them normally once the merge seems to be
## working.
noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c \
## Perhaps we can deal with them normally once the merge seems to be
## working.
noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c \
-
eval.i.c ieee-754.h
\
- srfi-
4.i.c srfi-14.i.c
\
+
ieee-754.h
\
+ srfi-
14.i.c
\
quicksort.i.c \
win32-uname.h win32-dirent.h win32-socket.h \
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@
# 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) $(LTLIBGMP) $(LTLIBUNISTRING)
-libguile_la_LDFLAGS = \
- @LTLIBINTL@ \
+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@ \
-version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ \
- -export-dynamic -no-undefined \
+ -export-dynamic -no-undefined
\
$(GNU_LD_FLAGS)
if HAVE_LD_VERSION_SCRIPT
$(GNU_LD_FLAGS)
if HAVE_LD_VERSION_SCRIPT
@@
-459,6
+477,7
@@
modinclude_HEADERS = \
bitvectors.h \
bytevectors.h \
chars.h \
bitvectors.h \
bytevectors.h \
chars.h \
+ control.h \
continuations.h \
debug-malloc.h \
debug.h \
continuations.h \
debug-malloc.h \
debug.h \
@@
-475,6
+494,7
@@
modinclude_HEADERS = \
feature.h \
filesys.h \
fluids.h \
feature.h \
filesys.h \
fluids.h \
+ foreign.h \
fports.h \
frames.h \
gc.h \
fports.h \
frames.h \
gc.h \
@@
-501,6
+521,7
@@
modinclude_HEADERS = \
load.h \
macros.h \
mallocs.h \
load.h \
macros.h \
mallocs.h \
+ memoize.h \
modules.h \
net_db.h \
null-threads.h \
modules.h \
net_db.h \
null-threads.h \
@@
-515,6
+536,7
@@
modinclude_HEADERS = \
procprop.h \
procs.h \
programs.h \
procprop.h \
procs.h \
programs.h \
+ promises.h \
properties.h \
pthread-threads.h \
r6rs-ports.h \
properties.h \
pthread-threads.h \
r6rs-ports.h \
@@
-546,12
+568,12
@@
modinclude_HEADERS = \
tags.h \
threads.h \
throw.h \
tags.h \
threads.h \
throw.h \
+ trees.h \
validate.h \
uniform.h \
values.h \
variable.h \
vectors.h \
validate.h \
uniform.h \
values.h \
variable.h \
vectors.h \
- vm-bootstrap.h \
vm-engine.h \
vm-expand.h \
vm.h \
vm-engine.h \
vm-expand.h \
vm.h \
@@
-578,7
+600,7
@@
EXTRA_DIST = ChangeLog-scm ChangeLog-threads \
## 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*
## 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}: \
sed < $(srcdir)/version.h.in > $@.tmp \
-e s:@-GUILE_MAJOR_VERSION-@:${GUILE_MAJOR_VERSION}: \
-e s:@-GUILE_MINOR_VERSION-@:${GUILE_MINOR_VERSION}: \
@@
-692,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:
## 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 \
| 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 \
| cut -c2- > cpp_sig_symbols_diff
if test -s cpp_sig_symbols_diff ; then \
cat $(srcdir)/cpp_sig_symbols.in cpp_sig_symbols_diff \
@@
-707,10
+729,10
@@
check_signals:
## Likewise for cpp_err_symbols.in.
check_errnos:
## 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 \
| 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 \
| cut -c2- > cpp_err_symbols_diff
if test -s cpp_err_symbols_diff ; then \
cat $(srcdir)/cpp_err_symbols.in cpp_err_symbols_diff \