From: Steven Barth Date: Sat, 20 Jun 2009 07:20:56 +0000 (+0000) Subject: Fix SDK build process X-Git-Tag: 0.10.0~1533 X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=a060a9e135ce0bf94496935aea5a4981ca0da750 Fix SDK build process --- diff --git a/Makefile b/Makefile index d082a98077..13438848ed 100644 --- a/Makefile +++ b/Makefile @@ -50,15 +50,8 @@ hostenv: host ucidefaults ucidefaults: 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 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)" + build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua build/lucid.lua" runlua: hostenv build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua -i build/setup.lua" diff --git a/build/lucid.lua b/build/lucid.lua new file mode 100644 index 0000000000..71e4fd2588 --- /dev/null +++ b/build/lucid.lua @@ -0,0 +1,2 @@ +dofile "build/setup.lua" +require "luci.lucid".start() diff --git a/contrib/lar/Makefile b/contrib/lar/Makefile index cc328de6d4..5199546e70 100644 --- a/contrib/lar/Makefile +++ b/contrib/lar/Makefile @@ -5,6 +5,7 @@ LDFLAGS := OBJ = cli.o lar.o md5.o BIN = lar +compile: cli: $(OBJ) $(GCC) $(CFLAGS) -o $(BIN) $(OBJ) $(LDFLAGS)