X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=7dc9fa1e8ebe3d92a0e4d112687dc7e8b3554fd4;hp=775820cb1b43022de83299188099dfe3590524c1;hb=13224b696d0ea71fb2f8e2b4b0e8eca6caa9ae90;hpb=f2b1b113dea96215b42727c2c00c757d2809a837;ds=sidebyside

diff --git a/Makefile b/Makefile
index 775820cb1b..7dc9fa1e8e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,8 @@ include build/config.mk
 MODULES = contrib/* applications/* libs/* modules/* themes/* i18n/*
 
 OS:=$(shell uname)
+MODULES:=$(foreach item,$(wildcard $(MODULES)),$(if $(realpath $(wildcard $(item)/Makefile)),$(item)))
+
 export OS
 
 .PHONY: all build gccbuild luabuild clean host gcchost luahost hostcopy hostclean
@@ -12,22 +14,25 @@ all: build
 build: gccbuild luabuild
 
 gccbuild:
-	make -C libs/lmo CC="cc" CFLAGS="" LDFLAGS="" host-install
+	make -C libs/web CC="cc" CFLAGS="" LDFLAGS="" SDK="$(shell test -f .running-sdk && echo 1)" host-install
 	for i in $(MODULES); do \
-		make -C$$i compile || { \
+		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
 
@@ -40,13 +45,17 @@ 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-*"
@@ -54,6 +63,10 @@ ucidefaults:
 runhttpd: hostenv
 	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua build/lucid.lua"
 
+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 -i build/setup.lua"
 
@@ -66,9 +79,8 @@ hostclean: clean
 apidocs: hostenv
 	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "build/makedocs.sh host/luci/ docs"
 
-uvldocs: hostenv
-	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) \
-	"build/uvldoc $(realpath host) $(UVL_SCHEMEDIR) uvldocs $(DOCS)"
+nixiodocs: hostenv
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "build/makedocs.sh libs/nixio/ nixiodocs"
 
 po: host
 	for L in $${LANGUAGE:-$$(find i18n/ -path 'i18n/*/luasrc/i18n/*' -name 'default.*.lua' | \