diff options
| author | Ludovic Courtès | 2009-11-20 12:04:36 +0100 |
|---|---|---|
| committer | Ludovic Courtès | 2009-11-20 12:11:38 +0100 |
| commit | 238a6ee02e730e148d84dbc7fac4b7a46140031f (patch) | |
| tree | e85b954cc6da743cb2ea66f86e76c045360b7836 /guile-vm.am | |
| parent | cf8a9c935c972d06b265ef5e80e0318047c74ad2 (diff) | |
| download | skribilo-238a6ee02e730e148d84dbc7fac4b7a46140031f.tar.gz skribilo-238a6ee02e730e148d84dbc7fac4b7a46140031f.tar.lz skribilo-238a6ee02e730e148d84dbc7fac4b7a46140031f.zip | |
Define $GUILE_LOAD_COMPILED_PATH for Guile 2.x.
* guile-vm.am (guile_warnings): New variable.
(.scm.go): Set $GUILE_LOAD_COMPILED_PATH appropriately, specify Guile
compilation warnings.
* src/pre-inst-skribilo.in, src/skribilo.in: Set
$GUILE_LOAD_COMPILED_PATH appropriately.
* tests/Makefile.am (TESTS_ENVIRONMENT): Set $GUILE_AUTO_COMPILE and
$GUILE_LOAD_COMPILED_PATH.
* doc/user/Makefile.am (skribilo.info, .skb.html, .skb.lout, .skb.tex,
.skb.ctx): Set $GUILE_LOAD_COMPILED_PATH.
(load_compiled_path): New variable.
Diffstat (limited to 'guile-vm.am')
| -rw-r--r-- | guile-vm.am | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/guile-vm.am b/guile-vm.am index 14b146f..627e5a0 100644 --- a/guile-vm.am +++ b/guile-vm.am @@ -1,3 +1,4 @@ + # Compilation with Guile-VM's compiler (aka. Guile 2.x). if ENABLE_GUILE_VM @@ -8,15 +9,20 @@ GOBJECTS = $(SOURCES:%.scm=%.go) nobase_nodist_module_DATA = \ $(SOURCES) $(GOBJECTS) $(SOURCES_NOT_COMPILED) +# Compiler warnings. +guile_warnings = unused-variable unbound-variable arity-mismatch + .scm.go: $(MKDIR_P) `dirname $@` - $(GUILE) -L $(srcdir) \ - -c "(use-modules (system base compile) \ - (skribilo condition)) \ - (read-set! keywords 'prefix) \ - (call-with-skribilo-error-catch/exit \ - (lambda () \ - (compile-file \"$<\" \"$@\")))" + GUILE_AUTO_COMPILE=0 \ + GUILE_LOAD_COMPILED_PATH="$(builddir):$(top_builddir)/src/guile:$$GUILE_LOAD_COMPILED_PATH" \ + $(GUILE) --debug -L "$(srcdir)" -L "$(top_srcdir)/src/guile" \ + -c "(use-modules (system base compile) \ + (skribilo condition)) \ + (call-with-skribilo-error-catch/exit \ + (lambda () \ + (compile-file \"$<\" #:output-file \"$@\" \ + #:opts '(#:warnings ($(guile_warnings))))))" CLEANFILES += $(GOBJECTS) |