aboutsummaryrefslogtreecommitdiffstats
path: root/package/uhttpd/Makefile
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-11-05 17:36:47 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-11-05 17:36:47 +0000
commitfcea88e3b5e058da6260d26764d604097cb763a4 (patch)
treeb9550b6a60d573a83d27222d265616eadcdc6b84 /package/uhttpd/Makefile
parent248ab4ac2ff88da00903990a537927f7c85b5c33 (diff)
downloadupstream-fcea88e3b5e058da6260d26764d604097cb763a4.tar.gz
upstream-fcea88e3b5e058da6260d26764d604097cb763a4.tar.bz2
upstream-fcea88e3b5e058da6260d26764d604097cb763a4.zip
uhttpd: fix Makefiles and linking of tls plugin
SVN-Revision: 28769
Diffstat (limited to 'package/uhttpd/Makefile')
-rw-r--r--package/uhttpd/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index 66caaf14ee..14b1559c31 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)