kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 08:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove -lssl for asterisk, and add it for res_osp (issue #6496, different patch)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10323 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-02-16 20:38:21 +00:00
parent 39fbbe1c25
commit 938f7ddc0f
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -419,8 +419,6 @@ else
HAVEDOT=no HAVEDOT=no
endif endif
LIBS+=-lssl
INSTALL=install INSTALL=install
CFLAGS+=-DT38_SUPPORT CFLAGS+=-DT38_SUPPORT

3
res/Makefile
View File

@@ -24,6 +24,7 @@ endif
ifeq ($(NOCRYPTO),yes) ifeq ($(NOCRYPTO),yes)
MODS:=$(filter-out res_crypto.so,$(MODS)) MODS:=$(filter-out res_crypto.so,$(MODS))
MODS:=$(filter-out res_osp.so,$(MODS))
endif endif
OSPLIB:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a) 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 $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
res_osp.so: res_osp.o $(OSPLIB) res_osp.so: res_osp.o $(OSPLIB)
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(OSPLIB) $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(OSPLIB) $(CRYPTO_LIBS)
%.so : %.o %.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}