domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uhttpd: fix Makefiles and linking of tls plugin

Browse Source 
SVN-Revision: 28769
This commit is contained in:
Jo-Philipp Wich
2011-11-05 17:36:47 +00:00
parent 248ab4ac2f
commit fcea88e3b5
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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