Switch commoncpp2 to ucommon to solve dependency conflicts.
libccrtp was depending on commoncpp2, and have been replaced by a version
depending on ucommon as well.
diff --git a/jni/libccrtp/sources/demo/Makefile b/jni/libccrtp/sources/demo/Makefile
index ce9cfec..428ed00 100644
--- a/jni/libccrtp/sources/demo/Makefile
+++ b/jni/libccrtp/sources/demo/Makefile
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# demo/Makefile. Generated from Makefile.in by configure.
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -27,6 +26,51 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/ccrtp
pkgincludedir = $(includedir)/ccrtp
pkglibdir = $(libdir)/ccrtp
@@ -44,13 +88,13 @@
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = x86_64-unknown-linux-gnu
-host_triplet = arm-unknown-linux-androideabi
-target_triplet = arm-unknown-linux-androideabi
+host_triplet = x86_64-unknown-linux-gnu
+target_triplet = x86_64-unknown-linux-gnu
noinst_PROGRAMS = rtpsend$(EXEEXT) rtplisten$(EXEEXT) \
rtphello$(EXEEXT) rtpduphello$(EXEEXT) audiorx$(EXEEXT) \
audiotx$(EXEEXT) ccrtptest$(EXEEXT) $(am__EXEEXT_1)
subdir = demo
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libgcrypt_local.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -61,85 +105,119 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
+CONFIG_HEADER = $(top_builddir)/ccrtp-config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-#am__EXEEXT_1 = \
-# ccsrtptest$(EXEEXT)
-#am__EXEEXT_1 = ccsrtptest$(EXEEXT)
+##am__EXEEXT_1 = \
+## ccsrtptest$(EXEEXT)
+am__EXEEXT_1 = ccsrtptest$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
am_audiorx_OBJECTS = audiorx.$(OBJEXT)
audiorx_OBJECTS = $(am_audiorx_OBJECTS)
audiorx_LDADD = $(LDADD)
-audiorx_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(audiorx_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+am__v_lt_1 =
+audiorx_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(audiorx_LDFLAGS) $(LDFLAGS) -o $@
am_audiotx_OBJECTS = audiotx.$(OBJEXT)
audiotx_OBJECTS = $(am_audiotx_OBJECTS)
audiotx_LDADD = $(LDADD)
-audiotx_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(audiotx_LDFLAGS) $(LDFLAGS) -o $@
+audiotx_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(audiotx_LDFLAGS) $(LDFLAGS) -o $@
am_ccrtptest_OBJECTS = ccrtptest.$(OBJEXT)
ccrtptest_OBJECTS = $(am_ccrtptest_OBJECTS)
ccrtptest_LDADD = $(LDADD)
-ccrtptest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ccrtptest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(ccrtptest_LDFLAGS) $(LDFLAGS) -o $@
am__ccsrtptest_SOURCES_DIST = ccsrtptest.cpp
-#am_ccsrtptest_OBJECTS = \
-# ccsrtptest.$(OBJEXT)
-#am_ccsrtptest_OBJECTS = ccsrtptest.$(OBJEXT)
+##am_ccsrtptest_OBJECTS = \
+## ccsrtptest.$(OBJEXT)
+am_ccsrtptest_OBJECTS = ccsrtptest.$(OBJEXT)
ccsrtptest_OBJECTS = $(am_ccsrtptest_OBJECTS)
ccsrtptest_LDADD = $(LDADD)
-ccsrtptest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ccsrtptest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(ccsrtptest_LDFLAGS) $(LDFLAGS) -o $@
am_rtpduphello_OBJECTS = rtpduphello.$(OBJEXT)
rtpduphello_OBJECTS = $(am_rtpduphello_OBJECTS)
rtpduphello_LDADD = $(LDADD)
-rtpduphello_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+rtpduphello_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(rtpduphello_LDFLAGS) $(LDFLAGS) -o $@
am_rtphello_OBJECTS = rtphello.$(OBJEXT)
rtphello_OBJECTS = $(am_rtphello_OBJECTS)
rtphello_LDADD = $(LDADD)
-rtphello_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+rtphello_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(rtphello_LDFLAGS) $(LDFLAGS) -o $@
am_rtplisten_OBJECTS = rtplisten.$(OBJEXT)
rtplisten_OBJECTS = $(am_rtplisten_OBJECTS)
rtplisten_LDADD = $(LDADD)
-rtplisten_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+rtplisten_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(rtplisten_LDFLAGS) $(LDFLAGS) -o $@
am_rtpsend_OBJECTS = rtpsend.$(OBJEXT)
rtpsend_OBJECTS = $(am_rtpsend_OBJECTS)
rtpsend_LDADD = $(LDADD)
-rtpsend_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(rtpsend_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/src
+rtpsend_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(rtpsend_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_$(V))
+am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I. -I$(top_builddir)
depcomp =
am__depfiles_maybe =
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo " CXX " $@;
+am__v_CXX_1 =
CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+am__v_CXXLD_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(audiorx_SOURCES) $(audiotx_SOURCES) $(ccrtptest_SOURCES) \
$(ccsrtptest_SOURCES) $(rtpduphello_SOURCES) \
$(rtphello_SOURCES) $(rtplisten_SOURCES) $(rtpsend_SOURCES)
@@ -147,74 +225,96 @@
$(ccrtptest_SOURCES) $(am__ccsrtptest_SOURCES_DIST) \
$(rtpduphello_SOURCES) $(rtphello_SOURCES) \
$(rtplisten_SOURCES) $(rtpsend_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/evigier/git/ccrtp-1.8.0-android/autoconf/missing --run aclocal-1.11
-AMTAR = ${SHELL} /home/evigier/git/ccrtp-1.8.0-android/autoconf/missing --run tar
-AR = arm-linux-androideabi-ar
-AUTOCONF = ${SHELL} /home/evigier/git/ccrtp-1.8.0-android/autoconf/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/evigier/git/ccrtp-1.8.0-android/autoconf/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/evigier/git/ccrtp-1.8.0-android/autoconf/missing --run automake-1.11
+ACLOCAL = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing aclocal-1.13
+AMTAR = $${TAR-tar}
+AM_DEFAULT_VERBOSITY = 1
+AR = ar
+AUTOCONF = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoconf
+AUTOHEADER = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing autoheader
+AUTOMAKE = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing automake-1.13
AWK = gawk
-CC = arm-linux-androideabi-gcc
+CC = gcc
CCDEPMODE = depmode=none
CFLAGS = -g -O2
-COMMON_CFLAGS = -D_GNU_SOURCE
-COMMON_LIBS = -pthread -lccgnu2 -ldl -lrt
-CPP = arm-linux-androideabi-gcc -E
+COMMONCPP_CFLAGS = -Wno-long-long -fexceptions -DNEW_STDCPP -pthread -fno-check-new -finline -fvisibility=hidden -DUCOMMON_VISIBILITY=1
+COMMONCPP_LIBS = -lcommoncpp -lucommon -lrt -ldl -lpthread
+CPP = gcc -E
CPPFLAGS =
-CXX = arm-linux-androideabi-g++
-CXXCPP = arm-linux-androideabi-g++ -E
+CXX = g++
+CXXCPP = g++ -E
CXXDEPMODE = depmode=none
-CXXFLAGS = -g -O2 -D_GNU_SOURCE
+CXXFLAGS = -g -O2 -Wno-long-long -fexceptions -DNEW_STDCPP -pthread -fno-check-new -finline -fvisibility=hidden -DUCOMMON_VISIBILITY=1
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
DLLTOOL = false
-DOXYGEN = no
+DOXYGEN = /usr/bin/doxygen
DSYMUTIL =
DUMPBIN =
ECHO_C =
ECHO_N = -n
ECHO_T =
-EGREP = /bin/grep -E
+EGREP = /usr/bin/grep -E
EXEEXT =
-FGREP = /bin/grep -F
+FGREP = /usr/bin/grep -F
FTPDIR =
-GNULIBS = -L/usr/lib -pthread -lccgnu2 -ldl -lrt
-GREP = /bin/grep
+GNULIBS = -lcommoncpp -lucommon -lrt -ldl -lpthread -lgcrypt -ldl -lgpg-error
+GREP = /usr/bin/grep
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
KDOC_DIR = $(top_srcdir)/doc
-LD = /home/evigier/android-14b-toolchain/arm-linux-androideabi/bin/ld
+LD = /usr/bin/ld -m elf_x86_64
LDFLAGS =
LIBGCRYPT_CFLAGS =
-LIBGCRYPT_CONFIG =
-LIBGCRYPT_LIBS =
+LIBGCRYPT_CONFIG = /usr/bin/libgcrypt-config
+LIBGCRYPT_LIBS = -lgcrypt -ldl -lgpg-error
LIBOBJS =
-LIBS =
+LIBS = -lgcrypt -ldl -lgpg-error
LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIB_MAJOR = 0
-LIB_VERSION = 1_8
LIPO =
LN_S = ln -s
LTLIBOBJS =
-LT_CCXX_VERSION = -version-info 0:0
-LT_MAJOR = 0
+LT_CCXX_VERSION = -version-info 2:2:0
+LT_MAJOR = 2
LT_MINOR = 0
-LT_RELEASE = 1.8
-LT_SUBVER = 0.0
+LT_RELEASE =
+LT_SUBVER = 2.0
+LT_VERSION = -version-info 2:2:0
MAINT = #
-MAKEINFO = ${SHELL} /home/evigier/git/ccrtp-1.8.0-android/autoconf/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/missing makeinfo
MANIFEST_TOOL = :
-MKDIR_P = /bin/mkdir -p
-NM = /home/evigier/android-14b-toolchain/bin/arm-linux-androideabi-nm -B
+MKDIR_P = /usr/bin/mkdir -p
+NM = /usr/bin/nm -B
NMEDIT =
-OBJDUMP = arm-linux-androideabi-objdump
+OBJDUMP = objdump
OBJEXT = o
OTOOL =
OTOOL64 =
@@ -228,27 +328,27 @@
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
-PKG_CONFIG_PATH = /home/evigier/android-ndk-r8b/platforms/android-14/arch-arm/usr/lib/pkgconfig:/usr/local/lib/pkgconfig
-RANLIB = arm-linux-androideabi-ranlib
-SED = /bin/sed
+PKG_CONFIG_PATH = /usr/local/lib/pkgconfig
+RANLIB = ranlib
+SED = /usr/bin/sed
SET_MAKE =
-SHELL = /bin/bash
-STRIP = arm-linux-androideabi-strip
-VERSION = 1.8.0
+SHELL = /bin/sh
+STRIP = strip
+VERSION = 2.0.4
WARN_FLAGS = -fno-strict-aliasing -Wall -ansi -pedantic
-abs_builddir = /home/evigier/git/ccrtp-1.8.0-android/demo
-abs_srcdir = /home/evigier/git/ccrtp-1.8.0-android/demo
-abs_top_builddir = /home/evigier/git/ccrtp-1.8.0-android
-abs_top_srcdir = /home/evigier/git/ccrtp-1.8.0-android
-ac_ct_AR =
-ac_ct_CC =
-ac_ct_CXX =
+abs_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/demo
+abs_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources/demo
+abs_top_builddir = /home/lisional/git/sflphone-android/jni/libccrtp/sources
+abs_top_srcdir = /home/lisional/git/sflphone-android/jni/libccrtp/sources
+ac_ct_AR = ar
+ac_ct_CC = gcc
+ac_ct_CXX = g++
ac_ct_DUMPBIN =
am__include = include
am__leading_dot = .
am__quote =
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
+am__tar = $${TAR-tar} chof - "$$tardir"
+am__untar = $${TAR-tar} xf -
bindir = ${exec_prefix}/bin
build = x86_64-unknown-linux-gnu
build_alias =
@@ -261,64 +361,63 @@
docdir = ${datarootdir}/doc/${PACKAGE}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = arm-unknown-linux-androideabi
-host_alias = arm-linux-androideabi
-host_cpu = arm
-host_os = linux-androideabi
+host = x86_64-unknown-linux-gnu
+host_alias =
+host_cpu = x86_64
+host_os = linux-gnu
host_vendor = unknown
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/evigier/git/ccrtp-1.8.0-android/autoconf/install-sh
+install_sh = ${SHELL} /home/lisional/git/sflphone-android/jni/libccrtp/sources/autoconf/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
+mkdir_p = $(MKDIR_P)
oldincludedir = /usr/include
pdfdir = ${docdir}
-prefix = /home/evigier/android-ndk-r8b/platforms/android-14/arch-arm/usr
+prefix = /usr/local
program_transform_name = s,x,x,
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
srcdir = .
sysconfdir = ${prefix}/etc
-target = arm-unknown-linux-androideabi
+target = x86_64-unknown-linux-gnu
target_alias =
-target_cpu = arm
-target_os = linux-androideabi
+target_cpu = x86_64
+target_os = linux-gnu
target_vendor = unknown
top_build_prefix = ../
top_builddir = ..
top_srcdir = ..
AUTOMAKE_OPTIONS = no-dependencies dist-shar
-LT_VERSION = -version-info 0:0
#ignored for programs
#$(LT_VERSION) -release $(LT_RELEASE)
-AM_CXXFLAGS = -fno-strict-aliasing -Wall -ansi -pedantic -I$(top_srcdir)/src
+AM_CXXFLAGS = -fno-strict-aliasing -Wall -ansi -pedantic -I$(top_srcdir)/src -I$(top_srcdir)/src/ccrtp
ccxxincludedir = $(includedir)/cc++
+srtp_src = ccsrtptest
#srtp_src = ccsrtptest
-#srtp_src = ccsrtptest
+ccsrtptest_SOURCES = ccsrtptest.cpp
#ccsrtptest_SOURCES = ccsrtptest.cpp
-#ccsrtptest_SOURCES = ccsrtptest.cpp
-#ccsrtptest_LDFLAGS = ../src/libccrtp1.la
-#ccsrtptest_LDFLAGS = ../src/libccrtp1.la
+ccsrtptest_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread -lgcrypt -ldl -lgpg-error
+#ccsrtptest_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread -lgcrypt -ldl -lgpg-error
rtpsend_SOURCES = rtpsend.cpp
-rtpsend_LDFLAGS = ../src/libccrtp1.la
+rtpsend_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread -lgcrypt -ldl -lgpg-error
rtplisten_SOURCES = rtplisten.cpp
-rtplisten_LDFLAGS = ../src/libccrtp1.la
+rtplisten_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread -lgcrypt -ldl -lgpg-error
rtphello_SOURCES = rtphello.cpp
-rtphello_LDFLAGS = ../src/libccrtp1.la
+rtphello_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread -lgcrypt -ldl -lgpg-error
rtpduphello_SOURCES = rtpduphello.cpp
-rtpduphello_LDFLAGS = ../src/libccrtp1.la
+rtpduphello_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread -lgcrypt -ldl -lgpg-error
audiorx_SOURCES = audiorx.cpp audio.h
-audiorx_LDFLAGS = ../src/libccrtp1.la
+audiorx_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread -lgcrypt -ldl -lgpg-error
audiotx_SOURCES = audiotx.cpp
-audiotx_LDFLAGS = ../src/libccrtp1.la
+audiotx_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread -lgcrypt -ldl -lgpg-error
ccrtptest_SOURCES = ccrtptest.cpp
-ccrtptest_LDFLAGS = ../src/libccrtp1.la
+ccrtptest_LDFLAGS = ../src/libccrtp.la -lcommoncpp -lucommon -lrt -ldl -lpthread -lgcrypt -ldl -lgpg-error
all: all-am
.SUFFIXES:
@@ -362,30 +461,38 @@
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-audiorx$(EXEEXT): $(audiorx_OBJECTS) $(audiorx_DEPENDENCIES)
+
+audiorx$(EXEEXT): $(audiorx_OBJECTS) $(audiorx_DEPENDENCIES) $(EXTRA_audiorx_DEPENDENCIES)
@rm -f audiorx$(EXEEXT)
- $(audiorx_LINK) $(audiorx_OBJECTS) $(audiorx_LDADD) $(LIBS)
-audiotx$(EXEEXT): $(audiotx_OBJECTS) $(audiotx_DEPENDENCIES)
+ $(AM_V_CXXLD)$(audiorx_LINK) $(audiorx_OBJECTS) $(audiorx_LDADD) $(LIBS)
+
+audiotx$(EXEEXT): $(audiotx_OBJECTS) $(audiotx_DEPENDENCIES) $(EXTRA_audiotx_DEPENDENCIES)
@rm -f audiotx$(EXEEXT)
- $(audiotx_LINK) $(audiotx_OBJECTS) $(audiotx_LDADD) $(LIBS)
-ccrtptest$(EXEEXT): $(ccrtptest_OBJECTS) $(ccrtptest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(audiotx_LINK) $(audiotx_OBJECTS) $(audiotx_LDADD) $(LIBS)
+
+ccrtptest$(EXEEXT): $(ccrtptest_OBJECTS) $(ccrtptest_DEPENDENCIES) $(EXTRA_ccrtptest_DEPENDENCIES)
@rm -f ccrtptest$(EXEEXT)
- $(ccrtptest_LINK) $(ccrtptest_OBJECTS) $(ccrtptest_LDADD) $(LIBS)
-ccsrtptest$(EXEEXT): $(ccsrtptest_OBJECTS) $(ccsrtptest_DEPENDENCIES)
+ $(AM_V_CXXLD)$(ccrtptest_LINK) $(ccrtptest_OBJECTS) $(ccrtptest_LDADD) $(LIBS)
+
+ccsrtptest$(EXEEXT): $(ccsrtptest_OBJECTS) $(ccsrtptest_DEPENDENCIES) $(EXTRA_ccsrtptest_DEPENDENCIES)
@rm -f ccsrtptest$(EXEEXT)
- $(ccsrtptest_LINK) $(ccsrtptest_OBJECTS) $(ccsrtptest_LDADD) $(LIBS)
-rtpduphello$(EXEEXT): $(rtpduphello_OBJECTS) $(rtpduphello_DEPENDENCIES)
+ $(AM_V_CXXLD)$(ccsrtptest_LINK) $(ccsrtptest_OBJECTS) $(ccsrtptest_LDADD) $(LIBS)
+
+rtpduphello$(EXEEXT): $(rtpduphello_OBJECTS) $(rtpduphello_DEPENDENCIES) $(EXTRA_rtpduphello_DEPENDENCIES)
@rm -f rtpduphello$(EXEEXT)
- $(rtpduphello_LINK) $(rtpduphello_OBJECTS) $(rtpduphello_LDADD) $(LIBS)
-rtphello$(EXEEXT): $(rtphello_OBJECTS) $(rtphello_DEPENDENCIES)
+ $(AM_V_CXXLD)$(rtpduphello_LINK) $(rtpduphello_OBJECTS) $(rtpduphello_LDADD) $(LIBS)
+
+rtphello$(EXEEXT): $(rtphello_OBJECTS) $(rtphello_DEPENDENCIES) $(EXTRA_rtphello_DEPENDENCIES)
@rm -f rtphello$(EXEEXT)
- $(rtphello_LINK) $(rtphello_OBJECTS) $(rtphello_LDADD) $(LIBS)
-rtplisten$(EXEEXT): $(rtplisten_OBJECTS) $(rtplisten_DEPENDENCIES)
+ $(AM_V_CXXLD)$(rtphello_LINK) $(rtphello_OBJECTS) $(rtphello_LDADD) $(LIBS)
+
+rtplisten$(EXEEXT): $(rtplisten_OBJECTS) $(rtplisten_DEPENDENCIES) $(EXTRA_rtplisten_DEPENDENCIES)
@rm -f rtplisten$(EXEEXT)
- $(rtplisten_LINK) $(rtplisten_OBJECTS) $(rtplisten_LDADD) $(LIBS)
-rtpsend$(EXEEXT): $(rtpsend_OBJECTS) $(rtpsend_DEPENDENCIES)
+ $(AM_V_CXXLD)$(rtplisten_LINK) $(rtplisten_OBJECTS) $(rtplisten_LDADD) $(LIBS)
+
+rtpsend$(EXEEXT): $(rtpsend_OBJECTS) $(rtpsend_DEPENDENCIES) $(EXTRA_rtpsend_DEPENDENCIES)
@rm -f rtpsend$(EXEEXT)
- $(rtpsend_LINK) $(rtpsend_OBJECTS) $(rtpsend_LDADD) $(LIBS)
+ $(AM_V_CXXLD)$(rtpsend_LINK) $(rtpsend_OBJECTS) $(rtpsend_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -394,13 +501,13 @@
-rm -f *.tab.c
.cpp.o:
- $(CXXCOMPILE) -c -o $@ $<
+ $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
.cpp.obj:
- $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cpp.lo:
- $(LTCXXCOMPILE) -c -o $@ $<
+ $(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -408,26 +515,15 @@
clean-libtool:
-rm -rf .libs _libs
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -439,15 +535,11 @@
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -456,6 +548,21 @@
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -504,10 +611,15 @@
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -590,18 +702,19 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstPROGRAMS ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.