build system: Compile the lock module into the generic modules instead

of installing on its own.
This is still required due to the build system using different lua
compilers in local an global builds.

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

diff --git a/generic/Makefile b/generic/Makefile
index 281a150e51c8b7a08acb7d8f60011e7508d01008..a4853b83143a1694ee943f4eeedcf32d1ee5104a 100644 (file)
--- a/generic/Makefile
+++ b/generic/Makefile
@@ -37,12 +37,10 @@ CLEAN_FILES = *~ *.lc *.so lua-version-map.lua e2-su-2.2
 
 .PHONY: all install uninstall local install-local clean
 
-all: e2generic_global.lc luafile_ll_global.so e2util_global.so e2-su-2.2 \
-       lock.lc
+all: e2generic_global.lc luafile_ll_global.so e2util_global.so e2-su-2.2
 
 install: all
        install -m 644 e2generic_global.lc $(DESTDIR)$(LIBDIR)
-       install -m 644 lock.lc $(DESTDIR)$(LIBDIR)
        install -m 755 luafile_ll_global.so $(DESTDIR)$(LIBDIR)
        install -m 755 e2util_global.so $(DESTDIR)$(LIBDIR)
        install -m 4754 -o root -g $(E2_GROUP) e2-su-2.2 $(DESTDIR)$(BINDIR)/
@@ -50,16 +48,14 @@ install: all
 uninstall:
        rm -f $(DESTDIR)$(BINDIR)/e2-su-2.2
        rm -f $(DESTDIR)$(LIBDIR)/e2generic_global.lc
-       rm -f $(DESTDIR)$(LIBDIR)/lock.lc
        rm -f $(DESTDIR)$(LIBDIR)/luafile_ll_global.so
        rm -f $(DESTDIR)$(LIBDIR)/e2util_global.so
 
-local: e2generic_local.lc luafile_ll_local.so e2util_local.so lock.lc
+local: e2generic_local.lc luafile_ll_local.so e2util_local.so
 
 install-local: local
        mkdir -p $(LOCALLIBDIR) $(LOCALMAKDIR)
        install -m 644 e2generic_local.lc $(LOCALLIBDIR)
-       install -m 644 lock.lc $(LOCALLIBDIR)
        install -m 755 luafile_ll_local.so $(LOCALLIBDIR)
        install -m 755 e2util_local.so $(LOCALLIBDIR)
        install -m 644 e2-su-2.2.c $(LOCALMAKDIR)
@@ -81,7 +77,7 @@ e2generic_global.lc: strict.lua collection.lua e2lib_global_prefix.lua \
                e2lib.lua e2option.lua sha1.lua \
                transport.lua cache.lua url.lua scm.git.lua \
                luafile.lua lua-version-map.lua \
-               error.lua
+               error.lua lock.lua
        $(BUILD_LUAC) -o $@ $^
 
 e2generic_local.lc: strict.lua collection.lua e2lib_local_prefix.lua \
@@ -93,9 +89,6 @@ e2generic_local.lc: strict.lua collection.lua e2lib_local_prefix.lua \
 %: %.in
        $(TOPLEVEL)/scripts/genscript.sh $< $@
 
-%.lc: %.lua
-       $(BUILD_LUAC) -o $@ $<
-
 e2-su-2.2: e2-su-2.2.c
        $(CC) $(CFLAGS) $(E2_SU_CFLAGS) $(LDFLAGS) $< -o $@
 

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index a610cbd28f6802f749b12419cb398f9cbdc082a9..1418a459fe226b132149ab9f7f0e35244a28378a 100644 (file)
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -26,7 +26,6 @@
 ]]
 
 require("buildconfig")
-require("lock")
 
 _version = "e2factory, the emlix embedded build system, version " .. 
                                                        buildconfig.VERSION

diff --git a/local/Makefile b/local/Makefile
index f19b33ed1b4d937e87ac9093f087cbb82f3d04cd..3bafc2fabdfb2d96c701858cd1c7925fe0440db0 100644 (file)
--- a/local/Makefile
+++ b/local/Makefile
@@ -120,6 +120,7 @@ e2local.lc: $(TOPLEVEL)/generic/strict.lua \
                e2tool.lua e2scm.lua git.lua svn.lua cvs.lua files.lua \
                $(TOPLEVEL)/generic/e2option.lua \
                $(TOPLEVEL)/generic/sha1.lua \
+               $(TOPLEVEL)/generic/lock.lua \
                e2build.lua $(TOPLEVEL)/generic/luafile.lua \
                policy.lua
        $(LUAC) -o $@ $^