diff options
| author | Steven Barth <steven@midlink.org> | 2008-05-28 15:28:13 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-05-28 15:28:13 +0000 |
| commit | 4365fbe2a373b73af5578d0ed6eddfb2ba9901ef (patch) | |
| tree | cdc534c74a881b666012a92a645ff22c973a11a7 /build | |
| parent | 776f9957d0376670e9d3e43677dbe3ba19ded193 (diff) | |
Squashed commit of the following:
commit d45d1757d24d8214f730af1a3401dd2bef4a434f
Author: Steven <steven@cyrus.homeunix.org>
Date: Wed May 28 17:23:27 2008 +0200
* libs/core: Removed dummymode checks in sys
* libs/sgi-webuci: Fixes
commit b870e8d345bc8912fd8ab61d463b9d68b924a6f4
Author: Felix Fietkau <nbd@openwrt.org>
Date: Wed May 28 15:40:10 2008 +0200
fix path to theme
commit e3732926bd98db4cc38de6eb8018cd4e55176699
Author: Felix Fietkau <nbd@openwrt.org>
Date: Wed May 28 14:56:03 2008 +0200
set the proper path to the config in dummy mode
commit a75aecf46f037c98bd6e49b9e48adb735d76d150
Author: Felix Fietkau <nbd@openwrt.org>
Date: Wed May 28 14:50:42 2008 +0200
add some dummy mode support
commit 12bb39ef606bca6b403cc982213a6597b76dc1b3
Author: Felix Fietkau <nbd@openwrt.org>
Date: Wed May 28 14:41:56 2008 +0200
normalize paths
commit 7aaad1103fd2bdc75aca158baa6ef191f9a961c6
Author: Felix Fietkau <nbd@openwrt.org>
Date: Wed May 28 14:27:26 2008 +0200
add missing require statement
commit 5766274bd2511b00c42b474aeeeb3efaca6ded9b
Author: Felix Fietkau <nbd@openwrt.org>
Date: Wed May 28 14:19:54 2008 +0200
add optional luaposix package (patched for darwin support)
commit 9e257a76d03722fc0ce8312aa9952641b21424bd
Author: Felix Fietkau <nbd@openwrt.org>
Date: Tue May 27 20:21:59 2008 +0200
add missing files, more integration for the boa plugin, fix path to lua modules
commit dacc1a98ec946975fcb19f87076dfa7db865fca6
Author: Felix Fietkau <nbd@openwrt.org>
Date: Tue May 27 19:42:37 2008 +0200
use "compile" instead of "source" and rename the old version of compile to "compile-all"
commit eb14777c4fee1eb5740aba1e5603e481320da7b1
Author: Felix Fietkau <nbd@openwrt.org>
Date: Tue May 27 19:41:59 2008 +0200
more boa integration
commit df0afb965bf0a987b653e9d0acadf3151179a596
Author: Felix Fietkau <nbd@openwrt.org>
Date: Tue May 27 18:33:42 2008 +0200
build boa and the webuci.so plugin along with sgi-webuci
commit 878161dabf32066631103d199e2cbaf3f5a7fb07
Author: Felix Fietkau <nbd@openwrt.org>
Date: Tue May 27 18:03:16 2008 +0200
add .gitignore
Diffstat (limited to 'build')
| -rw-r--r-- | build/config.mk | 27 | ||||
| -rw-r--r-- | build/module.mk | 3 |
2 files changed, 28 insertions, 2 deletions
diff --git a/build/config.mk b/build/config.mk index 66585289b..9db99cd6b 100644 --- a/build/config.mk +++ b/build/config.mk @@ -1,3 +1,28 @@ +OS ?= $(shell uname) + LUAC = luac LUAC_OPTIONS = -s -LUCI_INSTALLDIR = /usr/lib/lua/luci
\ No newline at end of file +LUCI_INSTALLDIR = /usr/lib/lua/luci +LUA_SHLIBS = $(shell pkg-config --silence-errors --libs lua5.1) +LUA_LIBS = $(if $(LUA_SHLIBS),$(LUA_SHLIBS),$(firstword $(wildcard /usr/lib/liblua.a /usr/local/lib/liblua.a /opt/local/lib/liblua.a))) +LUA_CFLAGS = $(shell pkg-config --silence-errors --cflags lua5.1) +ifeq ($(LUA_LIBS),) + $(error LUA installation not found) +endif + +CC = gcc +AR = ar +RANLIB = ranlib +CFLAGS = -O2 +FPIC = -fPIC +EXTRA_CFLAGS = --std=gnu99 +WFLAGS = -Wall -Werror -pedantic +CPPFLAGS = +COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS) +ifeq ($(OS),Darwin) + SHLIB_FLAGS = -bundle -undefined dynamic_lookup +else + SHLIB_FLAGS = -shared +endif +LINK = $(CC) + diff --git a/build/module.mk b/build/module.mk index 287314696..923caad70 100644 --- a/build/module.mk +++ b/build/module.mk @@ -1,7 +1,8 @@ .PHONY: all compile compile-module source source-module clean clean-module all: compile -compile: compile-module +compile: source-module +compile-all: compile-module clean: clean-module source: source-module |