summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/jingle/libjingle/talk/third_party
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-11-26 01:55:02 +0100
committerSlávek Banko <slavek.banko@axis.cz>2012-11-26 01:55:02 +0100
commit99a94433e4c65ab7e2343f58b653569b9b65d23d (patch)
tree750c36d5c3c9c59b371f591f2b4d4045af1cbca8 /kopete/protocols/jabber/jingle/libjingle/talk/third_party
parentaeff00ef479eb2f9ff26c98e119683c35e81378f (diff)
downloadtdenetwork-99a94433e4c65ab7e2343f58b653569b9b65d23d.tar.gz
tdenetwork-99a94433e4c65ab7e2343f58b653569b9b65d23d.zip
Fix automake build: jingle support
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/third_party')
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile.am2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am6
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/Makefile.am18
3 files changed, 22 insertions, 4 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile.am
index 3186245a..ba6b6440 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile.am
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile.am
@@ -1 +1 @@
-SUBDIRS=mediastreamer
+SUBDIRS=mediastreamer ortp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am
index 268a52fe..a81a4f8b 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.am
@@ -85,8 +85,8 @@ noinst_HEADERS = affine.h \
sndcard.h
-libmediastreamer_la_LIBADD= $(GLIB_LIBS) $(ORTP_LIBS) $(SPEEX_LIBS)
+libmediastreamer_la_LIBADD= $(GLIB_LIBS) $(SPEEX_LIBS)
-AM_CFLAGS=$(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(ORTP_CFLAGS) $(IPV6_CFLAGS) $(ILBC_CFLAGS) $(SPEEX_CFLAGS)
+AM_CFLAGS=$(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" -I$(srcdir)/../../../talk/third_party/ortp $(IPV6_CFLAGS) $(ILBC_CFLAGS) $(SPEEX_CFLAGS)
-INCLUDES= -I$(srcdir)/../../.. $(ORTP_CFLAGS)
+INCLUDES= -I$(srcdir)/../../.. -I$(srcdir)/../../../talk/third_party/ortp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/Makefile.am
new file mode 100644
index 00000000..6a804b7f
--- /dev/null
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/Makefile.am
@@ -0,0 +1,18 @@
+noinst_LTLIBRARIES = libortp.la
+
+noinst_HEADERS = \
+ export.h jitterctl.h ortp-config.h ortp.h payloadtype.h \
+ port_fct.h rtcp.h rtp.h rtpmod.h rtpport.h rtpsession.h \
+ rtpsignaltable.h rtptimer.h scheduler.h sessionset.h \
+ str_utils.h telephonyevents.h utils.h
+
+libortp_la_SOURCES= \
+ port_fct.c rtpmod.c rtpparse.c rtpsession.c jitterctl.c \
+ rtpsignaltable.c rtptimer.c posixtimer.c ortp.c scheduler.c \
+ avprofile.c sessionset.c telephonyevents.c payloadtype.c rtcp.c \
+ utils.c rtcpparse.c str_utils.c
+
+libortp_la_LIBADD= $(GLIB_LIBS)
+
+AM_CFLAGS=-D_ORTP_SOURCE -DG_LOG_DOMAIN=\"oRTP\" $(GLIB_CFLAGS)
+CFLAGS+=-std=gnu89