X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=ceb80ac249dcd172ff50699fef2888386344ed59;hp=1b9e25916f913ded884c6f65deb5859f1f96d8f1;hb=406531a84c5560d1ea290bd4c6e15f47f587d303;hpb=7bf803250be75dac62c6e048fa675c93c9093b9a

diff --git a/Makefile b/Makefile
index 1b9e25916..ceb80ac24 100644
--- a/Makefile
+++ b/Makefile
@@ -12,17 +12,26 @@ all: build
 build: gccbuild luabuild
 
 gccbuild:
-	for i in $(MODULES); do make -C$$i compile; done
+	make -C libs/lmo CC="cc" CFLAGS="" LDFLAGS="" SDK="$(shell test -f .running-sdk && echo 1)" host-install
+	for i in $(MODULES); do \
+		make -C$$i SDK="$(shell test -f .running-sdk && echo 1)" compile || { \
+			echo "*** Compilation of $$i failed!"; \
+			exit 1; \
+		}; \
+	done
 
 luabuild: i18nbuild
-	for i in $(MODULES); do HOST=$(realpath host) make -C$$i luabuild; done
+	for i in $(MODULES); do HOST=$(realpath host) \
+		SDK="$(shell test -f .running-sdk && echo 1)" make -C$$i luabuild; done
 
 i18nbuild:
 	mkdir -p host/lua-po
 	./build/i18n-po2lua.pl ./po host/lua-po
 
 clean:
+	rm -f .running-sdk
 	rm -rf docs
+	make -C libs/lmo host-clean
 	for i in $(MODULES); do make -C$$i clean; done
 
 
@@ -34,28 +43,30 @@ 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
 	ln -s .$(LUCI_MODULEDIR) host/luci
 	rm -rf /tmp/luci-* || true
 
-hostenv: host ucidefaults
+hostenv: sdk host ucidefaults
+
+sdk:
+	touch .running-sdk
 
 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"
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua build/lucid.lua"
 
-runluci: runhttpd
+runuhttpd: hostenv
+	cp $(realpath build)/luci.cgi $(realpath host)/www/cgi-bin/luci
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host)/usr/sbin/uhttpd -p 8080 -h $(realpath host)/www -f"
 
 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