diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2008-12-23 21:39:38 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2008-12-23 21:39:38 +0000 |
| commit | 4081526ba7d0594c3ef120df5ee223c4eb55fb18 (patch) | |
| tree | ee8bdd2d1dff60812b1d7ef5a4172700e3aaa2d1 /Makefile | |
| parent | 8b1ddef6a45623db5111eebc6ada8c7def2ac2f9 (diff) | |
luci-0.8: merge complete trunk
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -1,6 +1,6 @@ include build/config.mk -MODULES = applications/* libs/* modules/* themes/* i18n/* contrib/* +MODULES = contrib/* applications/* libs/* modules/* themes/* i18n/* OS:=$(shell uname) export OS @@ -12,7 +12,7 @@ all: build build: gccbuild luabuild gccbuild: - for i in $(MODULES); do make -C$$i compile; done + for i in $(MODULES); do make -C$$i compile; done luabuild: for i in $(MODULES); do make -C$$i luabuild; done @@ -39,14 +39,14 @@ hostcopy: 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 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 libs/httpd/host/runluci) $(realpath host) $(HTDOCS)" + build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host/usr/bin/lucittpd) $(realpath host)/usr/lib/lucittpd/plugins" runluci: luahost build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath libs/httpd/host/runluci) $(realpath host) $(HTDOCS)" @@ -63,11 +63,15 @@ 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)" + run: # make run is deprecated # # Please use: # # # - # To run LuCI WebUI using LuCI HTTPD # + # To run LuCI WebUI using LuCIttpd # # make runhttpd # # # # To run LuCI WebUI using Boa/Webuci # |