166 lines
8.3 KiB
Diff
166 lines
8.3 KiB
Diff
--- linphone-1.1.0/gnome/Makefile.in.ortp 2005-08-24 18:45:55.000000000 -0400
|
|
+++ linphone-1.1.0/gnome/Makefile.in 2005-12-05 17:14:02.000000000 -0500
|
|
@@ -343,8 +343,7 @@
|
|
@BUILD_GNOME_TRUE@INCLUDES = \
|
|
@BUILD_GNOME_TRUE@ -I$(top_srcdir)\
|
|
@BUILD_GNOME_TRUE@ -I$(top_srcdir)/intl \
|
|
-@BUILD_GNOME_TRUE@ -I$(top_srcdir)/oRTP/src \
|
|
-@BUILD_GNOME_TRUE@ -I$(top_srcdir)/oRTP/ \
|
|
+@BUILD_GNOME_TRUE@ -I$(includedir)/ortp/ \
|
|
@BUILD_GNOME_TRUE@ -I$(top_srcdir)/mediastreamer \
|
|
@BUILD_GNOME_TRUE@ -I$(top_srcdir)/speex/libspeex \
|
|
@BUILD_GNOME_TRUE@ -I$(top_srcdir)/coreapi \
|
|
--- linphone-1.1.0/coreapi/Makefile.in.ortp 2005-08-24 18:45:54.000000000 -0400
|
|
+++ linphone-1.1.0/coreapi/Makefile.in 2005-12-05 17:14:02.000000000 -0500
|
|
@@ -292,8 +292,7 @@
|
|
INCLUDES = \
|
|
-I$(top_srcdir)\
|
|
-I$(top_srcdir)/exosip\
|
|
- -I$(top_srcdir)/oRTP/include \
|
|
- -I$(top_srcdir)/oRTP/ \
|
|
+ -I$(includedir)/ortp/ \
|
|
-I$(top_srcdir)/mediastreamer \
|
|
$(SPEEX_CFLAGS) \
|
|
-I$(osip_prefix)/include/
|
|
--- linphone-1.1.0/Makefile.in.ortp 2005-08-24 18:45:54.000000000 -0400
|
|
+++ linphone-1.1.0/Makefile.in 2005-12-05 17:14:02.000000000 -0500
|
|
@@ -62,7 +62,7 @@
|
|
uninstall-recursive
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
-DIST_SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
|
|
+DIST_SUBDIRS = m4 support pixmaps po ipkg gsmlib lpc10-1.5 \
|
|
win32acm mediastreamer mediastreamer2 media_api exosip coreapi \
|
|
console gnome share developer-docs
|
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
@@ -277,7 +277,7 @@
|
|
sysconfdir = @sysconfdir@
|
|
target_alias = @target_alias@
|
|
@BUILD_TRUESPEECH_TRUE@WIN32ACM_DIR = win32acm
|
|
-SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
|
|
+SUBDIRS = m4 support pixmaps po ipkg gsmlib lpc10-1.5 \
|
|
$(WIN32ACM_DIR) mediastreamer mediastreamer2\
|
|
media_api exosip coreapi console gnome share developer-docs
|
|
|
|
--- linphone-1.1.0/console/Makefile.in.ortp 2005-08-24 18:45:54.000000000 -0400
|
|
+++ linphone-1.1.0/console/Makefile.in 2005-12-05 17:14:02.000000000 -0500
|
|
@@ -284,8 +284,7 @@
|
|
-I$(top_srcdir)/coreapi\
|
|
-I$(top_srcdir)/osipua/\
|
|
-I$(top_srcdir)/osipua/src \
|
|
- -I$(top_srcdir)/oRTP/include \
|
|
- -I$(top_srcdir)/oRTP/ \
|
|
+ -I$(includedir)/ortp/ \
|
|
-I$(top_srcdir)/mediastreamer \
|
|
$(SPEEX_CFLAGS)\
|
|
-I$(osip_prefix)/include \
|
|
--- linphone-1.1.0/mediastreamer/Makefile.in.ortp 2005-08-24 18:45:56.000000000 -0400
|
|
+++ linphone-1.1.0/mediastreamer/Makefile.in 2005-12-05 17:14:02.000000000 -0500
|
|
@@ -68,7 +68,7 @@
|
|
@BUILD_TRUESPEECH_TRUE@am__DEPENDENCIES_3 = ../win32acm/libwin32acm.a
|
|
libmediastreamer_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
|
|
../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
|
|
- ../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
|
|
+ $(am__DEPENDENCIES_1) \
|
|
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
|
|
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
|
|
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
|
@@ -356,6 +356,7 @@
|
|
MKINSTALLDIRS = @MKINSTALLDIRS@
|
|
MSGFMT = @MSGFMT@
|
|
OBJEXT = @OBJEXT@
|
|
+ORTP_LIBS = -lortp
|
|
OSIP_CFLAGS = @OSIP_CFLAGS@
|
|
OSIP_LIBS = @OSIP_LIBS@
|
|
PACKAGE = @PACKAGE@
|
|
@@ -494,7 +495,7 @@
|
|
libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
|
|
../gsmlib/libgsm.la \
|
|
../lpc10-1.5/liblpc10.la \
|
|
- ../oRTP/src/libortp.la \
|
|
+ $(ORTP_LIBS) \
|
|
$(JACK_LIBS)\
|
|
$(SAMPLERATE_LIBS)\
|
|
$(SUPPORTLIB) \
|
|
@@ -559,8 +560,7 @@
|
|
|
|
INCLUDES = -I$(top_srcdir) \
|
|
-I$(top_srcdir)/mediastreamer \
|
|
- -I$(top_srcdir)/oRTP/include \
|
|
- -I$(top_srcdir)/oRTP \
|
|
+ -I$(includedir)/ortp \
|
|
-I$(top_srcdir)/gsmlib \
|
|
-I$(top_srcdir)/lpc10-1.5 \
|
|
$(SPEEX_CFLAGS) \
|
|
--- linphone-1.1.0/mediastreamer2/Makefile.in.ortp 2005-08-24 18:45:57.000000000 -0400
|
|
+++ linphone-1.1.0/mediastreamer2/Makefile.in 2005-12-05 17:14:02.000000000 -0500
|
|
@@ -55,7 +55,7 @@
|
|
@BUILD_UGLIB_TRUE@ $(top_builddir)/support/libuglib.la
|
|
libmediastreamer2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
|
|
../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
|
|
- ../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
|
|
+ $(am__DEPENDENCIES_1) \
|
|
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
|
|
$(am__DEPENDENCIES_1)
|
|
am_libmediastreamer2_la_OBJECTS = msfilter.lo msAlawdec.lo \
|
|
@@ -216,6 +216,7 @@
|
|
MKINSTALLDIRS = @MKINSTALLDIRS@
|
|
MSGFMT = @MSGFMT@
|
|
OBJEXT = @OBJEXT@
|
|
+ORTP_LIBS = -lortp
|
|
OSIP_CFLAGS = @OSIP_CFLAGS@
|
|
OSIP_LIBS = @OSIP_LIBS@
|
|
PACKAGE = @PACKAGE@
|
|
@@ -316,7 +317,7 @@
|
|
libmediastreamer2_la_LIBADD = $(GLIB_LIBS) \
|
|
../gsmlib/libgsm.la \
|
|
../lpc10-1.5/liblpc10.la \
|
|
- ../oRTP/src/libortp.la \
|
|
+ $(ORTP_LIBS) \
|
|
$(JACK_LIBS)\
|
|
$(SUPPORTLIB) \
|
|
$(ALSA_LIBS) \
|
|
@@ -325,8 +326,7 @@
|
|
AM_CFLAGS = $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(TRUESPEECH_CFLAGS) $(IPV6_CFLAGS)
|
|
INCLUDES = -I$(top_srcdir) \
|
|
-I$(top_srcdir)/mediastreamer2 \
|
|
- -I$(top_srcdir)/oRTP/include \
|
|
- -I$(top_srcdir)/oRTP \
|
|
+ -I$(includedir)/ortp \
|
|
-I$(top_srcdir)/gsmlib \
|
|
-I$(top_srcdir)/lpc10-1.5 \
|
|
$(SPEEX_CFLAGS)
|
|
--- linphone-1.1.0/media_api/Makefile.in.ortp 2005-08-24 18:45:56.000000000 -0400
|
|
+++ linphone-1.1.0/media_api/Makefile.in 2005-12-05 17:14:02.000000000 -0500
|
|
@@ -302,8 +302,7 @@
|
|
INCLUDES = -I$(top_srcdir)/mediastreamer \
|
|
-I$(top_srcdir)/speex \
|
|
-I$(top_srcdir)/gsmlib \
|
|
- -I$(top_srcdir)/oRTP \
|
|
- -I$(top_srcdir)/oRTP/src \
|
|
+ -I$(includedir)/ortp \
|
|
-I$(top_srcdir)/lpc10-1.5 \
|
|
-I$(top_srcdir)/ffmpeg
|
|
|
|
--- linphone-1.1.0/configure.ortp 2005-08-24 18:37:04.000000000 -0400
|
|
+++ linphone-1.1.0/configure 2005-12-05 17:17:37.000000000 -0500
|
|
@@ -462,8 +462,6 @@
|
|
#if HAVE_UNISTD_H
|
|
# include <unistd.h>
|
|
#endif"
|
|
-
|
|
-ac_subdirs_all="$ac_subdirs_all oRTP"
|
|
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBLINPHONE_SO_VERSION LINPHONE_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ac_pt_PKG_CONFIG LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS LIBGTK_CFLAGS LIBGTK_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS STRICT_OPTIONS IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE JACK_CFLAGS JACK_LIBS SAMPLERATE_CFLAGS SAMPLERATE_LIBS osip_prefix OSIP_CFLAGS OSIP_LIBS EXOSIP_CFLAGS EXOSIP_LIBS SPEEX_CFLAGS SPEEX_LIBS ILBC_CFLAGS ILBC_LIBS ${NAME}_CFLAGS ${NAME}_LIBS VIDEO_CFLAGS VIDEO_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_UGLIB_TRUE BUILD_UGLIB_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE BUILD_SPEEX_TRUE BUILD_SPEEX_FALSE ARMBUILD_TRUE ARMBUILD_FALSE BUILD_VIDEO_TRUE BUILD_VIDEO_FALSE ALSA_LIBS subdirs HTML_DIR GTK_DOC_CFLAGS GTK_DOC_LIBS ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE have_db2html ENABLE_MANUAL_TRUE ENABLE_MANUAL_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS'
|
|
ac_subst_files=''
|
|
|
|
@@ -29745,9 +29743,6 @@
|
|
|
|
|
|
|
|
-subdirs="$subdirs oRTP"
|
|
-
|
|
-
|
|
##################################################
|
|
# Check for gtk-doc.
|
|
##################################################
|