projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Fixed OpenWRT Makefile
[project/luci.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
473d031
..
c78f5a8
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,22
+1,42
@@
include build/config.mk
include build/config.mk
-MODULES = applications/*
core modules/* themes
/*
+MODULES = applications/*
libs/* modules/* themes/* i18n
/*
LUA_TARGET = source
LUA_TARGET = source
+### luaposix merge (temporary) ###
+OS:=$(shell uname)
+export OS
+ifeq ($(OS),Darwin)
+ MODULES += contrib/luaposix
+endif
-.PHONY: all build clean host hostclean
+
+.PHONY: all build gccbuild luabuild clean host gcchost luahost hostcopy hostclean
all: build
all: build
-build:
- for i in $(MODULES); do make -C$$i $(LUA_TARGET); done
+build: luabuild gccbuild
+
+gccbuild:
+ for i in $(MODULES); do make -C$$i compile; done
+
+luabuild:
+ for i in $(MODULES); do make -C$$i lua$(LUA_TARGET); done
clean:
for i in $(MODULES); do make -C$$i clean; done
clean:
for i in $(MODULES); do make -C$$i clean; done
-host: build
- mkdir -p host/ffluci
- for i in $(MODULES); do cp $$i/dist$(LUCI_INSTALLDIR) host/ -R 2>/dev/null || true; 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
-hostclean:
- rm
host -rf
+hostclean:
clean
+ rm
-rf host