Fixed a design flaw in luci.model.uci

[project/luci.git] / build / module.mk

diff --git a/build/module.mk b/build/module.mk
index a0bd293..f540378 100644 (file)
--- a/build/module.mk
+++ b/build/module.mk
@@ -1,15 +1,42 @@
-.PHONY: all compile source clean
+MAKEPATH:=$(dir $(lastword $(MAKEFILE_LIST)))
+-include $(MAKEPATH)config.mk
+-include $(MAKEPATH)gccconfig.mk
 
-all: compile
+.PHONY: all build compile luacompile luasource clean luaclean
 
-source:
-       mkdir -p dist$(LUCI_INSTALLDIR)
-       cp root/* dist -R 2>/dev/null || true
-       cp src/* dist$(LUCI_INSTALLDIR) -R 2>/dev/null || true
-       for i in $$(find dist -name .svn); do rm $$i -rf; done  
-       
-compile: source
+all: build
+
+build: luabuild gccbuild
+
+luabuild: i18n lua$(LUA_TARGET)
+
+gccbuild: compile
+compile:
+
+clean: luaclean
+
+i18n:
+       [ -n "$(XSLTPROC)" ] && for i in luasrc/i18n/*.xml; do [ -f "$$i" ]\
+       && $(XSLTPROC) $(MAKEPATH)i18n-lua-xhtml1.xsl $$i > $${i/.xml/.lua}; done || true
+
+luasource:
+       mkdir -p dist$(LUA_MODULEDIR)
+       mkdir -p dist$(LUCI_MODULEDIR)
+       mkdir -p dist$(HTDOCS)
+       cp -a root/* dist -R 2>/dev/null || true
+       cp -a luasrc/* dist$(LUCI_MODULEDIR) -R 2>/dev/null || true
+       cp -a lua/* dist$(LUA_MODULEDIR) -R 2>/dev/null || true
+       cp -a htdocs/* dist$(HTDOCS) -R 2>/dev/null || true
+       for i in $$(find dist -name .svn); do rm $$i -rf || true; done
+       for i in dist$(LUCI_MODULEDIR)/i18n/*.xml; do [ -f "$$i" ] && rm $$i; done || true
+
+
+luastrip: luasource
+       for i in $$(find dist -type f -name '*.lua'); do perl -e 'undef $$/; open( F, "< $$ARGV[0]" ) || die $$!; $$src = <F>; close F; $$src =~ s/--\[\[.*?\]\](--)?//gs; $$src =~ s/^\s*--.*?\n//gm; open( F, "> $$ARGV[0]" ) || die $$!; print F $$src; close F' $$i; done
+
+luacompile: luasource
        for i in $$(find dist -name *.lua -not -name debug.lua); do $(LUAC) $(LUAC_OPTIONS) -o $$i $$i; done
-       
-clean:
+
+luaclean:
        rm -rf dist
+