X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=4b3fb64f4b7bc8712f650be789212fa83a4b9055;hb=3f09d369d679d3e4413849cf67f757c647a66965;hp=57b3efd629fe6f73fc2e281ca4aab581c3a5d485;hpb=9ba8d2aea994c832316f111354668f52de831043;p=oweals%2Fluci.git

diff --git a/Makefile b/Makefile
index 57b3efd62..4b3fb64f4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,23 @@
-LUAC = luac
-LUAC_OPTIONS = -s
+include build/config.mk
 
-FILES = ffluci/debug.lua
+MODULES = applications/* libs/* modules/* themes/* i18n/*
+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 
 
-DIRECTORIES = dist/ffluci/model/cbi dist/ffluci/model/menu 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
-
-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
-
-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
+	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 host -rf