X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=70a7e92a40df5c00db63ae4c9bf1f3ff4a234971;hp=ceb80ac249dcd172ff50699fef2888386344ed59;hb=998011462408e76c1a766afd5a6fe7ce82393218;hpb=daca626e86ff51e72f6423f3fb69e1a1d16d7c59

diff --git a/Makefile b/Makefile
index ceb80ac24..70a7e92a4 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,7 +14,7 @@ all: build
 build: gccbuild luabuild
 
 gccbuild:
-	make -C libs/lmo CC="cc" CFLAGS="" LDFLAGS="" SDK="$(shell test -f .running-sdk && echo 1)" host-install
+	make -C modules/base 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!"; \
@@ -31,7 +33,7 @@ i18nbuild:
 clean:
 	rm -f .running-sdk
 	rm -rf docs
-	make -C libs/lmo host-clean
+	make -C modules/base host-clean
 	for i in $(MODULES); do make -C$$i clean; done
 
 
@@ -58,9 +60,6 @@ sdk:
 ucidefaults:
 	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host)/bin/uci-defaults --exclude luci-freifunk-*"
 
-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"
@@ -77,9 +76,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' | \
@@ -91,11 +89,8 @@ run:
 	#	make run is deprecated				#
 	#	Please use:					#
 	#							#
-	#	To run LuCI WebUI using LuCIttpd		#
-	#	make runhttpd					#
-	#							#
-	#	To run LuCI WebUI using Boa/Webuci		#
-	#	make runboa 					#
+	#	To run LuCI WebUI using uhttpd			#
+	#	make runuhttpd					#
 	#							#
 	#	To start a shell in the LuCI environment	#
 	#	make runshell					#