X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=8ac0ac664ad48c63df18044b081e194d068b9b43;hp=0aefd193c1ecaa209dfbffa63eea3b0d9defbe34;hb=e1d0ef5658c889440d41aef854bb77d4049fbe52;hpb=d79e1ec4c14f190e36b4b45151c08260d2ed5c75

diff --git a/Makefile b/Makefile
index 0aefd193c..8ac0ac664 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,56 @@
-LUAC = luac
-LUAC_OPTIONS = -s
+include build/config.mk
 
-FILES = 
+MODULES = applications/* libs/* modules/* themes/* i18n/* contrib/luaposix
+LUA_TARGET = source
 
-CFILES = ffluci/util.lua ffluci/http.lua ffluci/fs.lua \
-ffluci/sys.lua ffluci/model/uci.lua ffluci/model/ipkg.lua \
-ffluci/config.lua ffluci/i18n.lua ffluci/template.lua \
-ffluci/cbi.lua ffluci/dispatcher.lua ffluci/menu.lua ffluci/init.lua 
+OS:=$(shell uname)
+export OS
 
-DIRECTORIES = dist/ffluci/model/cbi dist/ffluci/model/menu dist/ffluci/controller dist/ffluci/i18n dist/ffluci/view
+.PHONY: all build gccbuild luabuild clean host gcchost luahost hostcopy hostclean
 
-INFILES = $(CFILES:%=src/%)
-OUTFILE = ffluci/init.lua
+all: build
 
-.PHONY: all dist-compile dist-source examples-compile examples-source dist examples compile source clean
+build: luabuild gccbuild
 
-all: compile
+gccbuild:
+	for i in $(MODULES); do make -C$$i compile; done	
 
-dist-compile: compile dist
-dist-source: source dist
+luabuild:
+	for i in $(MODULES); do make -C$$i lua$(LUA_TARGET); done
 
-dist:
-	cp src/ffluci/controller/* dist/ffluci/controller/ -R
-	cp src/ffluci/i18n/* dist/ffluci/i18n/
-	cp src/ffluci/view/* dist/ffluci/view/ -R
-	cp src/ffluci/model/cbi/* dist/ffluci/model/cbi/ -R
-	cp src/ffluci/model/menu/* dist/ffluci/model/menu/ -R
+clean:
+	for i in $(MODULES); do make -C$$i clean; done
 
-compile:
-	mkdir -p $(DIRECTORIES)
-	$(LUAC) $(LUAC_OPTIONS) -o dist/$(OUTFILE) $(INFILES)
-	for i in $(CFILES); do [ -f dist/$$i ] || ln -s `dirname $$i | cut -s -d / -f 2- | sed -e 's/[^/]*\/*/..\//g'``basename $(OUTFILE)` dist/$$i; done
-	for i in $(FILES); do cp src/$$i dist/$$i; done
 
-source:
-	mkdir -p $(DIRECTORIES)
-	for i in $(CFILES); do cp src/$$i dist/$$i; done
-	for i in $(FILES); do cp src/$$i dist/$$i; done
-	
-clean:
-	rm dist -rf
+host: build hostcopy
+
+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
+	rm -f host/luci
+	ln -s .$(LUCI_MODULEDIR) host/luci
+
+runboa: host
+	export LUA_PATH="`pwd`/host$(LUCI_MODULEDIR);;"
+	export LUA_CPATH="`pwd`/host$(LUCI_LIBRARYDIR);;"
+	libs/sgi-webuci/host/buildconfig.sh `pwd`/host  > host/etc/boa/boa.conf
+	./host/usr/bin/boa -c ./host/etc/boa -d
+
+runluci: luahost
+	export LUA_PATH="`pwd`/host$(LUCI_MODULEDIR);;"
+	export LUA_CPATH="`pwd`/host$(LUCI_LIBRARYDIR);;"
+	libs/httpd/host/runluci host$(HTDOCS)
+
+hostclean: clean
+	rm -rf host
+
+run:
+	#	make run is deprecated			#
+	#	Please use:				#
+	#						#
+	#	make runluci to use LuCI HTTPD		#
+	#	make runboa  to use Boa / Webuci	#