diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-18 14:18:31 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-18 14:18:31 +0000 |
| commit | 6576d110d2ce6e01dce282cc64b2aea6521814a9 (patch) | |
| tree | 628f71deac8a5f6afa3413da4928f1f231fbabe6 /package/uhttpd/src/Makefile | |
| parent | 75d2ba7a5cc6c4aa8b4b67d56f9cd650d0387be2 (diff) | |
| download | upstream-6576d110d2ce6e01dce282cc64b2aea6521814a9.tar.gz upstream-6576d110d2ce6e01dce282cc64b2aea6521814a9.tar.bz2 upstream-6576d110d2ce6e01dce282cc64b2aea6521814a9.zip | |
uhttpd: support building against openssl instead of cyassl, minor cleanups (#7827)
SVN-Revision: 27686
Diffstat (limited to 'package/uhttpd/src/Makefile')
| -rw-r--r-- | package/uhttpd/src/Makefile | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/package/uhttpd/src/Makefile b/package/uhttpd/src/Makefile index 6dcc3555f1..e18833e8f3 100644 --- a/package/uhttpd/src/Makefile +++ b/package/uhttpd/src/Makefile @@ -1,17 +1,28 @@ CGI_SUPPORT ?= 1 LUA_SUPPORT ?= 1 TLS_SUPPORT ?= 1 +UHTTPD_TLS ?= cyassl -CFLAGS ?= -I./lua-5.1.4/src -I./cyassl-1.4.0/include -O0 -ggdb3 -LDFLAGS ?= -L./lua-5.1.4/src -L./cyassl-1.4.0/src/.libs +CFLAGS ?= -I./lua-5.1.4/src -I$(TLS_INCLUDE_DIR) -O0 -ggdb3 +LDFLAGS ?= -L./lua-5.1.4/src -L$(TLS_LIB_DIR) CFLAGS += -Wall --std=gnu99 -OBJ = uhttpd.o uhttpd-file.o uhttpd-utils.o -LIB = -Wl,--export-dynamic -lcrypt -ldl +ifeq ($(UHTTPD_TLS),openssl) + TLS_LDFLAGS := -lssl + TLS_INCLUDE_DIR := ./openssl-0.9.8m/include + TLS_LIB_DIR := ./openssl-0.9.8m +else + TLS_LDFLAGS := -lcyassl + TLS_INCLUDE_DIR := ./cyassl-1.4.0/include + TLS_LIB_DIR := ./cyassl-1.4.0/src/.libs +endif + +OBJ := uhttpd.o uhttpd-file.o uhttpd-utils.o +LIB := -Wl,--export-dynamic -lcrypt -ldl -TLSLIB = -LUALIB = +TLSLIB := +LUALIB := HAVE_SHADOW=$(shell echo 'int main(void){ return !getspnam("root"); }' | \ $(CC) -include shadow.h -xc -o/dev/null - 2>/dev/null && echo yes) @@ -29,7 +40,7 @@ endif ifeq ($(LUA_SUPPORT),1) CFLAGS += -DHAVE_LUA - LUALIB = uhttpd_lua.so + LUALIB := uhttpd_lua.so $(LUALIB): uhttpd-lua.c $(CC) $(CFLAGS) $(LDFLAGS) $(FPIC) \ @@ -39,11 +50,11 @@ endif ifeq ($(TLS_SUPPORT),1) CFLAGS += -DHAVE_TLS - TLSLIB = uhttpd_tls.so + TLSLIB := uhttpd_tls.so $(TLSLIB): uhttpd-tls.c $(CC) $(CFLAGS) $(LDFLAGS) $(FPIC) \ - -shared -lcyassl \ + -shared $(TLS_LDFLAGS) \ -o $(TLSLIB) uhttpd-tls.c endif @@ -55,4 +66,3 @@ compile: $(OBJ) $(TLSLIB) $(LUALIB) clean: rm -f *.o *.so uhttpd - |