Adapt the Makefiles that don't use Makefile.openssl

modules/cachedb_mongodb/Makefile

@@ -8,7 +8,6 @@ auto_gen=
 NAME=cachedb_mongodb.so
 
 include ../../lib/json/Makefile.json
-
 ifeq ($(CROSS_COMPILE),)
 MONGOC_BUILDER = $(shell \
 	if pkg-config --exists libmongoc-1.0; then \
@@ -17,8 +16,11 @@ MONGOC_BUILDER = $(shell \
 endif
 
 ifeq ($(MONGOC_BUILDER),)
+
+include ../../Makefile.openssl
+
 	DEFS += -I$(SYSBASE)/include/libmongoc-1.0 -I$(SYSBASE)/include/libbson-1.0
-	LIBS += -L$(LOCALBASE)/lib -lssl -lcrypto -lrt -lmongoc-1.0 -lbson-1.0
+	LIBS += -L$(LOCALBASE)/lib -lrt -lmongoc-1.0 -lbson-1.0
 	LIBS += -dl -Bsymbolic
 else
 	DEFS += $(shell $(MONGOC_BUILDER) --cflags)

modules/cachedb_redis/Makefile

@@ -12,8 +12,11 @@ NAME=cachedb_redis.so
 HAVE_REDIS_SSL=$(shell if [ -n "`ldconfig -p | grep hiredis_ssl`" ]; \
 	then echo "HAVE_REDIS_SSL"; fi)
 ifeq ($(HAVE_REDIS_SSL), HAVE_REDIS_SSL)
-	LIBS+=-lhiredis_ssl -lssl -lcrypto
-	DEFS+= -DHAVE_REDIS_SSL
+
+include ../../Makefile.openssl
+
+	LIBS += -lhiredis_ssl
+	DEFS += -DHAVE_REDIS_SSL
 endif
 
 ifeq ($(CROSS_COMPILE),)

modules/stir_shaken/Makefile

@@ -2,25 +2,11 @@
 # WARNING: do not run this directly, it should be run by the master Makefile
 
 include ../../Makefile.defs
-auto_gen=
-NAME=stir_shaken.so
 
-ifeq ($(CROSS_COMPILE),)
-SSL_BUILDER=$(shell \
-	if pkg-config --exists libcrypto; then \
-		echo 'pkg-config libcrypto'; \
-	fi)
-endif
+USE_ONLY_CRYPTO=true
+include ../../Makefile.openssl
 
-ifneq ($(SSL_BUILDER),)
-	DEFS += $(shell $(SSL_BUILDER) --cflags)
-	LIBS += $(shell $(SSL_BUILDER) --libs)
-else
-	DEFS += -I$(LOCALBASE)/ssl/include \
-			-I$(LOCALBASE)/include
-	LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \
-			-L$(LOCALBASE)/lib64 -L$(LOCALBASE)/ssl/lib64 \
-			-lcrypto
-endif
+auto_gen=
+NAME=stir_shaken.so
 
 include ../../Makefile.modules