move (test-suite lib) to lower dir; cleans up uninstalled paths.

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

diff --git a/module/Makefile.am b/module/Makefile.am
index 9940900..9c9d8ed 100644 (file)
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 ##
-##     Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+##     Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -73,17 +73,20 @@ ETAGS_ARGS +=                                       \
   ice-9/compile-psyntax.scm                    \
   ice-9/ChangeLog-2008
 
-include $(top_srcdir)/am/pre-inst-guile
 ice-9/psyntax-pp.scm.gen:
-       $(preinstguile) --no-auto-compile -s $(srcdir)/ice-9/compile-psyntax.scm \
+       $(top_builddir_absolute)/meta/guile --no-auto-compile -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
 
+# Keep this rule in sync with that in `am/guilec'.
 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"
+       $(AM_V_GUILEC)GUILE_AUTO_COMPILE=0                              \
+       $(top_builddir)/meta/uninstalled-env                            \
+       guild compile --target="$(host)" $(GUILE_WARNINGS)              \
+         -L "$(abs_srcdir)" -L "$(abs_builddir)"                       \
+         -L "$(abs_top_srcdir)/guile-readline"                         \
+         -o "ice-9/psyntax-pp.go" "$(srcdir)/ice-9/psyntax.scm"
 
 SCHEME_LANG_SOURCES =                                          \
   language/scheme/spec.scm                                     \
@@ -92,11 +95,14 @@ SCHEME_LANG_SOURCES =                                               \
 
 TREE_IL_LANG_SOURCES =                                         \
   language/tree-il/primitives.scm                              \
-  language/tree-il/optimize.scm                                 \
-  language/tree-il/inline.scm                                   \
+  language/tree-il/peval.scm                                   \
   language/tree-il/fix-letrec.scm                               \
+  language/tree-il/optimize.scm                                 \
+  language/tree-il/canonicalize.scm                             \
   language/tree-il/analyze.scm                                 \
+  language/tree-il/inline.scm                                  \
   language/tree-il/compile-glil.scm                            \
+  language/tree-il/debug.scm                                   \
   language/tree-il/spec.scm
 
 GLIL_LANG_SOURCES =                                            \
@@ -147,7 +153,6 @@ BRAINFUCK_LANG_SOURCES =                    \
   language/brainfuck/spec.scm
 
 SCRIPTS_SOURCES =                              \
-  scripts/PROGRAM.scm                          \
   scripts/autofrisk.scm                                \
   scripts/compile.scm                          \
   scripts/disassemble.scm                      \
@@ -155,7 +160,9 @@ SCRIPTS_SOURCES =                           \
   scripts/doc-snarf.scm                                \
   scripts/frisk.scm                            \
   scripts/generate-autoload.scm                        \
+  scripts/help.scm                             \
   scripts/lint.scm                             \
+  scripts/list.scm                             \
   scripts/punify.scm                           \
   scripts/read-scheme-source.scm               \
   scripts/read-text-outline.scm                        \
@@ -173,19 +180,23 @@ SYSTEM_BASE_SOURCES =                             \
   system/base/compile.scm                      \
   system/base/language.scm                     \
   system/base/lalr.scm                         \
-  system/base/message.scm
+  system/base/message.scm                      \
+  system/base/target.scm
 
 ICE_9_SOURCES = \
   ice-9/r4rs.scm \
   ice-9/r5rs.scm \
   ice-9/deprecated.scm \
   ice-9/and-let-star.scm \
+  ice-9/binary-ports.scm \
   ice-9/calling.scm \
+  ice-9/command-line.scm \
   ice-9/common-list.scm \
   ice-9/control.scm \
   ice-9/curried-definitions.scm \
   ice-9/debug.scm \
   ice-9/documentation.scm \
+  ice-9/eval-string.scm \
   ice-9/expect.scm \
   ice-9/format.scm \
   ice-9/futures.scm \
@@ -232,7 +243,8 @@ ICE_9_SOURCES = \
   ice-9/weak-vector.scm \
   ice-9/list.scm \
   ice-9/serialize.scm \
-  ice-9/vlist.scm
+  ice-9/vlist.scm \
+  ice-9/local-eval.scm
 
 SRFI_SOURCES = \
   srfi/srfi-1.scm \
@@ -268,7 +280,6 @@ SRFI_SOURCES = \
   srfi/srfi-98.scm
 
 RNRS_SOURCES =                                 \
-  rnrs.scm                                     \
   rnrs/base.scm                                        \
   rnrs/conditions.scm                          \
   rnrs/control.scm                             \
@@ -293,7 +304,8 @@ RNRS_SOURCES =                                      \
   rnrs/io/ports.scm                            \
   rnrs/records/inspection.scm                  \
   rnrs/records/procedural.scm                  \
-  rnrs/records/syntactic.scm
+  rnrs/records/syntactic.scm                   \
+  rnrs.scm
 
 EXTRA_DIST += scripts/ChangeLog-2008
 EXTRA_DIST += scripts/README
@@ -352,6 +364,7 @@ LIB_SOURCES =                                       \
   texinfo/serialize.scm
 
 WEB_SOURCES =                                  \
+  web/client.scm                               \
   web/http.scm                                 \
   web/request.scm                              \
   web/response.scm                             \