From: Mark H Weaver <mhw@netris.org>
Date: Thu, 15 Aug 2013 08:09:04 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/stable-2.0'
X-Git-Url: https://git.hcoop.net/bpt/guile.git/commitdiff_plain/521c542199afa4f199746d5bbffc18a988cb30bc

Merge remote-tracking branch 'origin/stable-2.0'
---

521c542199afa4f199746d5bbffc18a988cb30bc
diff --cc module/Makefile.am
index 6d3b31f2d,e8dcd4a13..dc7d058da
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@@ -32,10 -32,8 +32,11 @@@ nobase_ccache_DATA += ice-9/eval.g
  EXTRA_DIST += ice-9/eval.scm
  ETAGS_ARGS += ice-9/eval.scm
  
 +VM_TARGETS := system/vm/assembler.go system/vm/disassembler.go
 +$(VM_TARGETS): $(top_builddir)/libguile/vm-operations.h
 +
  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