X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=Makefile;h=21c88b2db4bea5ef3e2d162fa5ff78dc2c5f014d;hb=df3ee4c199242599921d8874656619d07ea14102;hp=3bf8c68de17d1290b1dccec24279fb2f1f94db4d;hpb=cdfe9d6c7bcb678406eccaa389a4b2cea53d7c64;p=project%2Fluci.git

diff --git a/Makefile b/Makefile
index 3bf8c68de..21c88b2db 100644
--- a/Makefile
+++ b/Makefile
@@ -12,22 +12,24 @@ all: build
 build: gccbuild luabuild
 
 gccbuild:
-	make -C libs/lmo CC="cc" CFLAGS="" LDFLAGS="" host-install
+	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 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
@@ -48,7 +50,10 @@ hostcopy:
 	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-*"
@@ -56,6 +61,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"
 
@@ -68,9 +77,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' | \