X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=05f5e91d5a9ae5f93d681716219d0488abbcf19a;hp=12c1d89e0966e19e51480b1d2f15a92db16b528d;hb=5ae95430e173381c4f2bab38c5059deedc27dcc4;hpb=7384e0e6b77518efa4d113ede46f8c107de6f604

diff --git a/Makefile b/Makefile
index 12c1d89e0..05f5e91d5 100644
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,10 @@ gccbuild:
 	for i in $(MODULES); do make -C$$i compile; done	
 
 luabuild:
-	for i in $(MODULES); do make -C$$i lua$(LUA_TARGET); done
+	for i in $(MODULES); do make -C$$i luabuild; done
 
 clean:
+	rm -rf docs
 	for i in $(MODULES); do make -C$$i clean; done
 
 
@@ -28,16 +29,17 @@ gcchost: gccbuild hostcopy
 luahost: luabuild hostcopy
 
 hostcopy: 
-	mkdir -p host
-	for i in $(MODULES); do cp -a $$i/dist/* host/ -R 2>/dev/null || true; done
-	for i in $(MODULES); do cp -a $$i/hostfiles/* host/ -R 2>/dev/null || true; done
+	mkdir -p host/tmp
+	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
 
 ucidefaults:
-	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host)/bin/uci-defaults --exclude luci-community-*"
+	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
@@ -58,6 +60,13 @@ runshell: hostenv
 hostclean: clean
 	rm -rf host
 
+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)"
+
 run:
 	#	make run is deprecated				#
 	#	Please use:					#