module compilation fixen, post-integration

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.

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

diff --git a/module/language/Makefile.am b/module/language/Makefile.am
index 916be92..e69de29 100644 (file)
--- a/module/language/Makefile.am
+++ b/module/language/Makefile.am
@@ -1 +0,0 @@
-SUBDIRS = scheme

diff --git a/module/language/scheme/Makefile.am b/module/language/scheme/Makefile.am
index 62385e0..8a2c32b 100644 (file)
--- a/module/language/scheme/Makefile.am
+++ b/module/language/scheme/Makefile.am
@@ -1,3 +1,3 @@
 SOURCES = translate.scm spec.scm
-moddir = $(guiledir)/language/scheme
+modpath = language/scheme
 include $(top_srcdir)/guilec.mk

diff --git a/module/system/base/Makefile.am b/module/system/base/Makefile.am
index 853876f..794f5d6 100644 (file)
--- a/module/system/base/Makefile.am
+++ b/module/system/base/Makefile.am
@@ -1,3 +1,3 @@
 SOURCES = pmatch.scm syntax.scm compile.scm language.scm
-moddir = $(guiledir)/system/base
+modpath = system/base
 include $(top_srcdir)/guilec.mk

diff --git a/module/system/il/Makefile.am b/module/system/il/Makefile.am
index 94a927f..e65c6fd 100644 (file)
--- a/module/system/il/Makefile.am
+++ b/module/system/il/Makefile.am
@@ -1,3 +1,3 @@
 SOURCES = glil.scm ghil.scm inline.scm compile.scm
-moddir = $(guiledir)/system/il
+modpath = system/il
 include $(top_srcdir)/guilec.mk

diff --git a/module/system/repl/Makefile.am b/module/system/repl/Makefile.am
index c7d0553..7a5dbc6 100644 (file)
--- a/module/system/repl/Makefile.am
+++ b/module/system/repl/Makefile.am
@@ -1,4 +1,4 @@
 NOCOMP_SOURCES = describe.scm
 SOURCES = repl.scm common.scm command.scm
-moddir = $(guiledir)/system/repl
+modpath = system/repl
 include $(top_srcdir)/guilec.mk

diff --git a/module/system/vm/Makefile.am b/module/system/vm/Makefile.am
index 8996a5a..43807c0 100644 (file)
--- a/module/system/vm/Makefile.am
+++ b/module/system/vm/Makefile.am
@@ -1,5 +1,5 @@
 SOURCES = assemble.scm conv.scm debug.scm \
          disasm.scm frame.scm instruction.scm objcode.scm \
          profile.scm program.scm trace.scm vm.scm
-moddir = $(guiledir)/system/vm
+modpath = system/vm
 include $(top_srcdir)/guilec.mk

diff --git a/src/guilec.in b/src/guilec.in
index 85acbfd..e0d3c92 100644 (file)
--- a/src/guilec.in
+++ b/src/guilec.in
@@ -20,8 +20,7 @@
 ;;; along with this program; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-(use-modules (system vm bootstrap)
-             (system base compile)
+(use-modules (system base compile)
             (ice-9 getopt-long))
 
 (read-set! keywords 'prefix)