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.am b/jni/libccrtp/sources/demo/Makefile.am
index 993e17c..5e6e3a0 100644
--- a/jni/libccrtp/sources/demo/Makefile.am
+++ b/jni/libccrtp/sources/demo/Makefile.am
@@ -13,41 +13,41 @@
LT_VERSION=@LT_CCXX_VERSION@
#ignored for programs
#$(LT_VERSION) -release $(LT_RELEASE)
-AM_CXXFLAGS = @WARN_FLAGS@ -I$(top_srcdir)/src
+AM_CXXFLAGS = @WARN_FLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/src/ccrtp
ccxxincludedir=$(includedir)/cc++
if SRTP_GCRYPT
srtp_src = ccsrtptest
ccsrtptest_SOURCES = ccsrtptest.cpp
-ccsrtptest_LDFLAGS = ../src/libccrtp1.la
+ccsrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@
endif
if SRTP_OPENSSL
srtp_src = ccsrtptest
ccsrtptest_SOURCES = ccsrtptest.cpp
-ccsrtptest_LDFLAGS = ../src/libccrtp1.la
+ccsrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@
endif
noinst_PROGRAMS = rtpsend rtplisten rtphello rtpduphello audiorx audiotx \
- ccrtptest $(srtp_src)
+ ccrtptest $(srtp_src)
rtpsend_SOURCES = rtpsend.cpp
-rtpsend_LDFLAGS = ../src/libccrtp1.la
+rtpsend_LDFLAGS = ../src/libccrtp.la @GNULIBS@
rtplisten_SOURCES = rtplisten.cpp
-rtplisten_LDFLAGS = ../src/libccrtp1.la
+rtplisten_LDFLAGS = ../src/libccrtp.la @GNULIBS@
rtphello_SOURCES = rtphello.cpp
-rtphello_LDFLAGS = ../src/libccrtp1.la
+rtphello_LDFLAGS = ../src/libccrtp.la @GNULIBS@
rtpduphello_SOURCES = rtpduphello.cpp
-rtpduphello_LDFLAGS = ../src/libccrtp1.la
+rtpduphello_LDFLAGS = ../src/libccrtp.la @GNULIBS@
audiorx_SOURCES = audiorx.cpp audio.h
-audiorx_LDFLAGS = ../src/libccrtp1.la
+audiorx_LDFLAGS = ../src/libccrtp.la @GNULIBS@
audiotx_SOURCES = audiotx.cpp
-audiotx_LDFLAGS = ../src/libccrtp1.la
+audiotx_LDFLAGS = ../src/libccrtp.la @GNULIBS@
ccrtptest_SOURCES = ccrtptest.cpp
-ccrtptest_LDFLAGS = ../src/libccrtp1.la
+ccrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@