X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/f3c0b533468990a59f3495bdbde5c73b6a9bf8a6..7af81156754f8be7d7661879f7d0c13bb00e5728:/module/Makefile.am diff --git a/module/Makefile.am b/module/Makefile.am index 2d2706ddd..7af35ed8f 100644 --- 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. ## @@ -24,13 +25,16 @@ include $(top_srcdir)/am/guilec # We're at the root of the module hierarchy. modpath = -# Build eval.go first. -$(GOBJECTS): ice-9/eval.go -CLEANFILES += ice-9/eval.go -nobase_mod_DATA += ice-9/eval.scm -nobase_ccache_DATA += ice-9/eval.go -EXTRA_DIST += ice-9/eval.scm -ETAGS_ARGS += ice-9/eval.scm +# 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 VM_TARGETS := system/vm/assembler.go system/vm/disassembler.go $(VM_TARGETS): $(top_builddir)/libguile/vm-operations.h @@ -39,31 +43,30 @@ ice-9/boot-9.go: ice-9/boot-9.scm ice-9/quasisyntax.scm ice-9/r6rs-libraries.scm ice-9/match.go: ice-9/match.scm ice-9/match.upstream.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. +# boot-9 first, then the compiler itself, then the rest of the code. SOURCES = \ - ice-9/psyntax-pp.scm \ ice-9/boot-9.scm \ + language/tree-il/peval.scm \ + system/vm/elf.scm \ ice-9/vlist.scm \ srfi/srfi-1.scm \ - language/tree-il/peval.scm \ - language/tree-il/cse.scm \ + system/vm/linker.scm \ + system/vm/dwarf.scm \ + system/vm/assembler.scm \ \ language/tree-il.scm \ $(TREE_IL_LANG_SOURCES) \ $(CPS_LANG_SOURCES) \ - $(RTL_LANG_SOURCES) \ $(BYTECODE_LANG_SOURCES) \ - $(OBJCODE_LANG_SOURCES) \ $(VALUE_LANG_SOURCES) \ $(SCHEME_LANG_SOURCES) \ $(SYSTEM_BASE_SOURCES) \ \ $(ICE_9_SOURCES) \ + $(SYSTEM_SOURCES) \ $(SRFI_SOURCES) \ $(RNRS_SOURCES) \ $(OOP_SOURCES) \ - $(SYSTEM_SOURCES) \ $(SCRIPTS_SOURCES) \ $(ECMASCRIPT_LANG_SOURCES) \ $(ELISP_LANG_SOURCES) \ @@ -117,28 +120,30 @@ 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 = \ +BYTECODE_LANG_SOURCES = \ + language/bytecode.scm \ language/bytecode/spec.scm -OBJCODE_LANG_SOURCES = \ - language/objcode/spec.scm \ - language/objcode/elf.scm - VALUE_LANG_SOURCES = \ language/value/spec.scm @@ -197,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 = \ @@ -216,6 +222,7 @@ ICE_9_SOURCES = \ ice-9/format.scm \ ice-9/futures.scm \ ice-9/getopt-long.scm \ + ice-9/hash-table.scm \ ice-9/hcons.scm \ ice-9/i18n.scm \ ice-9/iconv.scm \ @@ -278,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 \ @@ -303,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 \ @@ -359,28 +371,25 @@ OOP_SOURCES = \ SYSTEM_SOURCES = \ system/vm/inspect.scm \ system/vm/coverage.scm \ - system/vm/dwarf.scm \ - system/vm/elf.scm \ - system/vm/linker.scm \ system/vm/frame.scm \ - system/vm/instruction.scm \ - system/vm/objcode.scm \ + system/vm/loader.scm \ system/vm/program.scm \ system/vm/trace.scm \ system/vm/traps.scm \ system/vm/trap-state.scm \ - system/vm/assembler.scm \ system/vm/debug.scm \ 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 \ @@ -421,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 \