* Rewritten menu builder

[project/luci.git] / Makefile

diff --git a/Makefile b/Makefile
index 38b7981..0aefd19 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,31 @@
 LUAC = luac
 LUAC_OPTIONS = -s
 
-FILES = ffluci/config.lua
+FILES = 
 
-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
+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 dist/ffluci/controller/public dist/ffluci/controller/admin dist/ffluci/i18n dist/ffluci/view
+DIRECTORIES = dist/ffluci/model/cbi dist/ffluci/model/menu dist/ffluci/controller dist/ffluci/i18n dist/ffluci/view
 
 INFILES = $(CFILES:%=src/%)
 OUTFILE = ffluci/init.lua
 
+.PHONY: all dist-compile dist-source examples-compile examples-source dist examples compile source clean
+
 all: compile
 
-dist-compile: compile examples
-dist-source: source examples
+dist-compile: compile dist
+dist-source: source dist
 
-examples:
-       cp src/ffluci/controller/public/* dist/ffluci/controller/public/
-       cp src/ffluci/controller/admin/* dist/ffluci/controller/admin/
+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)
@@ -34,7 +38,5 @@ source:
        for i in $(CFILES); do cp src/$$i dist/$$i; done
        for i in $(FILES); do cp src/$$i dist/$$i; done
        
-
-.PHONY: clean
 clean:
        rm dist -rf