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/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'package/uhttpd/Makefile') diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile index 66caaf1..14b1559 100644 --- a/package/uhttpd/Makefile +++ b/package/uhttpd/Makefile @@ -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) -- cgit v1.1