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 486cbe7..49b8a31 100644 (file)
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -32,12 +32,18 @@ nobase_ccache_DATA += ice-9/eval.go
 EXTRA_DIST += ice-9/eval.scm
 ETAGS_ARGS += ice-9/eval.scm
 
+ice-9/boot-9.go: ice-9/boot-9.scm ice-9/quasisyntax.scm ice-9/r6rs-libraries.scm
+
 # We can compile these in any order, but it's fastest if we compile
 # psyntax and boot-9 first, then the compiler itself, then the rest of
 # the code.
 SOURCES =                                      \
   ice-9/psyntax-pp.scm                         \
   ice-9/boot-9.scm                             \
+  ice-9/vlist.scm                               \
+  srfi/srfi-1.scm                               \
+  language/tree-il/peval.scm                    \
+  language/tree-il/cse.scm                      \
                                                \
   language/tree-il.scm                         \
   language/glil.scm                            \
@@ -95,7 +101,6 @@ SCHEME_LANG_SOURCES =                                                \
 
 TREE_IL_LANG_SOURCES =                                         \
   language/tree-il/primitives.scm                              \
-  language/tree-il/peval.scm                                   \
   language/tree-il/effects.scm                                         \
   language/tree-il/fix-letrec.scm                               \
   language/tree-il/optimize.scm                                 \
@@ -103,7 +108,6 @@ TREE_IL_LANG_SOURCES =                                              \
   language/tree-il/analyze.scm                                 \
   language/tree-il/inline.scm                                  \
   language/tree-il/compile-glil.scm                            \
-  language/tree-il/cse.scm                                     \
   language/tree-il/debug.scm                                   \
   language/tree-il/spec.scm
 
@@ -121,7 +125,8 @@ BYTECODE_LANG_SOURCES =                             \
   language/bytecode/spec.scm
 
 OBJCODE_LANG_SOURCES =                         \
-  language/objcode/spec.scm
+  language/objcode/spec.scm                    \
+  language/objcode/elf.scm
 
 VALUE_LANG_SOURCES =                           \
   language/value/spec.scm
@@ -243,11 +248,9 @@ ICE_9_SOURCES = \
   ice-9/weak-vector.scm \
   ice-9/list.scm \
   ice-9/serialize.scm \
-  ice-9/vlist.scm \
   ice-9/local-eval.scm
 
 SRFI_SOURCES = \
-  srfi/srfi-1.scm \
   srfi/srfi-2.scm \
   srfi/srfi-4.scm \
   srfi/srfi-4/gnu.scm \
@@ -327,6 +330,7 @@ OOP_SOURCES = \
 SYSTEM_SOURCES =                               \
   system/vm/inspect.scm                                \
   system/vm/coverage.scm                       \
+  system/vm/elf.scm                            \
   system/vm/frame.scm                          \
   system/vm/instruction.scm                    \
   system/vm/objcode.scm                                \