X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=473d031fb0203eeaee2f056acbfe805154ce459f;hp=e2a74c0889690047124aaf26f24a7c4c0436e869;hb=505c3208c90d649cd2397a100c93925d480cce91;hpb=8e1207cfc2d9ae4a68894bc904b1ab52f15b9132

diff --git a/Makefile b/Makefile
index e2a74c088..473d031fb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,22 @@
-LUAC = luac
-LUAC_OPTIONS = -s
+include build/config.mk
 
-FILES = ffluci/config.lua
+MODULES = applications/* core modules/* themes/*
+LUA_TARGET = source
 
-CFILES = ffluci/util.lua ffluci/http.lua \
-ffluci/fs.lua ffluci/i18n.lua ffluci/model/uci.lua \
-ffluci/template.lua ffluci/cbi.lua ffluci/dispatcher.lua \
-ffluci/menu.lua ffluci/init.lua ffluci/sys.lua 
 
-DIRECTORIES = dist/ffluci/model dist/ffluci/controller dist/ffluci/i18n dist/ffluci/view
+.PHONY: all build clean host 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:
+	for i in $(MODULES); do make -C$$i $(LUA_TARGET); done
 
-all: compile
-
-dist-compile: compile dist
-dist-source: source dist
-
-examples-compile: compile examples
-examples-source: source examples
-
-
-dist:
-	cp src/ffluci/controller/* dist/ffluci/controller/ -R
-	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
+clean:
+	for i in $(MODULES); do make -C$$i clean; 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
+	mkdir -p host/ffluci
+	for i in $(MODULES); do cp $$i/dist$(LUCI_INSTALLDIR) host/ -R 2>/dev/null || true; done
 	
-clean:
-	rm dist -rf
+hostclean:
+	rm host -rf