From fcea88e3b5e058da6260d26764d604097cb763a4 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 5 Nov 2011 17:36:47 +0000 Subject: uhttpd: fix Makefiles and linking of tls plugin SVN-Revision: 28769 --- package/uhttpd/src/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'package/uhttpd/src/Makefile') diff --git a/package/uhttpd/src/Makefile b/package/uhttpd/src/Makefile index 9c3cc7f02c..5e98ab8750 100644 --- a/package/uhttpd/src/Makefile +++ b/package/uhttpd/src/Makefile @@ -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 -- cgit v1.2.3