Inline the effect of am/pre-inst-guile

[bpt/guile.git] / module / Makefile.am

diff --git a/module/Makefile.am b/module/Makefile.am
index f17e225..2685a3a 100644 (file)
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 ##
-##     Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+##     Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -73,9 +73,8 @@ ETAGS_ARGS +=                                 \
   ice-9/compile-psyntax.scm                    \
   ice-9/ChangeLog-2008
 
-include $(top_srcdir)/am/pre-inst-guile
 ice-9/psyntax-pp.scm.gen:
-       $(preinstguile) --no-autocompile -s $(srcdir)/ice-9/compile-psyntax.scm \
+       $(top_builddir_absolute)/meta/guile --no-auto-compile -s $(srcdir)/ice-9/compile-psyntax.scm \
                $(srcdir)/ice-9/psyntax.scm $(srcdir)/ice-9/psyntax-pp.scm
 
 .PHONY: ice-9/psyntax-pp.scm.gen
@@ -135,8 +134,9 @@ ELISP_LANG_SOURCES =                                \
   language/elisp/compile-tree-il.scm           \
   language/elisp/runtime.scm                   \
   language/elisp/runtime/function-slot.scm     \
-  language/elisp/runtime/macro-slot.scm                \
   language/elisp/runtime/value-slot.scm                \
+  language/elisp/runtime/macros.scm            \
+  language/elisp/runtime/subrs.scm             \
   language/elisp/spec.scm
 
 BRAINFUCK_LANG_SOURCES =                       \
@@ -179,14 +179,17 @@ ICE_9_SOURCES = \
   ice-9/r5rs.scm \
   ice-9/deprecated.scm \
   ice-9/and-let-star.scm \
+  ice-9/binary-ports.scm \
   ice-9/calling.scm \
   ice-9/common-list.scm \
   ice-9/control.scm \
   ice-9/curried-definitions.scm \
   ice-9/debug.scm \
   ice-9/documentation.scm \
+  ice-9/eval-string.scm \
   ice-9/expect.scm \
   ice-9/format.scm \
+  ice-9/futures.scm \
   ice-9/getopt-long.scm \
   ice-9/hcons.scm \
   ice-9/i18n.scm \
@@ -199,6 +202,7 @@ ICE_9_SOURCES = \
   ice-9/occam-channel.scm \
   ice-9/optargs.scm \
   ice-9/poe.scm \
+  ice-9/poll.scm \
   ice-9/popen.scm \
   ice-9/posix.scm \
   ice-9/q.scm \
@@ -265,7 +269,6 @@ SRFI_SOURCES = \
   srfi/srfi-98.scm
 
 RNRS_SOURCES =                                 \
-  rnrs.scm                                     \
   rnrs/base.scm                                        \
   rnrs/conditions.scm                          \
   rnrs/control.scm                             \
@@ -290,7 +293,8 @@ RNRS_SOURCES =                                      \
   rnrs/io/ports.scm                            \
   rnrs/records/inspection.scm                  \
   rnrs/records/procedural.scm                  \
-  rnrs/records/syntactic.scm
+  rnrs/records/syntactic.scm                   \
+  rnrs.scm
 
 EXTRA_DIST += scripts/ChangeLog-2008
 EXTRA_DIST += scripts/README
@@ -352,7 +356,8 @@ WEB_SOURCES =                                       \
   web/http.scm                                 \
   web/request.scm                              \
   web/response.scm                             \
-  web/toy-server.scm                           \
+  web/server.scm                               \
+  web/server/http.scm                          \
   web/uri.scm
 
 EXTRA_DIST += oop/ChangeLog-2008