qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 02:48:26 +02:00
Code

[package] uhttpd: fix Makefiles and linking of tls plugin

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28769 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2011-11-05 17:36:47 +00:00
parent 9938a761e9
commit 44c760170b
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/uhttpd/Makefile
View File

@ -70,11 +70,13 @@ TLS_LDFLAGS:=
ifneq ($(CONFIG_PACKAGE_uhttpd-mod-tls_cyassl),)
UHTTPD_TLS:=cyassl
TLS_CFLAGS:=-I$(STAGING_DIR)/usr/include/cyassl -DTLS_IS_CYASSL
TLS_LDFLAGS:=-lcyassl -lm
endif
ifneq ($(CONFIG_PACKAGE_uhttpd-mod-tls_openssl),)
UHTTPD_TLS:=openssl
TLS_CFLAGS:=-DTLS_IS_OPENSSL
TLS_LDFLAGS:=-lssl
endif
@ -90,11 +92,14 @@ endef
TARGET_CFLAGS += $(TLS_CFLAGS)
TARGET_LDFLAGS += $(TLS_LDFLAGS)
MAKE_VARS += \
FPIC="$(FPIC)" \
LUA_SUPPORT="$(if $(CONFIG_PACKAGE_uhttpd-mod-lua),1)" \
TLS_SUPPORT="$(if $(CONFIG_PACKAGE_uhttpd-mod-tls),1)" \
UHTTPD_TLS="$(UHTTPD_TLS)"
UHTTPD_TLS="$(UHTTPD_TLS)" \
TLS_CFLAGS="$(TLS_CFLAGS)" \
TLS_LDFLAGS="$(TLS_LDFLAGS)"
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)

12
package/uhttpd/src/Makefile
View File

@ -4,16 +4,16 @@ TLS_SUPPORT ?= 1
UHTTPD_TLS ?= cyassl
CFLAGS ?= -I./lua-5.1.4/src $(TLS_CFLAGS) -O0 -ggdb3
LDFLAGS ?= -L./lua-5.1.4/src $(TLS_LDFLAGS)
LDFLAGS ?= -L./lua-5.1.4/src
CFLAGS += -Wall --std=gnu99
ifeq ($(UHTTPD_TLS),openssl)
TLS_LDFLAGS := -L./openssl-0.9.8m -lssl
TLS_CFLAGS := -I./openssl-0.9.8m/include -DTLS_IS_OPENSSL
TLS_LDFLAGS ?= -L./openssl-0.9.8m -lssl
TLS_CFLAGS ?= -I./openssl-0.9.8m/include -DTLS_IS_OPENSSL
else
TLS_LDFLAGS := -L./cyassl-1.4.0/src/.libs -lcyassl
TLS_CFLAGS := -I./cyassl-1.4.0/include -DTLS_IS_CYASSL
TLS_LDFLAGS ?= -L./cyassl-1.4.0/src/.libs -lcyassl
TLS_CFLAGS ?= -I./cyassl-1.4.0/include -DTLS_IS_CYASSL
endif
OBJ := uhttpd.o uhttpd-file.o uhttpd-utils.o
@ -62,7 +62,7 @@ ifeq ($(TLS_SUPPORT),1)
$(TLSLIB): uhttpd-tls.c
$(CC) $(CFLAGS) $(LDFLAGS) $(FPIC) \
-shared \
-shared $(TLS_LDFLAGS) \
-o $(TLSLIB) uhttpd-tls.c
endif