Merge remote-tracking branch 'origin/master'

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

diff --git a/module/Makefile.am b/module/Makefile.am
index 56fa48d..fa811fd 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, 2011 Free Software Foundation, Inc.
+##     Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -38,6 +38,10 @@ ETAGS_ARGS += ice-9/eval.scm
 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 +99,7 @@ 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                                 \
   language/tree-il/canonicalize.scm                             \
@@ -135,6 +139,7 @@ ECMASCRIPT_LANG_SOURCES =                   \
   language/ecmascript/spec.scm
 
 ELISP_LANG_SOURCES =                           \
+  language/elisp/falias.scm                    \
   language/elisp/lexer.scm                     \
   language/elisp/parser.scm                    \
   language/elisp/bindings.scm                  \
@@ -142,8 +147,6 @@ ELISP_LANG_SOURCES =                                \
   language/elisp/runtime.scm                   \
   language/elisp/runtime/function-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 =                       \
@@ -184,7 +187,6 @@ SYSTEM_BASE_SOURCES =                               \
   system/base/target.scm
 
 ICE_9_SOURCES = \
-  ice-9/r4rs.scm \
   ice-9/r5rs.scm \
   ice-9/deprecated.scm \
   ice-9/and-let-star.scm \
@@ -243,10 +245,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 \
@@ -373,6 +374,9 @@ WEB_SOURCES =                                       \
 
 EXTRA_DIST += oop/ChangeLog-2008
 
+ELISP_SOURCES =                                        \
+    language/elisp/boot.el
+
 NOCOMP_SOURCES =                               \
   ice-9/match.upstream.scm                     \
   ice-9/psyntax.scm                            \