mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-10 05:50:26 +02:00
Code Activity

module compilation fixen, post-integration

Browse source 
Thanks to Dale Smith.

* guilec.mk: Rework to expect the includer to define $(modpath), then
  make $(moddir) from that.

* module/language/Makefile.am:
* module/language/scheme/Makefile.am:
* module/system/base/Makefile.am:
* module/system/il/Makefile.am:
* module/system/repl/Makefile.am:
* module/system/vm/Makefile.am: Define modpath instead.

* src/guilec.in: Don't import (system vm bootstrap), it is no more.
This commit is contained in:
Andy Wingo 2008-08-25 13:05:16 -07:00
parent 83495480e8
commit 75a09d5ae6
8 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
guilec.mk
View file

@ -1,5 +1,6 @@
GOBJECTS = $(SOURCES:%.scm=%.go) GOBJECTS = $(SOURCES:%.scm=%.go)
moddir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/$(modpath)
mod_DATA = $(SOURCES) $(NOCOMP_SOURCES) $(GOBJECTS) mod_DATA = $(SOURCES) $(NOCOMP_SOURCES) $(GOBJECTS)
EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES) EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES)
@ -7,7 +8,4 @@ CLEANFILES = $(GOBJECTS)
SUFFIXES = .scm .go SUFFIXES = .scm .go
.scm.go: .scm.go:
GUILE_LOAD_PATH=\$(top_srcdir)/module \ $(top_builddir)/pre-inst-guile -s \$(top_builddir)/src/guilec $<
LD_LIBRARY_PATH=\$(top_builddir)/src/.libs \
$(top_builddir)/pre-inst-guile-env \
guile -s \$(top_builddir)/src/guilec $<

1
module/language/Makefile.am
View file

@ -1 +0,0 @@
SUBDIRS = scheme

2
module/language/scheme/Makefile.am
View file

@ -1,3 +1,3 @@
SOURCES = translate.scm spec.scm SOURCES = translate.scm spec.scm
moddir = $(guiledir)/language/scheme modpath = language/scheme
include $(top_srcdir)/guilec.mk include $(top_srcdir)/guilec.mk

2
module/system/base/Makefile.am
View file

@ -1,3 +1,3 @@
SOURCES = pmatch.scm syntax.scm compile.scm language.scm SOURCES = pmatch.scm syntax.scm compile.scm language.scm
moddir = $(guiledir)/system/base modpath = system/base
include $(top_srcdir)/guilec.mk include $(top_srcdir)/guilec.mk

2
module/system/il/Makefile.am
View file

@ -1,3 +1,3 @@
SOURCES = glil.scm ghil.scm inline.scm compile.scm SOURCES = glil.scm ghil.scm inline.scm compile.scm
moddir = $(guiledir)/system/il modpath = system/il
include $(top_srcdir)/guilec.mk include $(top_srcdir)/guilec.mk

2
module/system/repl/Makefile.am
View file

@ -1,4 +1,4 @@
NOCOMP_SOURCES = describe.scm NOCOMP_SOURCES = describe.scm
SOURCES = repl.scm common.scm command.scm SOURCES = repl.scm common.scm command.scm
moddir = $(guiledir)/system/repl modpath = system/repl
include $(top_srcdir)/guilec.mk include $(top_srcdir)/guilec.mk

2
module/system/vm/Makefile.am
View file

@ -1,5 +1,5 @@
SOURCES = assemble.scm conv.scm debug.scm \ SOURCES = assemble.scm conv.scm debug.scm \
disasm.scm frame.scm instruction.scm objcode.scm \ disasm.scm frame.scm instruction.scm objcode.scm \
profile.scm program.scm trace.scm vm.scm profile.scm program.scm trace.scm vm.scm
moddir = $(guiledir)/system/vm modpath = system/vm
include $(top_srcdir)/guilec.mk include $(top_srcdir)/guilec.mk

3
src/guilec.in
View file

@ -20,8 +20,7 @@
;;; along with this program; if not, write to the Free Software ;;; along with this program; if not, write to the Free Software
;;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ;;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
(use-modules (system vm bootstrap) (use-modules (system base compile)
(system base compile)
(ice-9 getopt-long)) (ice-9 getopt-long))
(read-set! keywords 'prefix) (read-set! keywords 'prefix)