From 5ac03256db0fe4ca7e3ad1117d096c3a76368b76 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Fri, 9 Jan 2015 09:46:07 +0100
Subject: backported CyaSSL/OpenSSL support for internal webserver instead of
 MatrixSSL

---
 release/src/router/mssl/Makefile | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'release/src/router/mssl/Makefile')

diff --git a/release/src/router/mssl/Makefile b/release/src/router/mssl/Makefile
index 70e6622c..d291edf2 100644
--- a/release/src/router/mssl/Makefile
+++ b/release/src/router/mssl/Makefile
@@ -1,17 +1,28 @@
 include ../common.mak
 
-CFLAGS	= -O2 -Wall
-CFLAGS	+= -I$(SRCBASE)/include -I$(TOP)/shared
+CFLAGS	= -Os -Wall $(EXTRACFLAGS) -fPIC
+LIBS =
 LDFLAGS	=
 
+ifeq ($(FULL_OPENSSL),y)
+CFLAGS	+= -I$(TOP)/openssl/include -DUSE_OPENSSL
+LIBS += -L$(TOP)/openssl -lssl -lcrypto
+else
+CFLAGS	+= -I$(TOP)/cyassl/include -I$(TOP)/cyassl/ctaocrypt/include
+LIBS += $(TOP)/cyassl/src/.libs/libcyassl.a
+endif
+
+LIBS += -lpthread
+OBJ = mssl.o
+
 all: libmssl.so libmssl.a
 
-libmssl.so: mssl.o
-	$(CC) -shared -o $@ $^ ../matrixssl/src/libmatrixsslstatic.a -L../shared -lshared
+libmssl.so: $(OBJ)
+	$(CC) -shared -o $@ $^ $(LIBS)
 	$(STRIP) $@
 	$(CPTMP)
 
-libmssl.a: mssl.o
+libmssl.a: $(OBJ)
 	rm -f $@
 	$(AR) cruv $@ $^
 
@@ -20,7 +31,7 @@ clean:
 
 install: all
 	@echo " [mssl] Installing..."
-	install -D -m 0500 libmssl.so $(INSTALLDIR)/usr/lib/libmssl.so
+	install -D libmssl.so $(INSTALLDIR)/usr/lib/libmssl.so
 	$(STRIP) $(INSTALLDIR)/usr/lib/libmssl.so
 
 %.o: %.c .%.depend
-- 
cgit v1.2.3-54-g00ecf