ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-13 04:57:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-2936 plan B for curl stuff

Browse Source
This commit is contained in:
Anthony Minessale committed 2011-05-13 13:17:54 -05:00
1 parent c196e2c109
commit acf3090adf
15 files changed
+134 -207
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile.am
+3 -13
View File
@@ -103,11 +103,6 @@ CORE_CFLAGS += -I$(switch_srcdir)/libs/speex/include -Ilibs/speex/include
CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include
CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -Ilibs/srtp/crypto/include
CORE_CFLAGS += -I$(switch_srcdir)/libs/spandsp/src -I$(switch_srcdir)/libs/tiff-3.8.2/libtiff
CORE_CFLAGS += $(LIBCURL_CPPFLAGS) $(openssl_CFLAGS)
if ENABLE_CORE_CURL
CORE_CFLAGS += -DCORE_USE_CURL
endif
CORE_LIBS = libs/apr-util/libaprutil-1.la libs/apr/libapr-1.la
CORE_LIBS += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la libs/speex/libspeex/libspeexdsp.la
@@ -118,7 +113,7 @@ endif
MOD_LINK = $(switch_srcdir)/libfreeswitch.la
CLEANFILES = src/include/switch_version.h src/include/switch_swigable_cpp.h
BUILT_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h $(LIBCURL_DEPS)
BUILT_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h
if HAVE_ODBC
CORE_CFLAGS += -DSWITCH_HAVE_ODBC $(ODBC_INC_FLAGS)
@@ -135,7 +130,7 @@ endif
lib_LTLIBRARIES = libfreeswitch.la
libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS)
libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_DEPLIBS)
libfreeswitch_la_LIBADD = $(CORE_LIBS) $(LIBCURL)
libfreeswitch_la_LIBADD = $(CORE_LIBS)
libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES)
if HAVE_ODBC
@@ -185,8 +180,7 @@ library_include_HEADERS = \
libs/libteletone/src/libteletone_generate.h \
libs/libteletone/src/libteletone.h \
src/include/switch_limit.h \
src/include/switch_odbc.h \
src/include/switch_curl.h
src/include/switch_odbc.h
nodist_libfreeswitch_la_SOURCES = \
src/include/switch_frame.h \
@@ -246,7 +240,6 @@ libfreeswitch_la_SOURCES = \
src/switch_pcm.c \
src/switch_profile.c \
src/switch_json.c \
src/switch_curl.c \
libs/stfu/stfu.c \
libs/libteletone/src/libteletone_detect.c \
libs/libteletone/src/libteletone_generate.c \
@@ -442,9 +435,6 @@ libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update
@cd libs/srtp && $(MAKE)
@$(TOUCH_TARGET)
libs/curl/lib/libcurl.la:
@cd $libs/curl && $(MAKE)
@$(TOUCH_TARGET)
##
## helper targets