diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-16 20:38:21 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-16 20:38:21 +0000 |
commit | 683ec6ed21d908966ea38db70f5fd42eb742590d (patch) | |
tree | bc4e064c9a03e359ff52eeb735e1f708b02814e4 /res | |
parent | f921b9c2c38c31f40052d6ab6f55d41c47c8f141 (diff) |
remove -lssl for asterisk, and add it for res_osp (issue #6496, different patch)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@10323 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
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} |