X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=Makefile;h=c78f5a8108ae8c9fc36ef26917761a5f79133502;hb=e1c469e6341010a0831f389e609648978026590d;hp=2d732ff0833a4349fcf4a3bab79d5ecc3295c086;hpb=93a98dd13be5127871ff78d85e8199f2df77e9c2;p=project%2Fluci.git

diff --git a/Makefile b/Makefile
index 2d732ff08..c78f5a810 100644
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,42 @@
-LUAC = luac
-LUAC_OPTIONS = -s
+include build/config.mk
 
-FILES = ffluci/config.lua
+MODULES = applications/* libs/* modules/* themes/* i18n/*
+LUA_TARGET = source
 
-CFILES = ffluci/util.lua ffluci/http.lua \
-ffluci/fs.lua ffluci/i18n.lua ffluci/model/uci.lua \
-ffluci/template.lua ffluci/dispatcher.lua ffluci/menu.lua ffluci/init.lua
+### luaposix merge (temporary) ###
+OS:=$(shell uname)
+export OS
+ifeq ($(OS),Darwin)
+  MODULES += contrib/luaposix
+endif
 
-DIRECTORIES = dist/ffluci/model dist/ffluci/controller/public dist/ffluci/controller/admin dist/ffluci/i18n dist/ffluci/view
 
-INFILES = $(CFILES:%=src/%)
-OUTFILE = ffluci/init.lua
+.PHONY: all build gccbuild luabuild clean host gcchost luahost hostcopy hostclean
 
-.PHONY: all dist-compile dist-source examples-compile examples-source dist examples compile source clean
+all: build
 
-all: compile
+build: luabuild gccbuild
 
-dist-compile: compile dist
-dist-source: source dist
+gccbuild:
+	for i in $(MODULES); do make -C$$i compile; done	
 
-examples-compile: compile examples
-examples-source: source examples
+luabuild:
+	for i in $(MODULES); do make -C$$i lua$(LUA_TARGET); done
 
+clean:
+	for i in $(MODULES); do make -C$$i clean; done
 
-dist:
-	cp src/ffluci/controller/public/* dist/ffluci/controller/public/
-	cp src/ffluci/controller/admin/* dist/ffluci/controller/admin/
-	cp src/ffluci/i18n/* dist/ffluci/i18n/
-	cp src/ffluci/view/* dist/ffluci/view/ -R
-	
-examples:
-	cp examples/* dist/ -R
-
-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
+
+host: build hostcopy
+
+gcchost: gccbuild hostcopy
+
+luahost: luabuild hostcopy
+
+hostcopy: 
+	mkdir -p host
+	for i in $(MODULES); do cp $$i/dist/* host/ -R 2>/dev/null || true; done
+	ln -sf .$(LUCI_INSTALLDIR) host/luci
 	
-clean:
-	rm dist -rf
+hostclean: clean
+	rm -rf host