X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=70a7e92a40df5c00db63ae4c9bf1f3ff4a234971;hp=7dc9fa1e8ebe3d92a0e4d112687dc7e8b3554fd4;hb=dde25048b9c7e14ab0d4df8a5d18650ec7508d65;hpb=ee584460ad346e8f65e85d62464427faf763bab1 diff --git a/Makefile b/Makefile index 7dc9fa1e8..70a7e92a4 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ all: build build: gccbuild luabuild gccbuild: - make -C libs/web 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!"; \ @@ -33,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 @@ -60,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" @@ -92,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 #