Replace $letrec with $rec

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

diff --git a/module/Makefile.am b/module/Makefile.am
index a4fd0ed..51397ba 100644 (file)
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in.
 ##
 ##     Copyright (C) 2009, 2010, 2011, 2012, 2013,
-##        2014 Free Software Foundation, Inc.
+##        2014, 2015 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -27,10 +27,8 @@ modpath =
 
 # Build eval.go first.  Then build psyntax-pp.go, as the expander has to
 # run on every loaded scheme file.  It doesn't pay off at compile-time
-# to interpret the expander in parallel.  At the same time build
-# language/cps/types.go -- it has a particularly bad memory overhead
-# when run interpreted, and it makes sense to compile it first.
-BOOT_SOURCES = ice-9/psyntax-pp.scm language/cps/types.go
+# to interpret the expander in parallel.
+BOOT_SOURCES = ice-9/psyntax-pp.scm
 BOOT_GOBJECTS = $(BOOT_SOURCES:%.scm=%.go)
 $(BOOT_GOBJECTS): ice-9/eval.go
 $(GOBJECTS): $(BOOT_GOBJECTS)
@@ -51,6 +49,7 @@ 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/cps/types.scm                       \
   system/vm/elf.scm                            \
   ice-9/vlist.scm                               \
   srfi/srfi-1.scm                               \
@@ -132,6 +131,8 @@ CPS_LANG_SOURCES =                                          \
   language/cps/dfg.scm                                         \
   language/cps/effects-analysis.scm                            \
   language/cps/elide-values.scm                                        \
+  language/cps/intmap.scm                                      \
+  language/cps/intset.scm                                      \
   language/cps/primitives.scm                                  \
   language/cps/prune-bailouts.scm                              \
   language/cps/prune-top-level-scopes.scm                      \
@@ -197,7 +198,9 @@ SCRIPTS_SOURCES =                           \
   scripts/summarize-guile-TODO.scm             \
   scripts/api-diff.scm                         \
   scripts/read-rfc822.scm                      \
-  scripts/snarf-guile-m4-docs.scm
+  scripts/snarf-guile-m4-docs.scm              \
+  scripts/autofrisk.scm                                \
+  scripts/scan-api.scm
 
 SYSTEM_BASE_SOURCES =                          \
   system/base/pmatch.scm                       \
@@ -247,6 +250,7 @@ ICE_9_SOURCES = \
   ice-9/peg.scm \
   ice-9/poe.scm \
   ice-9/poll.scm \
+  ice-9/popen.scm \
   ice-9/posix.scm \
   ice-9/q.scm \
   ice-9/rdelim.scm \
@@ -276,19 +280,8 @@ ICE_9_SOURCES = \
   ice-9/weak-vector.scm \
   ice-9/list.scm \
   ice-9/serialize.scm \
-  ice-9/local-eval.scm
-
-if BUILD_ICE_9_POPEN
-
-# This functionality is missing on systems without `fork'---i.e., Windows.
-ICE_9_SOURCES += ice-9/popen.scm
-
-# These modules rely on (ice-9 popen).
-SCRIPTS_SOURCES +=                             \
-  scripts/autofrisk.scm                                \
-  scripts/scan-api.scm
-
-endif BUILD_ICE_9_POPEN
+  ice-9/local-eval.scm \
+  ice-9/unicode.scm
 
 srfi/srfi-64.go: srfi/srfi-64.scm srfi/srfi-64/testing.scm
 
@@ -310,6 +303,7 @@ SRFI_SOURCES = \
   srfi/srfi-19.scm \
   srfi/srfi-26.scm \
   srfi/srfi-27.scm \
+  srfi/srfi-28.scm \
   srfi/srfi-31.scm \
   srfi/srfi-34.scm \
   srfi/srfi-35.scm \
@@ -362,14 +356,11 @@ EXTRA_DIST += scripts/README
 OOP_SOURCES = \
   oop/goops.scm \
   oop/goops/active-slot.scm \
-  oop/goops/compile.scm \
   oop/goops/composite-slot.scm \
   oop/goops/describe.scm \
-  oop/goops/dispatch.scm \
   oop/goops/internal.scm \
   oop/goops/save.scm \
   oop/goops/stklos.scm \
-  oop/goops/util.scm \
   oop/goops/accessors.scm \
   oop/goops/simple.scm