X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=13438848ed138d911935fff3c6dc225395bdc68e;hp=4abb358b2179136ae089e1dccdce0e88b0c6c1f5;hb=58a5b15c0bcf27bebf1ecb5505f3a8cfa99864d2;hpb=4fbecc4874340a2e844a2deecdc49ea2cfa1f620

diff --git a/Makefile b/Makefile
index 4abb358b2..13438848e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,10 +12,19 @@ all: build
 build: gccbuild luabuild
 
 gccbuild:
-	for i in $(MODULES); do make -C$$i compile; done
+	for i in $(MODULES); do \
+		make -C$$i compile || { \
+			echo "*** Compilation of $$i failed!"; \
+			exit 1; \
+		}; \
+	done
+
+luabuild: i18nbuild
+	for i in $(MODULES); do HOST=$(realpath host) make -C$$i luabuild; done
 
-luabuild:
-	for i in $(MODULES); do make -C$$i luabuild; done
+i18nbuild:
+	mkdir -p host/lua-po
+	./build/i18n-po2lua.pl ./po host/lua-po
 
 clean:
 	rm -rf docs
@@ -41,17 +50,11 @@ hostenv: host ucidefaults
 ucidefaults:
 	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host)/bin/uci-defaults --exclude luci-freifunk-*"
 
-runboa: hostenv
-	libs/sgi-webuci/host/buildconfig.sh $(realpath host) > host/etc/boa/boa.conf
-	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host/usr/bin/boa) -c $(realpath host/etc/boa) -d"
-
 runhttpd: hostenv
-	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host/usr/bin/lucittpd) $(realpath host)/usr/lib/lucittpd/plugins"
-
-runluci: runhttpd
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua build/lucid.lua"
 
 runlua: hostenv
-	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) lua
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua -i build/setup.lua"
 
 runshell: hostenv
 	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) $$SHELL
@@ -66,7 +69,7 @@ uvldocs: hostenv
 	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) \
 	"build/uvldoc $(realpath host) $(UVL_SCHEMEDIR) uvldocs $(DOCS)"
 
-po:
+po: host
 	for L in $${LANGUAGE:-$$(find i18n/ -path 'i18n/*/luasrc/i18n/*' -name 'default.*.lua' | \
 	  sed -e 's!.*/default\.\(.*\)\.lua!\1!')}; do \
 	    build/i18n-lua2po.pl . $(realpath host)/po $$L; \