X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/d967913f05301a35573c5d3f7217d0994bbb1016..6f81b18abed11b7a2dd1dad15d8281ed7036b602:/module/Makefile.am

diff --git a/module/Makefile.am b/module/Makefile.am
index 9ff50f82a..67d530ada 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -24,17 +24,13 @@ include $(top_srcdir)/am/guilec
 # We're at the root of the module hierarchy.
 modpath =
 
-BEGINNING_OF_TIME=198001010100
-
-$(GOBJECTS): ice-9/eval.go.stamp
-ice-9/eval.go.stamp: ice-9/eval.go
-	touch -t $(BEGINNING_OF_TIME) $(srcdir)/ice-9/eval.scm 
-	touch -r $(srcdir)/ice-9/eval.scm ice-9/eval.go
-	touch -r $(srcdir)/ice-9/eval.scm ice-9/eval.go.stamp
-CLEANFILES += ice-9/eval.go ice-9/eval.go.stamp
+# 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
 
 # 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
@@ -64,24 +60,31 @@ SOURCES =					\
   $(ECMASCRIPT_LANG_SOURCES)			\
   $(ELISP_LANG_SOURCES)				\
   $(BRAINFUCK_LANG_SOURCES)			\
-  $(LIB_SOURCES)
+  $(LIB_SOURCES)				\
+  $(WEB_SOURCES)
 
 ## test.scm is not currently installed.
 EXTRA_DIST +=					\
   ice-9/test.scm				\
   ice-9/compile-psyntax.scm			\
   ice-9/ChangeLog-2008
+ETAGS_ARGS +=					\
+  ice-9/test.scm				\
+  ice-9/compile-psyntax.scm			\
+  ice-9/ChangeLog-2008
 
-# We expect this to never be invoked when there is not already
-# ice-9/psyntax-pp.scm in %load-path, since compile-psyntax.scm depends
-# on ice-9/syncase.scm, which does `(load-from-path "ice-9/psyntax-pp.scm")'.
-# In other words, to bootstrap this file, you need to do something like:
-#    GUILE_LOAD_PATH=/usr/local/share/guile/1.5.4 make psyntax-pp.scm
 include $(top_srcdir)/am/pre-inst-guile
-ice-9/psyntax-pp.scm: ice-9/psyntax.scm
+ice-9/psyntax-pp.scm.gen:
 	$(preinstguile) --no-autocompile -s $(srcdir)/ice-9/compile-psyntax.scm \
 		$(srcdir)/ice-9/psyntax.scm $(srcdir)/ice-9/psyntax-pp.scm
 
+.PHONY: ice-9/psyntax-pp.scm.gen
+
+ice-9/psyntax-pp.go: ice-9/psyntax.scm ice-9/psyntax-pp.scm
+	$(AM_V_GUILEC) GUILE_AUTO_COMPILE=0			\
+	$(top_builddir)/meta/uninstalled-env			\
+	guile-tools compile $(GUILE_WARNINGS) -o "ice-9/psyntax-pp.go" "$(srcdir)/ice-9/psyntax.scm"
+
 SCHEME_LANG_SOURCES =						\
   language/scheme/spec.scm					\
   language/scheme/compile-tree-il.scm				\
@@ -181,11 +184,10 @@ ICE_9_SOURCES = \
   ice-9/control.scm \
   ice-9/curried-definitions.scm \
   ice-9/debug.scm \
-  ice-9/debugger.scm \
   ice-9/documentation.scm \
-  ice-9/emacs.scm \
   ice-9/expect.scm \
   ice-9/format.scm \
+  ice-9/futures.scm \
   ice-9/getopt-long.scm \
   ice-9/hcons.scm \
   ice-9/i18n.scm \
@@ -198,6 +200,7 @@ ICE_9_SOURCES = \
   ice-9/occam-channel.scm \
   ice-9/optargs.scm \
   ice-9/poe.scm \
+  ice-9/poll.scm \
   ice-9/popen.scm \
   ice-9/posix.scm \
   ice-9/q.scm \
@@ -208,6 +211,7 @@ ICE_9_SOURCES = \
   ice-9/rw.scm \
   ice-9/safe-r5rs.scm \
   ice-9/safe.scm \
+  ice-9/save-stack.scm \
   ice-9/scm-style-repl.scm \
   ice-9/session.scm \
   ice-9/slib.scm \
@@ -216,6 +220,7 @@ ICE_9_SOURCES = \
   ice-9/string-fun.scm \
   ice-9/syncase.scm \
   ice-9/threads.scm \
+  ice-9/top-repl.scm \
   ice-9/buffered-input.scm \
   ice-9/time.scm \
   ice-9/history.scm \
@@ -226,7 +231,6 @@ ICE_9_SOURCES = \
   ice-9/weak-vector.scm \
   ice-9/list.scm \
   ice-9/serialize.scm \
-  ice-9/gds-server.scm \
   ice-9/vlist.scm
 
 SRFI_SOURCES = \
@@ -247,12 +251,17 @@ SRFI_SOURCES = \
   srfi/srfi-18.scm \
   srfi/srfi-19.scm \
   srfi/srfi-26.scm \
+  srfi/srfi-27.scm \
   srfi/srfi-31.scm \
   srfi/srfi-34.scm \
   srfi/srfi-35.scm \
   srfi/srfi-37.scm \
+  srfi/srfi-38.scm \
+  srfi/srfi-42.scm \
   srfi/srfi-39.scm \
+  srfi/srfi-45.scm \
   srfi/srfi-60.scm \
+  srfi/srfi-67.scm \
   srfi/srfi-69.scm \
   srfi/srfi-88.scm \
   srfi/srfi-98.scm
@@ -305,19 +314,22 @@ OOP_SOURCES = \
 SYSTEM_SOURCES =				\
   system/vm/inspect.scm				\
   system/vm/coverage.scm			\
-  system/vm/debug.scm				\
   system/vm/frame.scm				\
   system/vm/instruction.scm			\
   system/vm/objcode.scm				\
-  system/vm/profile.scm				\
   system/vm/program.scm				\
   system/vm/trace.scm				\
+  system/vm/traps.scm				\
+  system/vm/trap-state.scm			\
   system/vm/vm.scm				\
   system/foreign.scm				\
   system/xref.scm				\
-  system/repl/repl.scm				\
+  system/repl/debug.scm				\
+  system/repl/error-handling.scm		\
   system/repl/common.scm			\
-  system/repl/command.scm
+  system/repl/command.scm			\
+  system/repl/repl.scm				\
+  system/repl/server.scm
 
 LIB_SOURCES =					\
   statprof.scm					\
@@ -338,26 +350,25 @@ LIB_SOURCES =					\
   texinfo/reflection.scm			\
   texinfo/serialize.scm
 
+WEB_SOURCES =					\
+  web/http.scm					\
+  web/request.scm				\
+  web/response.scm				\
+  web/server.scm				\
+  web/server/http.scm				\
+  web/uri.scm
+
 EXTRA_DIST += oop/ChangeLog-2008
 
 NOCOMP_SOURCES =				\
-  ice-9/gds-client.scm				\
   ice-9/match.upstream.scm			\
   ice-9/psyntax.scm				\
   ice-9/r6rs-libraries.scm			\
   ice-9/quasisyntax.scm				\
+  srfi/srfi-42/ec.scm				\
+  srfi/srfi-67/compare.scm			\
   system/base/lalr.upstream.scm			\
   system/repl/describe.scm			\
-  ice-9/debugger/command-loop.scm		\
-  ice-9/debugger/commands.scm			\
-  ice-9/debugger/state.scm			\
-  ice-9/debugger/trc.scm			\
-  ice-9/debugger/utils.scm			\
-  ice-9/debugging/example-fns.scm		\
-  ice-9/debugging/steps.scm			\
-  ice-9/debugging/trace.scm			\
-  ice-9/debugging/traps.scm			\
-  ice-9/debugging/trc.scm			\
   sxml/sxml-match.ss				\
   sxml/upstream/SSAX.scm			\
   sxml/upstream/SXML-tree-trans.scm		\