Merge remote-tracking branch 'origin/stable-2.0'

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

diff --git a/module/Makefile.am b/module/Makefile.am
index beb1a99..7af35ed 100644 (file)
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in.
 ##
-##     Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+##     Copyright (C) 2009, 2010, 2011, 2012, 2013,
+##        2014 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -46,7 +47,6 @@ ice-9/match.go: ice-9/match.scm ice-9/match.upstream.scm
 SOURCES =                                      \
   ice-9/boot-9.scm                             \
   language/tree-il/peval.scm                    \
-  language/tree-il/cse.scm                      \
   system/vm/elf.scm                            \
   ice-9/vlist.scm                               \
   srfi/srfi-1.scm                               \
@@ -57,7 +57,7 @@ SOURCES =                                     \
   language/tree-il.scm                         \
   $(TREE_IL_LANG_SOURCES)                      \
   $(CPS_LANG_SOURCES)                          \
-  $(RTL_LANG_SOURCES)                          \
+  $(BYTECODE_LANG_SOURCES)                     \
   $(VALUE_LANG_SOURCES)                                \
   $(SCHEME_LANG_SOURCES)                       \
   $(SYSTEM_BASE_SOURCES)                       \
@@ -120,21 +120,29 @@ CPS_LANG_SOURCES =                                                \
   language/cps.scm                                             \
   language/cps/arities.scm                                     \
   language/cps/closure-conversion.scm                          \
-  language/cps/compile-rtl.scm                                 \
+  language/cps/compile-bytecode.scm                            \
   language/cps/constructors.scm                                        \
   language/cps/contification.scm                               \
+  language/cps/cse.scm                                         \
+  language/cps/dce.scm                                         \
   language/cps/dfg.scm                                         \
+  language/cps/effects-analysis.scm                            \
   language/cps/elide-values.scm                                        \
   language/cps/primitives.scm                                  \
+  language/cps/prune-bailouts.scm                              \
+  language/cps/prune-top-level-scopes.scm                      \
   language/cps/reify-primitives.scm                            \
+  language/cps/renumber.scm                                    \
+  language/cps/self-references.scm                             \
   language/cps/slot-allocation.scm                             \
+  language/cps/simplify.scm                                    \
   language/cps/spec.scm                                                \
   language/cps/specialize-primcalls.scm                                \
   language/cps/verify.scm
 
-RTL_LANG_SOURCES =                                             \
-  language/rtl.scm                                             \
-  language/rtl/spec.scm
+BYTECODE_LANG_SOURCES =                                                \
+  language/bytecode.scm                                                \
+  language/bytecode/spec.scm
 
 VALUE_LANG_SOURCES =                           \
   language/value/spec.scm
@@ -194,6 +202,7 @@ SYSTEM_BASE_SOURCES =                               \
   system/base/lalr.scm                         \
   system/base/message.scm                      \
   system/base/target.scm                       \
+  system/base/types.scm                                \
   system/base/ck.scm
 
 ICE_9_SOURCES = \
@@ -276,6 +285,8 @@ SCRIPTS_SOURCES +=                          \
 
 endif BUILD_ICE_9_POPEN
 
+srfi/srfi-64.go: srfi/srfi-64.scm srfi/srfi-64/testing.scm
+
 SRFI_SOURCES = \
   srfi/srfi-2.scm \
   srfi/srfi-4.scm \
@@ -301,13 +312,16 @@ SRFI_SOURCES = \
   srfi/srfi-38.scm \
   srfi/srfi-41.scm \
   srfi/srfi-42.scm \
+  srfi/srfi-43.scm \
   srfi/srfi-39.scm \
   srfi/srfi-45.scm \
   srfi/srfi-60.scm \
+  srfi/srfi-64.scm \
   srfi/srfi-67.scm \
   srfi/srfi-69.scm \
   srfi/srfi-88.scm \
-  srfi/srfi-98.scm
+  srfi/srfi-98.scm \
+  srfi/srfi-111.scm
 
 RNRS_SOURCES =                                 \
   rnrs/base.scm                                        \
@@ -367,13 +381,15 @@ SYSTEM_SOURCES =                          \
   system/vm/disassembler.scm                   \
   system/vm/vm.scm                             \
   system/foreign.scm                           \
+  system/foreign-object.scm                    \
   system/xref.scm                              \
   system/repl/debug.scm                                \
   system/repl/error-handling.scm               \
   system/repl/common.scm                       \
   system/repl/command.scm                      \
   system/repl/repl.scm                         \
-  system/repl/server.scm
+  system/repl/server.scm                       \
+  system/repl/coop-server.scm
 
 LIB_SOURCES =                                  \
   statprof.scm                                 \
@@ -414,6 +430,7 @@ NOCOMP_SOURCES =                            \
   ice-9/r6rs-libraries.scm                     \
   ice-9/quasisyntax.scm                                \
   srfi/srfi-42/ec.scm                          \
+  srfi/srfi-64/testing.scm                     \
   srfi/srfi-67/compare.scm                     \
   system/base/lalr.upstream.scm                        \
   system/repl/describe.scm                     \