summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--res/Makefile3
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 04ea7bc8e..b6a5bbf16 100644
--- a/Makefile
+++ b/Makefile
@@ -419,8 +419,6 @@ else
HAVEDOT=no
endif
-LIBS+=-lssl
-
INSTALL=install
CFLAGS+=-DT38_SUPPORT
diff --git a/res/Makefile b/res/Makefile
index 3b156f2e7..2759f4e49 100644
--- a/res/Makefile
+++ b/res/Makefile
@@ -24,6 +24,7 @@ endif
ifeq ($(NOCRYPTO),yes)
MODS:=$(filter-out res_crypto.so,$(MODS))
+ MODS:=$(filter-out res_osp.so,$(MODS))
endif
OSPLIB:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a)
@@ -96,7 +97,7 @@ res_odbc.so: res_odbc.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
res_osp.so: res_osp.o $(OSPLIB)
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(OSPLIB)
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(OSPLIB) $(CRYPTO_LIBS)
%.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}