diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-11-05 17:36:47 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-11-05 17:36:47 +0000 |
| commit | fcea88e3b5e058da6260d26764d604097cb763a4 (patch) | |
| tree | b9550b6a60d573a83d27222d265616eadcdc6b84 /package/uhttpd/src/Makefile | |
| parent | 248ab4ac2ff88da00903990a537927f7c85b5c33 (diff) | |
| download | upstream-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/src/Makefile')
| -rw-r--r-- | package/uhttpd/src/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
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 |