start building teletone as part of the core

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4754 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Makefile.am b/Makefile.am
index e1a5af9de7cb279ea83ef746954a67f5250f053e..44709021c8a4bd7df1ed159d19addcb9539cc763 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,10 @@ src/switch_rtp.c\
 src/switch_ivr.c \
 src/switch_stun.c\
 src/switch_log.c\
-src/switch_xml.c
+src/switch_xml.c\
+libs/libteletone/src/libteletone_detect.c\
+libs/libteletone/src/libteletone_generate.c
+
 
 library_includedir      = $(PREFIX)/include
 
@@ -66,7 +69,12 @@ src/include/switch_utils.h\
 src/include/switch_rtp.h\
 src/include/switch_stun.h\
 src/include/switch_log.h\
-src/include/switch_xml.h
+src/include/switch_xml.h\
+libs/libteletone/src/libteletone_detect.h\
+libs/libteletone/src/libteletone_generate.h\
+libs/libteletone/src/libteletone.h
+
+
 
 CORE_CFLAGS     = `$(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags --includes`
 CORE_CFLAGS    += `$(switch_srcdir)/libs/apr-util/apu-1-config --includes`
@@ -80,7 +88,6 @@ CORE_CFLAGS    += -I$(switch_srcdir)/libs/libteletone/src
 CORE_LIBS      = libs/apr/libapr-1.la libs/apr-util/libaprutil-1.la
 CORE_LIBS     += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la
 CORE_LIBS     += libs/srtp/libsrtp.la libs/libresample/libresample.la
-CORE_LIBS     += libs/libteletone/libteletone.la
 
 lib_LTLIBRARIES                  = libfreeswitch.la
 libfreeswitch_la_CFLAGS   = $(CORE_CFLAGS) $(AM_CFLAGS)
@@ -166,10 +173,6 @@ libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update
        @cd libs/srtp && $(MAKE)
        @$(TOUCH_TARGET)
 
-libs/libteletone/libteletone.la: libs/libteletone libs/libteletone/.update
-       @cd libs/libteletone && $(MAKE)
-       @$(TOUCH_TARGET)
-
 libs/libresample/libresample.la: libs/libresample libs/libresample/.update
        @cd libs/libresample && $(MAKE)
        @$(TOUCH_TARGET)

diff --git a/configure.in b/configure.in
index 6692ea1ed927292126cda24b535697e27dda1a3e..8107ae4683b61020f6fd759f769cd85a50d9b8fd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -313,7 +313,6 @@ AM_CONDITIONAL(IS64BITLINUX, [test `uname -m` = x86_64])
 AC_CONFIG_SUBDIRS(libs/srtp)
 AC_CONFIG_SUBDIRS(libs/sqlite)
 AC_CONFIG_SUBDIRS(libs/libresample)
-AC_CONFIG_SUBDIRS(libs/libteletone)
 AC_CONFIG_SUBDIRS(libs/pcre)
 AC_CONFIG_SUBDIRS(libs/apr)
 AC_CONFIG_SUBDIRS(libs/apr-util)

diff --git a/src/mod/endpoints/mod_wanpipe/Makefile b/src/mod/endpoints/mod_wanpipe/Makefile
index e46772979d5e40a9224180647eb1db77282be1f4..e3fc2cc14ad163b9cd97f1a48f242103365c8063 100644 (file)
--- a/src/mod/endpoints/mod_wanpipe/Makefile
+++ b/src/mod/endpoints/mod_wanpipe/Makefile
@@ -11,14 +11,10 @@ WANPIPE_INCLUDE=$(WANPIPE_DIR)/patches/kdrivers/include
 WANPIPE_KO=$(WANPIPE_DIR)/patches/kdrivers/src/net/wanpipe.ko
 WANPIPE_INSTALLED_KO=$(shell echo "/lib/modules/`uname -r`/kernel/drivers/net/wan/wanpipe.ko")
 LIBSANGOMA_DIR=$(WANPIPE_DIR)/api/libsangoma
-TELETONE_DIR=$(BASE)/libs/libteletone
-TELETONE_LA=$(TELETONE_DIR)/libteletone.la
 LOCAL_CFLAGS  =-w -I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include 
 LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API
-LOCAL_LIBADD = $(TELETONE_LA)
 LOCAL_OBJS = ss7boost_client.o $(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o $(LIBSANGOMA_DIR)/libsangoma.o $(LIBSANGOMA_DIR)/sangoma_pri.o 
 
-
 include $(BASE)/build/modmake.rules 
 
 $(LIBPRI_DIR):
@@ -31,10 +27,6 @@ $(WANPIPE_KO): $(WANPIPE_DIR)
        cd $(WANPIPE_DIR) && $(MAKE)
        @$(TOUCH_TARGET)
 
-$(TELETONE_LA):
-       cd $(TELETONE_DIR) && $(MAKE)
-       @$(TOUCH_TARGET)
-
 $(WANPIPE_INSTALLED_KO): $(WANPIPE_KO)
        cd $(WANPIPE_DIR) && $(MAKE) install
 

diff --git a/src/mod/languages/mod_spidermonkey_teletone/Makefile b/src/mod/languages/mod_spidermonkey_teletone/Makefile
index 3e2030ecbb64a6b93c029a758cd080acbe428d29..f781c1c472fc6ef0fb6eb320194401abef71b7be 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_teletone/Makefile
+++ b/src/mod/languages/mod_spidermonkey_teletone/Makefile
@@ -1,5 +1,4 @@
 switch_srcdir=../../../..
 LOCAL_CFLAGS=-I$(switch_srcdir)/libs/libteletone/src
-LOCAL_LIBADD=$(switch_srcdir)/libs/libteletone/libteletone.la
 include ../mod_spidermonkey/sm.mak