X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=Makefile;h=3bf8c68de17d1290b1dccec24279fb2f1f94db4d;hb=892ed55ba08d3d5553e621e57d69a3eb8ffa4efc;hp=0f0bf42bfd5c14cbaf7d7aead5576f70a5a503eb;hpb=8c4f847ea5b95aaf0e716beaf736b4e2b67655ae;p=project%2Fluci.git

diff --git a/Makefile b/Makefile
index 0f0bf42bf..3bf8c68de 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,13 @@ all: build
 build: gccbuild luabuild
 
 gccbuild:
-	for i in $(MODULES); do make -C$$i compile; done
+	make -C libs/lmo CC="cc" CFLAGS="" LDFLAGS="" host-install
+	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
@@ -23,6 +29,7 @@ i18nbuild:
 
 clean:
 	rm -rf docs
+	make -C libs/lmo host-clean
 	for i in $(MODULES); do make -C$$i clean; done
 
 
@@ -34,6 +41,7 @@ luahost: luabuild hostcopy
 
 hostcopy: 
 	mkdir -p host/tmp
+	mkdir -p host/var/state
 	for i in $(MODULES); do cp -pR $$i/dist/* host/ 2>/dev/null || true; done
 	for i in $(MODULES); do cp -pR $$i/hostfiles/* host/ 2>/dev/null || true; done
 	rm -f host/luci
@@ -45,15 +53,8 @@ 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: luahost
-	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath libs/httpd/host/runluci) $(realpath host) $(HTDOCS)"
+	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 -i build/setup.lua"