cleanup: install collection and strict modules on their own

Signed-off-by: Gordon Hecker <gh@emlix.com>

diff --git a/local/Makefile b/local/Makefile
index d73c9e5d14f7e316f9efc2fc1783e21847306e12..975e650ebabab9a1b38c4902797c12f5b6bb1e4b 100644 (file)
--- a/local/Makefile
+++ b/local/Makefile
@@ -46,7 +46,7 @@ LUA_LIBS = e2option.lua luafile.lua generic_git.lua err.lua
 LUA_LIBS += e2tool.lua scm.lua git.lua svn.lua cvs.lua files.lua
 LUA_LIBS += tools.lua transport.lua cache.lua
 LUA_LIBS += environment.lua plugin.lua url.lua hash.lua lock.lua
-LUA_LIBS += policy.lua
+LUA_LIBS += policy.lua strict.lua collection.lua
 LOCALTOOLS = $(LOCALSHTOOLS) $(LOCALLUATOOLS)
 
 SYMLINKS_2_1 = lookup-server use-source prepare-cargo sync-results cleanup \
@@ -119,8 +119,7 @@ clean:
 %.lc: %.lua
        $(LUAC) -o $@ $<
 
-e2local.lc: strict.lua \
-               collection.lua \
+e2local.lc: \
                e2lib.lua \
                e2build.lua
        $(LUAC) -o $@ $^

diff --git a/local/e2tool.lua b/local/e2tool.lua
index 9517c5d6fd0434169f209c59db7512d6aa68f84c..74489f3da0b2626160b367ac4a297254d4632cba 100644 (file)
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -30,6 +30,8 @@
 -- High-level tools used by the build process and basic build operations.
 
 module("e2tool", package.seeall)
+require("strict")
+require("collection")
 require("err")
 require("scm")
 require("files")