diff options
| author | BT Templeton <bpt@hcoop.net> | 2012-03-05 16:52:05 -0500 |
|---|---|---|
| committer | BT Templeton <bpt@hcoop.net> | 2012-03-05 16:52:05 -0500 |
| commit | 5ddd9645c94f339f8795bf9b3ece8d518a8de004 (patch) | |
| tree | b7759e320ef4f146e01d4f1b8a0bdddf07cb7799 /am | |
| parent | d019ef92886bebc2d0e79db7c16abacc50b6f77d (diff) | |
| parent | eaeda0d550c513f4d134304d9adda28e1d65a23b (diff) | |
| download | guile-5ddd9645c94f339f8795bf9b3ece8d518a8de004.tar.gz | |
Merge branch 'bt/elisp'
Conflicts:
am/guilec
libguile/_scm.h
libguile/vm-i-scheme.c
module/language/elisp/compile-tree-il.scm
module/language/elisp/runtime.scm
module/language/elisp/runtime/macros.scm
module/language/tree-il/compile-glil.scm
module/language/tree-il/primitives.scm
Diffstat (limited to 'am')
| -rw-r--r-- | am/guilec | 19 |
1 files changed, 14 insertions, 5 deletions
@@ -1,14 +1,14 @@ # -*- makefile -*- -GOBJECTS = $(SOURCES:%.scm=%.go) +GOBJECTS = $(SOURCES:%.scm=%.go) $(ELISP_SOURCES:%.el=%.go) GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat moddir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/$(modpath) -nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES) +nobase_mod_DATA = $(SOURCES) $(ELISP_SOURCES) $(NOCOMP_SOURCES) ccachedir = $(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/ccache/$(modpath) nobase_ccache_DATA = $(GOBJECTS) -EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES) -ETAGS_ARGS = $(SOURCES) $(NOCOMP_SOURCES) +EXTRA_DIST = $(SOURCES) $(ELISP_SOURCES) $(NOCOMP_SOURCES) +ETAGS_ARGS = $(SOURCES) $(ELISP_SOURCES) $(NOCOMP_SOURCES) CLEANFILES = $(GOBJECTS) @@ -24,7 +24,8 @@ AM_V_GUILEC = $(AM_V_GUILEC_$(V)) AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY)) AM_V_GUILEC_0 = @echo " GUILEC" $@; -SUFFIXES = .scm .go +SUFFIXES = .scm .el .go + .scm.go: $(AM_V_GUILEC)GUILE_AUTO_COMPILE=0 \ $(top_builddir)/meta/uninstalled-env \ @@ -32,3 +33,11 @@ SUFFIXES = .scm .go -L "$(abs_srcdir)" -L "$(abs_builddir)" \ -L "$(abs_top_srcdir)/guile-readline" \ -o "$@" "$<" + +.el.go: + $(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" \ + --from=elisp -o "$@" "$<" |