fix `nil?' type inference

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

diff --git a/module/Makefile.am b/module/Makefile.am
index d262818..5f4baae 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,14 +27,16 @@ 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!
-$(GOBJECTS): ice-9/psyntax-pp.go
-ice-9/psyntax-pp.go: ice-9/eval.go
-CLEANFILES += ice-9/eval.go ice-9/psyntax-pp.go
-nobase_mod_DATA += ice-9/eval.scm ice-9/psyntax-pp.scm
-nobase_ccache_DATA += ice-9/eval.go ice-9/psyntax-pp.go
-EXTRA_DIST += ice-9/eval.scm ice-9/psyntax-pp.scm
-ETAGS_ARGS += ice-9/eval.scm ice-9/psyntax-pp.scm
+# 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)
+CLEANFILES += ice-9/eval.go $(BOOT_GOBJECTS)
+nobase_mod_DATA += ice-9/eval.scm $(BOOT_SOURCES)
+nobase_ccache_DATA += ice-9/eval.go $(BOOT_GOBJECTS)
+EXTRA_DIST += ice-9/eval.scm $(BOOT_SOURCES)
+ETAGS_ARGS += ice-9/eval.scm $(BOOT_SOURCES)
 
 VM_TARGETS := system/vm/assembler.go system/vm/disassembler.go
 $(VM_TARGETS): $(top_builddir)/libguile/vm-operations.h
@@ -47,7 +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/tree-il/cse.scm                      \
+  language/cps/types.scm                       \
   system/vm/elf.scm                            \
   ice-9/vlist.scm                               \
   srfi/srfi-1.scm                               \
@@ -124,16 +126,25 @@ CPS_LANG_SOURCES =                                                \
   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/intmap.scm                                      \
+  language/cps/intset.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/simplify2.scm                                   \
   language/cps/spec.scm                                                \
   language/cps/specialize-primcalls.scm                                \
+  language/cps/type-fold.scm                                   \
   language/cps/verify.scm
 
 BYTECODE_LANG_SOURCES =                                                \
@@ -188,7 +199,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                       \
@@ -198,6 +211,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 = \
@@ -237,6 +251,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 \
@@ -266,19 +281,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
 
@@ -300,6 +304,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 \
@@ -352,14 +357,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
 
@@ -376,13 +378,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                                 \