Skip to content
Snippets Groups Projects
Commit 43a38263 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'stable' into sip_dev 

Conflicts:

	.gitignore
	configure.ac
	src/Makefile.am
parents c2c032f6 1b59c10a
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 262 additions and 2278 deletions
.gitignore
+ 2
− 1
View file @ 43a38263
...@@ -16,6 +16,8 @@ Makefile.in ...@@ -16,6 +16,8 @@ Makefile.in
# Binary translation files # Binary translation files
*.mo *.mo
libtool libtool
# The test binary
*Tester
# Ignore rendered docs # Ignore rendered docs
doc/doxygen/core-doc doc/doxygen/core-doc
...@@ -53,7 +55,6 @@ doc/*.html ...@@ -53,7 +55,6 @@ doc/*.html
/libs/dbus-c++/autom4te* /libs/dbus-c++/autom4te*
/libs/dbus-c++/config.log /libs/dbus-c++/config.log
/libs/dbus-c++/config.status /libs/dbus-c++/config.status
/libs/dbus-c++/config.status
/libs/dbus-c++/configure /libs/dbus-c++/configure
/libs/dbus-c++/tools/dbus-c++xx-* /libs/dbus-c++/tools/dbus-c++xx-*
/libs/dbus-c++/tools/dbusxx-* /libs/dbus-c++/tools/dbusxx-*
......
Makefile.am
+ 8
− 2
View file @ 43a38263
# Makefile.am # Makefile.am
unittest:
@(cd test; make)
@echo ""
@echo "NOTICE: Unitary tests successfully build"
@echo "Go in the test directory to run them"
@echo ""
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libs src ringtones po SUBDIRS = libs src ringtones po
EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo
configure.ac
+ 47
− 22
View file @ 43a38263
...@@ -39,6 +39,10 @@ AC_CONFIG_FILES([src/Makefile \ ...@@ -39,6 +39,10 @@ AC_CONFIG_FILES([src/Makefile \
src/dbus/Makefile \ src/dbus/Makefile \
src/zeroconf/Makefile]) src/zeroconf/Makefile])
dnl Unitary test section
AC_CONFIG_FILES([test/Makefile])
AC_CONFIG_FILES([po/Makefile \ AC_CONFIG_FILES([po/Makefile \
ringtones/Makefile]) ringtones/Makefile])
...@@ -109,7 +113,9 @@ AC_HEADER_TIME ...@@ -109,7 +113,9 @@ AC_HEADER_TIME
AC_C_VOLATILE AC_C_VOLATILE
AC_CHECK_TYPES([ptrdiff_t]) AC_CHECK_TYPES([ptrdiff_t])
dnl Check for library functions dnl ********************************
dnl Check for needed functions
dnl ********************************
AC_FUNC_CHOWN AC_FUNC_CHOWN
AC_FUNC_ERROR_AT_LINE AC_FUNC_ERROR_AT_LINE
AC_FUNC_FORK AC_FUNC_FORK
...@@ -126,46 +132,65 @@ AC_CHECK_FUNCS([bzero floor gethostbyname gethrtime gettimeofday \ ...@@ -126,46 +132,65 @@ AC_CHECK_FUNCS([bzero floor gethostbyname gethrtime gettimeofday \
inet_ntoa memset mkdir pathconf pow regcomp select setlocale socket \ inet_ntoa memset mkdir pathconf pow regcomp select setlocale socket \
strchr strdup strerror strrchr strstr strtol utime]) strchr strdup strerror strrchr strstr strtol utime])
dnl *****************************************
dnl Check for header files
dnl *****************************************
dnl Check for exosip2
LP_CHECK_EXOSIP2
SFLPHONE_LIBS="$SFLPHONE_LIBS" SFLPHONE_LIBS="$SFLPHONE_LIBS"
dnl Check for GNU ccRTP dnl Check for GNU ccRTP
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
#Trying to set PJSIP using pkg-config #Trying to set PJSIP using pkg-config
PKG_CHECK_MODULES(PJSIP, libpj, have_libpj=true, have_libpj=false) PKG_CHECK_MODULES(SIP, libpj, have_libpj=true, have_libpj=false)
if test "x${have_libpj}" = "xfalse" ; then if test "x${have_libpj}" = "xfalse" ; then
AC_MSG_ERROR([PJSIP not found. http://www.pjsip.org/download.htm]) AC_MSG_ERROR([PJSIP not found. http://www.pjsip.org/download.htm])
fi fi
AC_SUBST(SIP_CFLAGS)
dnl Check for alsa development package - name: libasound2-dev
LIBASOUND2_MIN_VERSION=1.0 LIBASOUND2_MIN_VERSION=1.0
PKG_CHECK_MODULES(alsa, alsa >= ${LIBASOUND2_MIN_VERSION}) PKG_CHECK_MODULES(ALSA, alsa >= ${LIBASOUND2_MIN_VERSION})
SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $libasound2_CFLAGS" AC_SUBST(ALSA_CFLAGS)
SFLPHONE_LIBS="$SFLPHONE_LIBS $libasound2_LIBS" AC_SUBST(ALSA_LIBS)
LIBSAMPLERATE_MIN_VERSION=0.1.1 dnl Check for pulseaudio development package - name: libpulse-dev
PKG_CHECK_MODULES(samplerate, samplerate >= ${LIBSAMPLERATE_MIN_VERSION}) LIBPULSE_MIN_VERSION=0.9.6
SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $samplerate_CFLAGS" PKG_CHECK_MODULES(PULSEAUDIO, libpulse >= ${LIBPULSE_MIN_VERSION})
SFLPHONE_LIBS="$SFLPHONE_LIBS $samplerate_LIBS" AC_SUBST(PULSEAUDIO_LIBS)
AC_SUBST(PULSEAUDIO_CFLAGS)
dnl Check for the samplerate development package - name: libsamplerate0-dev
LIBSAMPLERATE_MIN_VERSION=0.1.2
PKG_CHECK_MODULES(SAMPLERATE, samplerate >= ${LIBSAMPLERATE_MIN_VERSION})
AC_SUBST(SAMPLERATE_LIBS)
AC_SUBST(SAMPLERATE_CFLAGS)
LIBCCGNU2_MIN_VERSION=1.3.1 LIBCCGNU2_MIN_VERSION=1.3.1
PKG_CHECK_MODULES(libccgnu2, libccgnu2 >= ${LIBCCGNU2_MIN_VERSION}) PKG_CHECK_MODULES(CCGNU2, libccgnu2 >= ${LIBCCGNU2_MIN_VERSION})
SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $libccgnu2_CFLAGS" AC_SUBST(CCGNU2_LIBS)
SFLPHONE_LIBS="$SFLPHONE_LIBS $libccgnu2_LIBS" AC_SUBST(CCGNU2_FLAGS)
LIBCCEXT2_MIN_VERSION=1.3.1 LIBCCEXT2_MIN_VERSION=1.3.1
PKG_CHECK_MODULES(libccext2, libccext2 >= ${LIBCCEXT2_MIN_VERSION}) PKG_CHECK_MODULES(CCEXT2, libccext2 >= ${LIBCCEXT2_MIN_VERSION})
SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $libccext2_CFLAGS" AC_SUBST(CCEXT2_LIBS)
SFLPHONE_LIBS="$SFLPHONE_LIBS $libccext2_LIBS" AC_SUBST(CCEXT2_CFLAGS)
LIBCCRT_MIN_VERSION=1.3.0 LIBCCRT_MIN_VERSION=1.3.0
PKG_CHECK_MODULES(libccrtp1, libccrtp1 >= ${LIBCCRT_MIN_VERSION}) PKG_CHECK_MODULES(CCRTP, libccrtp1 >= ${LIBCCRT_MIN_VERSION})
SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $libccrtp1_CFLAGS" AC_SUBST(CCRTP_LIBS)
SFLPHONE_LIBS="$SFLPHONE_LIBS $libccrtp1_LIBS" AC_SUBST(CCRTP_CFLAGS)
LIBDBUSCPP_MIN_VERSION=0.5 LIBDBUSCPP_MIN_VERSION=0.5
PKG_CHECK_MODULES(libdbuscpp, dbus-c++-1 >= ${LIBDBUSCPP_MIN_VERSION}) PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1 >= ${LIBDBUSCPP_MIN_VERSION})
SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $libdbuscpp_CFLAGS" AC_SUBST(DBUSCPP_LIBS)
SFLPHONE_LIBS="$SFLPHONE_LIBS $libdbuscpp_LIBS" AC_SUBST(DBUSCPP_CFLAGS)
dnl Check for libcppunit-dev
CPPUNIT_MIN_VERSION=1.12
PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION})
AC_SUBST(CPPUNIT_LIBS)
# check for libgsm1 (doesn't use pkg-config) # check for libgsm1 (doesn't use pkg-config)
dnl Check for libgsm dnl Check for libgsm
......
globals.mak 0 → 100644
+ 17
− 0
View file @ 43a38263
# Global variables
src=$(top_srcdir)
sflcodecdir=$(libdir)/sflphone/codecs
# Preprocessor flags
AM_CPPFLAGS = \
-I$(src)/libs \
-I$(src)/src \
-DPREFIX=\"$(prefix)\" \
-DPROGSHAREDIR=\"${datadir}/sflphone\" \
$(ZEROCONFFLAGS) \
$(IAX_FLAGS) \
@SIP_CFLAGS@ \
@DBUSCPP_CFLAGS@ \
-DCODECS_DIR=\""$(sflcodecdir)"\" \
-DENABLE_TRACE
libs/dbus-c++/autom4te.cache/requests deleted 100644 → 0
+ 0
− 215
View file @ c2c032f6
# This file was generated by Autom4te Sat Apr 28 03:44:04 GMT 2007.
# It contains the lists of macros which have been traced.
# It can be safely removed.
@request = (
bless( [
'0',
1,
[
'/usr/share/autoconf'
],
[
'/usr/share/autoconf/autoconf/autoconf.m4f',
'/usr/share/aclocal/libtool.m4',
'/usr/share/aclocal/pkg.m4',
'/usr/share/aclocal-1.9/amversion.m4',
'/usr/share/aclocal-1.9/auxdir.m4',
'/usr/share/aclocal-1.9/cond.m4',
'/usr/share/aclocal-1.9/depend.m4',
'/usr/share/aclocal-1.9/depout.m4',
'/usr/share/aclocal-1.9/header.m4',
'/usr/share/aclocal-1.9/init.m4',
'/usr/share/aclocal-1.9/install-sh.m4',
'/usr/share/aclocal-1.9/lead-dot.m4',
'/usr/share/aclocal-1.9/make.m4',
'/usr/share/aclocal-1.9/missing.m4',
'/usr/share/aclocal-1.9/mkdirp.m4',
'/usr/share/aclocal-1.9/options.m4',
'/usr/share/aclocal-1.9/runlog.m4',
'/usr/share/aclocal-1.9/sanity.m4',
'/usr/share/aclocal-1.9/strip.m4',
'/usr/share/aclocal-1.9/tar.m4',
'configure.ac'
],
{
'_LT_AC_TAGCONFIG' => 1,
'AM_ENABLE_STATIC' => 1,
'm4_pattern_forbid' => 1,
'AC_LIBTOOL_COMPILER_OPTION' => 1,
'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
'_LT_AC_SHELL_INIT' => 1,
'AC_DISABLE_SHARED' => 1,
'AC_DEFUN' => 1,
'_LT_COMPILER_BOILERPLATE' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_LIBTOOL_SETUP' => 1,
'AC_LIBTOOL_WIN32_DLL' => 1,
'_LT_AC_LANG_CXX_CONFIG' => 1,
'AM_PROG_MKDIR_P' => 1,
'AC_PROG_LD_RELOAD_FLAG' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AM_MISSING_HAS_RUN' => 1,
'AM_MISSING_PROG' => 1,
'AC_LIBTOOL_DLOPEN_SELF' => 1,
'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
'_LT_AC_LANG_C_CONFIG' => 1,
'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
'AM_PROG_INSTALL_STRIP' => 1,
'_PKG_SHORT_ERRORS_SUPPORTED' => 1,
'_m4_warn' => 1,
'AC_LIBTOOL_OBJDIR' => 1,
'AM_SANITY_CHECK' => 1,
'AC_LIBTOOL_LINKER_OPTION' => 1,
'PKG_CHECK_EXISTS' => 1,
'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
'_LT_AC_CHECK_DLFCN' => 1,
'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
'LT_AC_PROG_RC' => 1,
'AC_LIBTOOL_CXX' => 1,
'_AM_PROG_TAR' => 1,
'AC_LIBTOOL_GCJ' => 1,
'LT_AC_PROG_GCJ' => 1,
'AM_DEP_TRACK' => 1,
'_LT_AC_PROG_CXXCPP' => 1,
'AM_DISABLE_STATIC' => 1,
'_AC_PROG_LIBTOOL' => 1,
'AM_CONFIG_HEADER' => 1,
'_LT_AC_LANG_F77' => 1,
'AC_LIBTOOL_CONFIG' => 1,
'_AM_IF_OPTION' => 1,
'AC_PATH_TOOL_PREFIX' => 1,
'AC_LIBTOOL_F77' => 1,
'm4_pattern_allow' => 1,
'AM_DISABLE_SHARED' => 1,
'AM_SET_LEADING_DOT' => 1,
'AM_PROG_LIBTOOL' => 1,
'_LT_AC_LANG_CXX' => 1,
'_AM_DEPENDENCIES' => 1,
'_LT_AC_FILE_LTDLL_C' => 1,
'AM_PROG_LD' => 1,
'AC_LIBTOOL_LANG_C_CONFIG' => 1,
'_LT_AC_SYS_COMPILER' => 1,
'AM_PROG_NM' => 1,
'PKG_CHECK_MODULES' => 1,
'AU_DEFUN' => 1,
'AC_PROG_NM' => 1,
'AC_LIBTOOL_DLOPEN' => 1,
'AC_PROG_LD' => 1,
'AC_LIBLTDL_CONVENIENCE' => 1,
'AC_ENABLE_FAST_INSTALL' => 1,
'AC_PROG_LD_GNU' => 1,
'AC_DEPLIBS_CHECK_METHOD' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'AC_LIBLTDL_INSTALLABLE' => 1,
'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
'_AM_SET_OPTION' => 1,
'_LT_LINKER_BOILERPLATE' => 1,
'AC_LIBTOOL_PROG_CC_C_O' => 1,
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_DISABLE_STATIC' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AC_DEFUN_ONCE' => 1,
'_LT_AC_LOCK' => 1,
'_LT_AC_LANG_RC_CONFIG' => 1,
'_LT_AC_LANG_GCJ' => 1,
'AC_LIBTOOL_RC' => 1,
'_LT_AC_PROG_ECHO_BACKSLASH' => 1,
'AC_DISABLE_FAST_INSTALL' => 1,
'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
'_LT_AC_TRY_DLOPEN_SELF' => 1,
'_LT_AC_SYS_LIBPATH_AIX' => 1,
'include' => 1,
'LT_AC_PROG_SED' => 1,
'AM_ENABLE_SHARED' => 1,
'AM_AUX_DIR_EXPAND' => 1,
'_LT_AC_LANG_GCJ_CONFIG' => 1,
'AC_ENABLE_SHARED' => 1,
'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
'_LT_AC_LANG_F77_CONFIG' => 1,
'_AM_SET_OPTIONS' => 1,
'AM_RUN_LOG' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AC_LIBTOOL_PICMODE' => 1,
'_LT_REQUIRED_DARWIN_CHECKS' => 1,
'AC_ENABLE_STATIC' => 1,
'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
'AC_CHECK_LIBM' => 1,
'_LT_AC_TAGVAR' => 1,
'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
'_AM_MANGLE_OPTION' => 1,
'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
'AM_CONDITIONAL' => 1,
'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
'AM_SET_DEPDIR' => 1,
'_LT_CC_BASENAME' => 1,
'AM_PROG_INSTALL_SH' => 1,
'PKG_PROG_PKG_CONFIG' => 1,
'm4_include' => 1,
'AC_PROG_EGREP' => 1,
'AC_PATH_MAGIC' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AM_MAKE_INCLUDE' => 1
}
], 'Autom4te::Request' ),
bless( [
'1',
1,
[
'/usr/share/autoconf'
],
[
'/usr/share/autoconf/autoconf/autoconf.m4f',
'aclocal.m4',
'configure.ac'
],
{
'_LT_AC_TAGCONFIG' => 1,
'AM_PROG_F77_C_O' => 1,
'AC_INIT' => 1,
'm4_pattern_forbid' => 1,
'AC_CANONICAL_TARGET' => 1,
'AC_SUBST' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_FC_SRCEXT' => 1,
'AC_CANONICAL_HOST' => 1,
'AC_PROG_LIBTOOL' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AC_CONFIG_LINKS' => 1,
'm4_sinclude' => 1,
'LT_SUPPORTED_TAG' => 1,
'AM_MAINTAINER_MODE' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'_m4_warn' => 1,
'AM_PROG_CXX_C_O' => 1,
'AM_ENABLE_MULTILIB' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
'LT_INIT' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_LIBSOURCE' => 1,
'AM_PROG_FC_C_O' => 1,
'AC_CANONICAL_BUILD' => 1,
'AC_FC_FREEFORM' => 1,
'AH_OUTPUT' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'sinclude' => 1,
'AM_PROG_CC_C_O' => 1,
'm4_pattern_allow' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'm4_include' => 1,
'AC_SUBST_TRACE' => 1
}
], 'Autom4te::Request' )
);
libs/dbus-c++/config.log deleted 100644 → 0
+ 0
− 837
View file @ c2c032f6
This diff is collapsed.
libs/dbus-c++/config.status deleted 100755 → 0
+ 0
− 1102
View file @ c2c032f6
This diff is collapsed.
libs/dbus-c++/dbus-c++-1-uninstalled.pc deleted 100644 → 0
+ 0
− 13
View file @ c2c032f6
prefix=
exec_prefix=
libdir=src
includedir=include
Name: libdbus-c++
Description: Native C++ bindings for D-Bus, Not Installed
Version: 0.5.0
Requires:
Conflicts:
Libs: ${pcfiledir}/${libdir}/libdbus-c++-1.la
Cflags: -I${pcfiledir}/${includedir}
libs/dbus-c++/dbus-c++-1.pc deleted 100644 → 0
+ 0
− 11
View file @ c2c032f6
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: dbus-c++
Description: Native C++ bindings for D-Bus.
Requires: dbus-1
Version: 0.5.0
Libs: -L${libdir} -ldbus-c++-1
Cflags: -I${includedir}/dbus-c++-1 -DDBUS_API_SUBJECT_TO_CHANGE
src/Makefile.am
+ 58
− 57
View file @ 43a38263
sflcodecdir = $(libdir)/sflphone/codecs include ../globals.mak
bin_PROGRAMS = sflphoned
bin_PROGRAMS = sflphoned
if USE_ZEROCONF if USE_ZEROCONF
ZEROCONFDIR = zeroconf ZEROCONFDIR = zeroconf
...@@ -14,27 +14,20 @@ endif ...@@ -14,27 +14,20 @@ endif
if USE_IAX if USE_IAX
# Use the global instead of locally built # Use the global instead of locally built
#IAX_LIBS =
IAX_FLAGS = -DUSE_IAX IAX_FLAGS = -DUSE_IAX
#IAX_CFLAGS = -I$(top_srcdir)/libs/libiax2/src/
IAX_CFLAGS =
IAXSOURCES = iaxaccount.cpp iaxvoiplink.cpp iaxcall.cpp IAXSOURCES = iaxaccount.cpp iaxvoiplink.cpp iaxcall.cpp
IAXHEADERS = iaxaccount.h iaxvoiplink.h iaxcall.h IAXHEADERS = iaxaccount.h iaxvoiplink.h iaxcall.h
else else
IAX_LIBS =
IAX_FLAGS = IAX_FLAGS =
IAX_CFLAGS =
IAXSOURCES = IAXSOURCES =
IAXHEADERS = IAXHEADERS =
endif endif
ALSAFLAG= -lasound SUBDIRS = audio config dbus $(ZEROCONFDIR)
PULSEAUDIO_LIBS=-lpulse
PJSIP_LIBS = -L/usr/local/lib -lpjnath -lpjsua -lpjsip -lpjmedia -lpjsip-simple -lpjsip-ua -lpjmedia-codec -lpjlib-util -lpj
SUBDIRS = audio config dbus $(ZEROCONFDIR) #contact memmanager video mixer PJSIP_LIBS = -lpjnath -lpjsua -lpjsip -lpjmedia -lpjsip-simple -lpjsip-ua -lpjmedia-codec -lpjlib-util -lpj
# Add here the cpp files to be build with sflphone
sflphoned_SOURCES = \ sflphoned_SOURCES = \
eventthread.cpp \ eventthread.cpp \
main.cpp \ main.cpp \
...@@ -51,28 +44,28 @@ sflphoned_SOURCES = \ ...@@ -51,28 +44,28 @@ sflphoned_SOURCES = \
$(IAXSOURCES) \ $(IAXSOURCES) \
useragent.cpp useragent.cpp
sflphoned_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" $(ZEROCONFFLAGS) $(IAX_FLAGS) $(SFLPHONE_CFLAGS) $(SIP_CFLAGS) sflphoned_CXXFLAGS = \
-DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" \
$(ZEROCONFFLAGS) \
$(IAX_FLAGS)
#sflphoned_LDFLAGS = -static
sflphoned_LDADD = ./libsflphone.la $(SFLPHONE_LIBS) $(ZEROCONFLIB) $(LIB_DNSSD) $(IAX_LIBS) $(ALSAFLAG) $(PULSEAUDIO_LIBS) $(PJSIP_LIBS)
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libs $(libccext2_CFLAGS) $(libccgnu2_CFLAGS) $(IAX_CFLAGS) $(USER_INCLUDES) $(libdbuscpp_CFLAGS)
-DCODECS_DIR=\""$(sflcodecdir)"\"
-DENABLE_TRACE
# Add here the dynamic libraries sflphoned should be linked against
# libsflphone_la_LDFLAGS= -version-info 0:1:0 sflphoned_LDADD = \
libsflphone_la_LIBADD = \ ./libsflphone.la \
$(top_builddir)/libs/stund/libstun.la \ @CCGNU2_LIBS@ \
$(top_builddir)/libs/utilspp/libutilspp.la \ @CCEXT2_LIBS@ \
./audio/libaudio.la \ $(ZEROCONFLIB) \
./dbus/libdbus.la \
./config/libconfig.la \
$(IAX_LIBS) \ $(IAX_LIBS) \
$(PJSIP_LIBS) $(PJSIP_LIBS) \
@DBUSCPP_LIBS@ \
libsflphone_la_SOURCES = @CCRTP_LIBS@ \
@ALSA_LIBS@ \
@PULSEAUDIO_LIBS@ \
@SAMPLERATE_LIBS@
noinst_LTLIBRARIES = libsflphone.la noinst_LTLIBRARIES = libsflphone.la
noinst_HEADERS = \ noinst_HEADERS = \
managerimpl.h \ managerimpl.h \
manager.h \ manager.h \
...@@ -88,6 +81,14 @@ noinst_HEADERS = \ ...@@ -88,6 +81,14 @@ noinst_HEADERS = \
sipvoiplink.h \ sipvoiplink.h \
call.h \ call.h \
sipcall.h \ sipcall.h \
$(IAXHEADERS) \
useragent.h useragent.h
libsflphone_la_LIBADD = \
$(src)/libs/stund/libstun.la \
$(src)/libs/utilspp/libutilspp.la \
./audio/libaudio.la \
./dbus/libdbus.la \
./config/libconfig.la \
$(IAX_LIBS)
libsflphone_la_SOURCES =
src/audio/Makefile.am
+ 37
− 13
View file @ 43a38263
sflcodecdir = $(libdir)/sflphone/codecs include $(top_srcdir)/globals.mak
noinst_LTLIBRARIES = libaudio.la noinst_LTLIBRARIES = libaudio.la
...@@ -22,16 +22,40 @@ endif ...@@ -22,16 +22,40 @@ endif
SUBDIRS = codecs SUBDIRS = codecs
libaudio_la_SOURCES = audiofile.cpp tonelist.cpp \ libaudio_la_SOURCES = \
audiortp.cpp audiostream.cpp dtmf.cpp tone.cpp alsalayer.cpp pulselayer.cpp audiodevice.cpp dtmfgenerator.cpp \ audiofile.cpp \
tonegenerator.cpp codecDescriptor.cpp samplecache.cpp\ tonelist.cpp \
audioloop.cpp ringbuffer.cpp $(SPEEX_SOURCES_CPP) audiortp.cpp \
audiostream.cpp \
AM_CXXFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libs $(libccext2_CFLAGS) $(libdbuscpp_CFLAGS) $(libccrtp1_CFLAGS) $(USER_INCLUDES) \ dtmf.cpp \
-DCODECS_DIR=\""$(sflcodecdir)"\" $(SPEEX_FLAG) $(GSM_FLAG) $(ILBC_FLAG) tone.cpp \
alsalayer.cpp \
noinst_HEADERS = audioloop.h audiostream.h common.h ringbuffer.h audiofile.h \ pulselayer.cpp \
tonelist.h audiortp.h audiolayer.h alsalayer.h pulselayer.h audiodevice.h \ audiodevice.cpp \
dtmfgenerator.h tonegenerator.h samplecache.h \ dtmfgenerator.cpp \
codecDescriptor.h dtmf.h tone.h tonegenerator.cpp \
codecDescriptor.cpp \
samplecache.cpp \
audioloop.cpp \
ringbuffer.cpp \
$(SPEEX_SOURCES_CPP)
noinst_HEADERS = \
audioloop.h \
audiostream.h \
common.h \
ringbuffer.h \
audiofile.h \
tonelist.h \
audiortp.h \
audiolayer.h \
alsalayer.h \
pulselayer.h \
audiodevice.h \
dtmfgenerator.h \
tonegenerator.h \
samplecache.h \
codecDescriptor.h \
dtmf.h \
tone.h
src/audio/codecDescriptor.h
+ 2
− 2
View file @ 43a38263
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#include <vector> #include <vector>
#include <dirent.h> #include <dirent.h>
#include "../global.h" #include "global.h"
#include "../user_cfg.h" #include "user_cfg.h"
#include "codecs/audiocodec.h" #include "codecs/audiocodec.h"
/** Enumeration that contains known audio payloads */ /** Enumeration that contains known audio payloads */
......
src/audio/codecs/Makefile.am
+ 2
− 1
View file @ 43a38263
sflcodecdir = $(libdir)/sflphone/codecs include $(top_srcdir)/globals.mak
if BUILD_GSM if BUILD_GSM
GSM_LIB = libcodec_gsm.so GSM_LIB = libcodec_gsm.so
libcodec_gsm_so_SOURCES = gsmcodec.cpp libcodec_gsm_so_SOURCES = gsmcodec.cpp
......
src/dbus/Makefile.am
+ 2
− 2
View file @ 43a38263
SUBDIRS = include $(top_srcdir)/globals.mak
EXTRA_DIST = *.xml README EXTRA_DIST = *.xml README
...@@ -12,7 +12,7 @@ libdbus_la_SOURCES = \ ...@@ -12,7 +12,7 @@ libdbus_la_SOURCES = \
dbusmanagerimpl.cpp dbusmanagerimpl.cpp
libdbus_la_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" libdbus_la_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\"
libdbus_la_CPPFLAGS = -I$(top_srcdir)/libs -I$(top_srcdir)/src $(libccext2_CFLAGS) $(libdbuscpp_CFLAGS)
libdbus_la_LIBADD = libdbus_la_LIBADD =
noinst_HEADERS = \ noinst_HEADERS = \
......
test/Makefile.am 0 → 100644
+ 36
− 0
View file @ 43a38263
include ../globals.mak
bin_PROGRAMS = configurationTester
OBJECT_FILES= \
../src/sflphoned-managerimpl.o \
../src/sflphoned-accountcreator.o \
../src/sflphoned-call.o \
../src/sflphoned-sipcall.o \
../src/sflphoned-iaxcall.o \
../src/sflphoned-voiplink.o \
../src/sflphoned-sipvoiplink.o \
../src/sflphoned-iaxvoiplink.o \
../src/sflphoned-account.o \
../src/sflphoned-sipaccount.o \
../src/sflphoned-iaxaccount.o \
../src/sflphoned-eventthread.o \
../src/sflphoned-samplerateconverter.o
configurationTester_SOURCES = \
configurationTest.cpp \
TestMain.cpp
configurationTester_LDADD = \
../src/libsflphone.la \
$(SFLPHONE_LIBS) $(ZEROCONFLIB) $(LIB_DNSSD) $(IAX_LIBS) $(EXOSIP_LIBS) \
@ALSA_LIBS@ \
@PULSEAUDIO_LIBS@ \
@CPPUNIT_LIBS@ \
@CCEXT2_LIBS@ \
@CCGNU2_LIBS@ \
@CCRTP_LIBS@ \
@DBUSCPP_LIBS@ \
@SAMPLERATE_LIBS@ \
$(OBJECT_FILES)
test/TestMain.cpp 0 → 100644
+ 13
− 0
View file @ 43a38263
#include <cppunit/TextTestRunner.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
int main(int argc, const char* argv[])
{
CppUnit::TextTestRunner runner;
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
runner.run();
return 0;
}
test/configurationTest.cpp 0 → 100644
+ 38
− 0
View file @ 43a38263
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/TestCaller.h>
#include <cppunit/TestCase.h>
#include <cppunit/TestSuite.h>
#include <assert.h>
#include "manager.h"
#include "global.h"
// Cppunit import
class ConfigurationTest : public CppUnit::TestCase {
CPPUNIT_TEST_SUITE( ConfigurationTest );
CPPUNIT_TEST( testDefaultValueAudio );
CPPUNIT_TEST( testTheTest );
CPPUNIT_TEST_SUITE_END();
public:
ConfigurationTest() : CppUnit::TestCase("Configuration Tests") {}
void testDefaultValueAudio(){
CPPUNIT_ASSERT( Manager::instance().getConfigString( AUDIO, ALSA_PLUGIN ) == "default" );
}
void testTheTest(){
CPPUNIT_ASSERT( 3 == 2 );
}
void setUp(){
}
void tearDown(){
}
};
CPPUNIT_TEST_SUITE_REGISTRATION( ConfigurationTest );
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment