diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-05 17:36:47 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-05 17:36:47 +0000 |
| commit | 0e402df056a05d22fca24ba0535363b3dedf417d (patch) | |
| tree | 3f42827f5a387175f44d41a5e87b8cacd8700a2a | |
| parent | f82294618678cf43876d34cb3f092ca2600fcb18 (diff) | |
| download | uhttpd-0e402df056a05d22fca24ba0535363b3dedf417d.tar.gz | |
[package] uhttpd: fix Makefiles and linking of tls plugin
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/package/uhttpd/src@28769 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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 |