[meego-commits] 6070: Changes to Trunk:Testing/telepathy-farsight
Huaxu Wan
huaxu.wan at intel.com
Thu Jul 29 01:10:13 UTC 2010
Hi,
I have made the following changes to telepathy-farsight in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Huaxu Wan
[This message was auto-generated]
---
Request #6070:
submit: home:huaxu:branches:Trunk:Testing/telepathy-farsight(r2)(cleanup) -> Trunk:Testing/telepathy-farsight
Message:
Update to 0.0.14
State: new 2010-07-28T13:03:17 huaxu
Comment: None
changes files:
--------------
--- telepathy-farsight.changes
+++ telepathy-farsight.changes
@@ -0,0 +1,3 @@
+* Wed Jul 28 2010 Huaxu Wan <huaxu.wan at linux.intel.com> - 0.0.14
+- Update to 0.0.14
+
old:
----
telepathy-farsight-0.0.12.tar.gz
new:
----
telepathy-farsight-0.0.14.tar.gz
spec files:
-----------
--- telepathy-farsight.spec
+++ telepathy-farsight.spec
@@ -1,13 +1,13 @@
#
# Do not Edit! Generated by:
-# spectacle version 0.13~pre
+# spectacle version 0.18
#
# >> macros
# << macros
Name: telepathy-farsight
Summary: Telepathy client to handle media streaming channels
-Version: 0.0.12
+Version: 0.0.14
Release: 1
Group: Applications/Communications
License: LGPLv2+
@@ -18,7 +18,7 @@
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(dbus-glib-1)
-BuildRequires: pkgconfig(farsight2-0.10)
+BuildRequires: pkgconfig(farsight2-0.10) >= 0.0.17
BuildRequires: pkgconfig(telepathy-glib)
BuildRequires: pkgconfig(gtk-doc)
BuildRequires: pkgconfig(gst-python-0.10)
@@ -28,7 +28,6 @@
BuildRequires: libtool
BuildRequires: python-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
telepathy-farsight is a Telepathy client that uses Farsight and
@@ -65,6 +64,8 @@
%prep
%setup -q -n %{name}-%{version}
+
+# telepathy-farsight-makefile.patch
%patch0 -p1
# >> setup
# << setup
@@ -74,7 +75,6 @@
# << build pre
%configure --disable-static
-# Call make instruction with smp support
make %{?jobs:-j%jobs}
# >> build post
@@ -88,9 +88,6 @@
# >> install post
# << install post
-%clean
-rm -rf %{buildroot}
-
%post -p /sbin/ldconfig
@@ -98,9 +95,6 @@
%postun -p /sbin/ldconfig
-
-
-
%files
%defattr(-,root,root,-)
# >> files
other changes:
--------------
++++++ telepathy-farsight-0.0.12.tar.gz -> telepathy-farsight-0.0.14.tar.gz
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,140 @@
+commit 75684548d1aeba47763784edcefba8d692ad1ef3
+Author: Olivier Crête <tester at tester.ca>
+Date: Wed May 26 22:39:09 2010 -0400
+
+ Version 0.0.14
+
+ NEWS | 8 ++++++++
+ configure.ac | 6 +++---
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+commit 12805859a007b91fd40e52420b28f17ea68a8001
+Author: Olivier Crête <tester at tester.ca>
+Date: Wed May 26 22:16:10 2010 -0400
+
+ Only set the controlling-mode for the nice transmitter
+
+ telepathy-farsight/stream.c | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 6bd60032c03d86516d1144ac250ec1eb7f10fe92
+Author: Olivier Crête <tester at tester.ca>
+Date: Wed May 26 22:03:01 2010 -0400
+
+ Use silence rules if possible
+
+ configure.ac | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit f27397da8a3d291e5857e1d7a070e4154b01dc03
+Author: Olivier Crête <tester at tester.ca>
+Date: Wed May 26 21:59:55 2010 -0400
+
+ Make it compile with -Wshadow
+
+ telepathy-farsight/stream.c | 9 ++++-----
+ 1 files changed, 4 insertions(+), 5 deletions(-)
+
+commit b46186bc4c21e58b34d30e115914bb4bc12e3af0
+Author: Olivier Crête <olivier.crete at collabora.co.uk>
+Date: Tue Feb 23 20:11:38 2010 -0500
+
+ Add property to get the Farsight Session
+
+ telepathy-farsight/stream.c | 13 ++++++++++++-
+ 1 files changed, 12 insertions(+), 1 deletions(-)
+
+commit 35f16c6ede1383f9003f38c7e2608e8dbde67983
+Author: Olivier Crête <olivier.crete at collabora.co.uk>
+Date: Tue Feb 23 19:38:10 2010 -0500
+
+ Add property to get the Farsight Stream
+
+ telepathy-farsight/stream.c | 11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+commit d6fb9ed6c592a76efdedae9197d86321b6fcecfa
+Author: Olivier Crête <olivier.crete at collabora.co.uk>
+Date: Thu Feb 18 17:46:03 2010 -0500
+
+ Ignore empty strings in tp properties (treat them as NULL)
+
+ telepathy-farsight/channel.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 95d500aa3e4000f963419fd776592e829e7805a2
+Author: Olivier Crête <olivier.crete at collabora.co.uk>
+Date: Thu Jan 14 15:52:12 2010 -0500
+
+ Recognize "shm" nat traversal as "shm" transmitter
+
+ telepathy-farsight/stream.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 9dac5229811d5b7bf6401558957579e7107356f2
+Author: Olivier Crête <olivier.crete at collabora.co.uk>
+Date: Tue Jan 5 14:12:07 2010 -0500
+
+ Version 0.0.13.1
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bd7be4cdc2e2ea26101458738eaa2db91cadb345
+Author: Olivier Crête <olivier.crete at collabora.co.uk>
+Date: Tue Jan 5 14:03:55 2010 -0500
+
+ Version 0.0.13
+
+ NEWS | 5 +++++
+ configure.ac | 10 +++++-----
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+
+commit bb656de6bd913dea6dbd572d7e578e6fc605183f
+Author: Olivier Crête <olivier.crete at collabora.co.uk>
+Date: Tue Jan 5 14:02:27 2010 -0500
+
+ Require farsight2 0.0.17 for ptime/maxptime
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 77884843668654e4ba05614aecb0bc9fce107699
+Author: Olivier Crête <olivier.crete at collabora.co.uk>
+Date: Tue Nov 10 19:38:00 2009 -0500
+
+ Export held resources
+
+ telepathy-farsight/stream.c | 15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
+
+commit d4795af1a73e6d220bd05baf153f12cb62a0d23c
+Author: Olivier Crête <olivier.crete at collabora.co.uk>
+Date: Thu Dec 31 17:50:40 2009 -0500
+
+ Get ptime/maxptime from the TP optional properties on the codecs
+
+ telepathy-farsight/stream.c | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+commit f929447c16feaabeb2524d134f7e700d5c6352c0
+Author: Olivier Crête <olivier.crete at collabora.co.uk>
+Date: Thu Dec 31 17:49:56 2009 -0500
+
+ Set ptime/maxptime as optional parameters on the TP codetc
+
+ telepathy-farsight/stream.c | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 8fbd8761f693cb02914ecad3da2eed441364955d
+Author: Olivier Crête <olivier.crete at collabora.co.uk>
+Date: Thu Oct 15 15:56:51 2009 -0400
+
+ Version 0.0.12.1
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
commit 08d747cd2d5915b317bb3bc4d3b38096889a747f
Author: Olivier Crête <olivier.crete at collabora.co.uk>
Date: Thu Oct 15 15:52:45 2009 -0400
--- Makefile.in
+++ Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
@@ -13,15 +14,12 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -51,18 +49,31 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = m4 tools telepathy-farsight doc python
@@ -70,17 +81,41 @@
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
+ { test ! -d "$(distdir)" \
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr "$(distdir)"; }; }
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -102,8 +137,6 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ERROR_CFLAGS = @ERROR_CFLAGS@
EXEEXT = @EXEEXT@
FARSIGHT2_CFLAGS = @FARSIGHT2_CFLAGS@
@@ -114,9 +147,8 @@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -133,6 +165,7 @@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
@@ -163,12 +196,12 @@
TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@
TELEPATHY_LIBS = @TELEPATHY_LIBS@
VERSION = @VERSION@
-WANT_PYTHON_FALSE = @WANT_PYTHON_FALSE@
-WANT_PYTHON_TRUE = @WANT_PYTHON_TRUE@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -180,6 +213,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -212,8 +246,12 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
@WANT_PYTHON_TRUE at PYTHON_SUBDIR = python
SUBDIRS = m4 tools telepathy-farsight doc $(PYTHON_SUBDIR)
@@ -234,15 +272,15 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
- cd $(srcdir) && $(AUTOMAKE) --gnu \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -258,21 +296,22 @@
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
+ $(am__cd) $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
@@ -286,8 +325,7 @@
-rm -rf .libs _libs
distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
+ -rm -f libtool config.lt
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -296,7 +334,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -313,16 +351,15 @@
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -348,16 +385,16 @@
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -365,14 +402,14 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -384,84 +421,103 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) config.h.in $(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; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(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; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- $(mkdir_p) $(distdir)/m4 $(distdir)/telepathy-farsight $(distdir)/tools
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d "$(distdir)" || mkdir "$(distdir)"
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -469,11 +525,13 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -test -n "$(am__skip_mode_fix)" \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
@@ -482,6 +540,14 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
+dist-xz: distdir
+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -505,13 +571,17 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -519,9 +589,11 @@
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
+ test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/_build \
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
@@ -543,13 +615,15 @@
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+ && cd "$$am__cwd" \
+ || exit 1
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
+ @$(am__cd) '$(distuninstallcheck_dir)' \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
@@ -591,6 +665,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -611,18 +686,38 @@
html: html-recursive
+html-am:
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -643,24 +738,26 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+ ctags-recursive install-am install-strip tags-recursive
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-libtool clean-recursive \
- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ 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 \
installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am
maintainer-upload-release: _maintainer-upload-release-local
@@ -695,6 +792,7 @@
_maintainer-upload-release: _maintainer-upload-release-check
rsync -vzP @PACKAGE at -@VERSION at .tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE at -@VERSION at .tar.gz
rsync -vzP @PACKAGE at -@VERSION at .tar.gz.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE at -@VERSION at .tar.gz.asc
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--- NEWS
+++ NEWS
@@ -1,3 +1,16 @@
+telepathy-farsight 0.0.14 (26 May 2010)
+=======================================
+- Add properties to get the Farsight2 session and stream
+- Recognize the shm transmitter
+- Ignore invalidly empty strings in tp properties
+- Fix -Wshadow warnings
+- Use silent rules if automake >= 1.11
+
+telepathy-farsight 0.0.13 (5 Jan 2010)
+======================================
+- Export held resource in a property
+- Transfer the ptime/maxptime
+
telepathy-farsight 0.0.12 (15 Oct 2009)
=======================================
- Fix mixup between GSlice and malloc
--- aclocal.m4
+++ aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file 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.
@@ -11,6 +11,14 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
@@ -167,7 +175,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -177,14 +185,31 @@
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
+m4_if([$1], [1.11.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -241,14 +266,14 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
# Free Software Foundation, Inc.
#
# This file 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.
-# serial 7
+# serial 9
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -257,8 +282,11 @@
[AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -272,15 +300,14 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
# Free Software Foundation, Inc.
#
# This file 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.
-# serial 8
+# serial 10
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -308,6 +335,7 @@
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
@@ -336,6 +364,16 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
+ am__universal=false
+ m4_case([$1], [CC],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac],
+ [CXX],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac])
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -353,7 +391,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -363,18 +411,23 @@
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -425,61 +478,74 @@
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file 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.
-#serial 3
+#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+[{
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -510,14 +576,14 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
#
# This file 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.
-# serial 12
+# serial 16
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -534,16 +600,20 @@
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.62])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
fi
# test whether we have cygpath
@@ -563,6 +633,9 @@
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@@ -578,8 +651,8 @@
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -587,20 +660,37 @@
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
])
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
@@ -611,18 +701,19 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -633,7 +724,14 @@
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -659,13 +757,13 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
#
# This file 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.
-# serial 3
+# serial 4
# AM_MAKE_INCLUDE()
# -----------------
@@ -674,7 +772,7 @@
[am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
- @echo done
+ @echo this is the am__doit target
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -684,24 +782,24 @@
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
fi
AC_SUBST([am__include])
AC_SUBST([am__quote])
@@ -711,14 +809,14 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file 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.
-# serial 4
+# serial 6
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -734,7 +832,15 @@
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
@@ -744,7 +850,7 @@
fi
])
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -752,70 +858,33 @@
# AM_PROG_MKDIR_P
# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake. There are at least two reasons why we must not
-# use `-m 0755':
-# - it causes special bits like SGID to be ignored,
-# - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out. Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
- else
- mkdir_p='$(install_sh) -d'
- fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+ [[\\/$]]* | ?:[[\\/]]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file 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.
-# serial 3
+# serial 4
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -832,7 +901,7 @@
# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# -------------------------------------------
@@ -840,7 +909,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -871,13 +940,11 @@
# numbers and dots only.
AC_DEFUN([AM_PATH_PYTHON],
[
- dnl Find a Python interpreter. Python versions prior to 1.5 are not
- dnl supported because the default installation locations changed from
- dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
- dnl in 1.5.
+ dnl Find a Python interpreter. Python versions prior to 2.0 are not
+ dnl supported. (2.0 was released on October 16, 2000).
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
- [python python2 python2.5 python2.4 python2.3 python2.2 dnl
-python2.1 python2.0 python1.6 python1.5])
+ [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
+python2.1 python2.0])
m4_if([$1],[],[
dnl No version check is needed.
@@ -924,7 +991,7 @@
dnl library.
AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
- [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])
+ [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
dnl Use the values of $prefix and $exec_prefix for the corresponding
@@ -939,7 +1006,7 @@
dnl to know which OS platform Python thinks this is.
AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
- [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])
+ [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
@@ -954,8 +1021,29 @@
dnl doesn't work.
AC_CACHE_CHECK([for $am_display_PYTHON script directory],
[am_cv_python_pythondir],
- [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
+ [if test "x$prefix" = xNONE
+ then
+ am_py_prefix=$ac_default_prefix
+ else
+ am_py_prefix=$prefix
+ fi
+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pythondir in
+ $am_py_prefix*)
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ ;;
+ *)
+ case $am_py_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+ ])
AC_SUBST([pythondir], [$am_cv_python_pythondir])
dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
@@ -971,8 +1059,29 @@
dnl doesn't work.
AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
[am_cv_python_pyexecdir],
- [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
+ [if test "x$exec_prefix" = xNONE
+ then
+ am_py_exec_prefix=$am_py_prefix
+ else
+ am_py_exec_prefix=$exec_prefix
+ fi
+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pyexecdir in
+ $am_py_exec_prefix*)
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ ;;
+ *)
+ case $am_py_exec_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+ ])
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
@@ -992,28 +1101,29 @@
# Run ACTION-IF-FALSE otherwise.
# This test uses sys.hexversion instead of the string equivalent (first
# word of sys.version), in order to cope with versions such as 2.2c1.
-# hexversion has been introduced in Python 1.5.2; it's probably not
-# worth to support older versions (1.5.1 was released on October 31, 1998).
+# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
AC_DEFUN([AM_PYTHON_CHECK_VERSION],
- [prog="import sys, string
+ [prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
# because we need at least 4 digits for the hex conversion.
-minver = map(int, string.split('$2', '.')) + [[0, 0, 0]]
+# map returns an iterator in Python 3.0 and a list in 2.x
+minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]]
+# xrange is not present in Python 3.0 and range returns an iterator
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
sys.exit(sys.hexversion < minverhex)"
AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
# Free Software Foundation, Inc.
#
# This file 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.
-# serial 4
+# serial 5
# AM_SANITY_CHECK
# ---------------
@@ -1022,16 +1132,29 @@
# Just in case
sleep 1
echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
if test "$[*]" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
+ set X `ls -t "$srcdir/configure" conftest.file`
fi
rm -f conftest.file
if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -1056,6 +1179,33 @@
fi
AC_MSG_RESULT(yes)])
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 1
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# (`yes' being less verbose, `no' or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules],
+[ --enable-silent-rules less verbose build output (undo: `make V=1')
+ --disable-silent-rules verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no) AM_DEFAULT_VERBOSITY=1;;
+*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -1081,9 +1231,28 @@
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 2
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
--- configure
+++ configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for Telepathy-Farsight 0.0.12.
+# Generated by GNU Autoconf 2.63 for Telepathy-Farsight 0.0.14.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=stream-engine>.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='Telepathy-Farsight'
PACKAGE_TARNAME='telepathy-farsight'
-PACKAGE_VERSION='0.0.12'
-PACKAGE_STRING='Telepathy-Farsight 0.0.12'
+PACKAGE_VERSION='0.0.14'
+PACKAGE_STRING='Telepathy-Farsight 0.0.14'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=stream-engine'
# Factoring default headers for most tests.
@@ -785,7 +785,9 @@
# include <unistd.h>
#endif"
-ac_subst_vars='LTLIBOBJS
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
LIBOBJS
LT_AGE
LT_REVISION
@@ -865,6 +867,8 @@
LDFLAGS
CFLAGS
CC
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
am__untar
am__tar
AMTAR
@@ -872,6 +876,7 @@
SET_MAKE
AWK
mkdir_p
+MKDIR_P
INSTALL_STRIP_PROGRAM
STRIP
install_sh
@@ -883,6 +888,7 @@
VERSION
PACKAGE
CYGPATH_W
+am__isrc
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
@@ -926,6 +932,7 @@
ac_subst_files=''
ac_user_opts='
enable_option_checking
+enable_silent_rules
enable_dependency_tracking
enable_shared
enable_static
@@ -1511,7 +1518,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Telepathy-Farsight 0.0.12 to adapt to many kinds of systems.
+\`configure' configures Telepathy-Farsight 0.0.14 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1582,7 +1589,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Telepathy-Farsight 0.0.12:";;
+ short | recursive ) echo "Configuration of Telepathy-Farsight 0.0.14:";;
esac
cat <<\_ACEOF
@@ -1590,6 +1597,8 @@
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-silent-rules less verbose build output (undo: `make V=1')
+ --disable-silent-rules verbose build output (undo: `make V=0')
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--enable-shared[=PKGS] build shared libraries [default=yes]
@@ -1704,7 +1713,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Telepathy-Farsight configure 0.0.12
+Telepathy-Farsight configure 0.0.14
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1718,7 +1727,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Telepathy-Farsight $as_me 0.0.12, which was
+It was created by Telepathy-Farsight $as_me 0.0.14, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2089,7 +2098,8 @@
-am__api_version="1.9"
+am__api_version='1.11'
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -2219,16 +2229,33 @@
# Just in case
sleep 1
echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+ { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
+$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+ { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
+$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
+ { (exit 1); exit 1; }; };;
+esac
+
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
if test "$*" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
+ set X `ls -t "$srcdir/configure" conftest.file`
fi
rm -f conftest.file
if test "$*" != "X $srcdir/configure conftest.file" \
@@ -2272,7 +2299,14 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
@@ -2282,39 +2316,163 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
else
- mkdir_p='$(install_sh) -d'
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
fi
+else
+ STRIP="$ac_cv_prog_STRIP"
fi
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+done
+IFS=$as_save_IFS
+
+fi
+
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
+ fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2397,12 +2555,16 @@
fi
rmdir .tst 2>/dev/null
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
# test whether we have cygpath
@@ -2417,7 +2579,7 @@
# Define the identity of the package.
PACKAGE='telepathy-farsight'
- VERSION='0.0.12'
+ VERSION='0.0.14'
cat >>confdefs.h <<_ACEOF
@@ -2445,108 +2607,6 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_STRIP" = x; then
- STRIP=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- STRIP=$ac_ct_STRIP
- fi
-else
- STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# Always define AMTAR for backward compatibility.
@@ -2562,6 +2622,19 @@
ac_config_headers="$ac_config_headers config.h"
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then
+ enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no) AM_DEFAULT_VERBOSITY=1;;
+*) AM_DEFAULT_VERBOSITY=0;;
+esac
+AM_BACKSLASH='\'
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3502,7 +3575,7 @@
am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
- @echo done
+ @echo this is the am__doit target
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -3513,24 +3586,24 @@
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
fi
@@ -3547,9 +3620,7 @@
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
@@ -3559,7 +3630,6 @@
-
depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@@ -3590,6 +3660,11 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -3607,7 +3682,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -3617,18 +3702,23 @@
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -3656,9 +3746,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -4115,8 +4203,8 @@
-macro_version='2.2.6'
-macro_revision='1.3012'
+macro_version='2.2.6b'
+macro_revision='1.3017'
@@ -4809,13 +4897,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4812: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4900: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4815: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4903: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4818: output\"" >&5)
+ (eval echo "\"\$as_me:4906: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6021,7 +6109,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6024 "configure"' > conftest.$ac_ext
+ echo '#line 6112 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7878,11 +7966,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7881: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7969: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7885: \$? = $ac_status" >&5
+ echo "$as_me:7973: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8217,11 +8305,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8220: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8308: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8224: \$? = $ac_status" >&5
+ echo "$as_me:8312: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8322,11 +8410,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8325: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8413: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8329: \$? = $ac_status" >&5
+ echo "$as_me:8417: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8377,11 +8465,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8380: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8468: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8384: \$? = $ac_status" >&5
+ echo "$as_me:8472: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11190,7 +11278,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11193 "configure"
+#line 11281 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11286,7 +11374,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11289 "configure"
+#line 11377 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12310,12 +12398,12 @@
pkg_cv_FARSIGHT2_CFLAGS="$FARSIGHT2_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"farsight2-0.10 >= 0.0.14\"") >&5
- ($PKG_CONFIG --exists --print-errors "farsight2-0.10 >= 0.0.14") 2>&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"farsight2-0.10 >= 0.0.17\"") >&5
+ ($PKG_CONFIG --exists --print-errors "farsight2-0.10 >= 0.0.17") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_FARSIGHT2_CFLAGS=`$PKG_CONFIG --cflags "farsight2-0.10 >= 0.0.14" 2>/dev/null`
+ pkg_cv_FARSIGHT2_CFLAGS=`$PKG_CONFIG --cflags "farsight2-0.10 >= 0.0.17" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -12326,12 +12414,12 @@
pkg_cv_FARSIGHT2_LIBS="$FARSIGHT2_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"farsight2-0.10 >= 0.0.14\"") >&5
- ($PKG_CONFIG --exists --print-errors "farsight2-0.10 >= 0.0.14") 2>&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"farsight2-0.10 >= 0.0.17\"") >&5
+ ($PKG_CONFIG --exists --print-errors "farsight2-0.10 >= 0.0.17") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_FARSIGHT2_LIBS=`$PKG_CONFIG --libs "farsight2-0.10 >= 0.0.14" 2>/dev/null`
+ pkg_cv_FARSIGHT2_LIBS=`$PKG_CONFIG --libs "farsight2-0.10 >= 0.0.17" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -12349,14 +12437,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- FARSIGHT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "farsight2-0.10 >= 0.0.14" 2>&1`
+ FARSIGHT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "farsight2-0.10 >= 0.0.17" 2>&1`
else
- FARSIGHT2_PKG_ERRORS=`$PKG_CONFIG --print-errors "farsight2-0.10 >= 0.0.14" 2>&1`
+ FARSIGHT2_PKG_ERRORS=`$PKG_CONFIG --print-errors "farsight2-0.10 >= 0.0.17" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$FARSIGHT2_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (farsight2-0.10 >= 0.0.14) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (farsight2-0.10 >= 0.0.17) were not met:
$FARSIGHT2_PKG_ERRORS
@@ -12367,7 +12455,7 @@
and FARSIGHT2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
-$as_echo "$as_me: error: Package requirements (farsight2-0.10 >= 0.0.14) were not met:
+$as_echo "$as_me: error: Package requirements (farsight2-0.10 >= 0.0.17) were not met:
$FARSIGHT2_PKG_ERRORS
@@ -12435,7 +12523,7 @@
# Find any Python interpreter.
if test -z "$PYTHON"; then
- for ac_prog in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
+ for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -12497,7 +12585,7 @@
if test "${am_cv_python_version+set}" = set; then
$as_echo_n "(cached) " >&6
else
- am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
fi
{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
$as_echo "$am_cv_python_version" >&6; }
@@ -12516,7 +12604,7 @@
if test "${am_cv_python_platform+set}" = set; then
$as_echo_n "(cached) " >&6
else
- am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
+ am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
fi
{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
$as_echo "$am_cv_python_platform" >&6; }
@@ -12530,8 +12618,29 @@
if test "${am_cv_python_pythondir+set}" = set; then
$as_echo_n "(cached) " >&6
else
- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+ if test "x$prefix" = xNONE
+ then
+ am_py_prefix=$ac_default_prefix
+ else
+ am_py_prefix=$prefix
+ fi
+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pythondir in
+ $am_py_prefix*)
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ ;;
+ *)
+ case $am_py_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+
fi
{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
$as_echo "$am_cv_python_pythondir" >&6; }
@@ -12547,8 +12656,29 @@
if test "${am_cv_python_pyexecdir+set}" = set; then
$as_echo_n "(cached) " >&6
else
- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
+ if test "x$exec_prefix" = xNONE
+ then
+ am_py_exec_prefix=$am_py_prefix
+ else
+ am_py_exec_prefix=$exec_prefix
+ fi
+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ case $am_cv_python_pyexecdir in
+ $am_py_exec_prefix*)
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ ;;
+ *)
+ case $am_py_exec_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+
fi
{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
$as_echo "$am_cv_python_pyexecdir" >&6; }
@@ -12741,9 +12871,7 @@
:
fi
fi
-
-
-if test "x$WANT_PYTHON" = "xyes"; then
+ if test "x$WANT_PYTHON" = "xyes"; then
WANT_PYTHON_TRUE=
WANT_PYTHON_FALSE='#'
else
@@ -12838,9 +12966,7 @@
done
-
-
-if test x$enable_gtk_doc = xyes; then
+ if test x$enable_gtk_doc = xyes; then
ENABLE_GTK_DOC_TRUE=
ENABLE_GTK_DOC_FALSE='#'
else
@@ -12848,9 +12974,7 @@
ENABLE_GTK_DOC_FALSE=
fi
-
-
-if test -n "$LIBTOOL"; then
+ if test -n "$LIBTOOL"; then
GTK_DOC_USE_LIBTOOL_TRUE=
GTK_DOC_USE_LIBTOOL_FALSE='#'
else
@@ -12860,9 +12984,9 @@
-LT_CURRENT=0
-LT_REVISION=4
-LT_AGE=0
+LT_CURRENT=1
+LT_REVISION=1
+LT_AGE=1
@@ -12967,6 +13091,14 @@
LTLIBOBJS=$ac_ltlibobjs
+ if test -n "$EXEEXT"; then
+ am__EXEEXT_TRUE=
+ am__EXEEXT_FALSE='#'
+else
+ am__EXEEXT_TRUE='#'
+ am__EXEEXT_FALSE=
+fi
+
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -13324,7 +13456,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Telepathy-Farsight $as_me 0.0.12, which was
+This file was extended by Telepathy-Farsight $as_me 0.0.14, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13387,7 +13519,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-Telepathy-Farsight config.status 0.0.12
+Telepathy-Farsight config.status 0.0.14
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -13398,6 +13530,7 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
AWK='$AWK'
test -n "\$AWK" || AWK=awk
_ACEOF
@@ -14273,6 +14406,11 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+ esac
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -14329,6 +14467,7 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -14383,21 +14522,22 @@
{ (exit 1); exit 1; }; }
fi
# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- "$ac_file" | "$ac_file":* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -14424,17 +14564,28 @@
case $ac_file$ac_mode in
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
@@ -14457,28 +14608,28 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`$as_dirname -- "$file" ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
@@ -14501,7 +14652,7 @@
q
}
s/.*/./; q'`
- { as_dir=$dirpart/$fdir
+ { as_dir=$dirpart/$fdir
case $as_dir in #(
-*) as_dir=./$as_dir;;
esac
@@ -14542,10 +14693,11 @@
} || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
;;
"libtool":C)
--- configure.ac
+++ configure.ac
@@ -9,7 +9,7 @@
m4_define([tp_farsight_major_version], [0])
m4_define([tp_farsight_minor_version], [0])
-m4_define([tp_farsight_micro_version], [12])
+m4_define([tp_farsight_micro_version], [14])
m4_define([tp_farsight_nano_version], [0])
dnl CURRENT, REVISION, AGE
@@ -17,9 +17,9 @@
dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
dnl - interfaces added -> increment AGE
dnl - interfaces removed -> AGE = 0
-m4_define([tp_farsight_lt_current], [0])
-m4_define([tp_farsight_lt_revision], [4])
-m4_define([tp_farsight_lt_age], [0])
+m4_define([tp_farsight_lt_current], [1])
+m4_define([tp_farsight_lt_revision], [1])
+m4_define([tp_farsight_lt_age], [1])
# Some magic
@@ -37,6 +37,11 @@
AM_INIT_AUTOMAKE([1.9 -Wno-portability])
AM_CONFIG_HEADER(config.h)
+dnl use pretty build output with automake >= 1.11
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
+ [AM_DEFAULT_VERBOSITY=1
+ AC_SUBST(AM_DEFAULT_VERBOSITY)])
+
dnl check for tools
AC_PROG_CC
AC_PROG_CC_STDC
@@ -99,7 +104,7 @@
AC_SUBST(TELEPATHY_LIBS)
dnl Check for farsight
-PKG_CHECK_MODULES(FARSIGHT2, [farsight2-0.10 >= 0.0.14])
+PKG_CHECK_MODULES(FARSIGHT2, [farsight2-0.10 >= 0.0.17])
AC_SUBST(FARSIGHT2_CFLAGS)
AC_SUBST(FARSIGHT2_LIBS)
--- doc/Makefile.in
+++ doc/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
@@ -13,15 +14,12 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -49,22 +47,59 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -86,8 +121,6 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ERROR_CFLAGS = @ERROR_CFLAGS@
EXEEXT = @EXEEXT@
FARSIGHT2_CFLAGS = @FARSIGHT2_CFLAGS@
@@ -98,9 +131,8 @@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -117,6 +149,7 @@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
@@ -147,12 +180,12 @@
TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@
TELEPATHY_LIBS = @TELEPATHY_LIBS@
VERSION = @VERSION@
-WANT_PYTHON_FALSE = @WANT_PYTHON_FALSE@
-WANT_PYTHON_TRUE = @WANT_PYTHON_TRUE@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -164,6 +197,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -196,8 +230,12 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = lib
all: all-recursive
@@ -206,14 +244,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -231,6 +269,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -238,10 +277,6 @@
clean-libtool:
-rm -rf .libs _libs
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
@@ -249,7 +284,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -266,16 +301,15 @@
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -301,16 +335,16 @@
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -318,14 +352,14 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -337,81 +371,101 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
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; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- 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; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -441,6 +495,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -451,8 +506,7 @@
distclean: distclean-recursive
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
- distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-recursive
@@ -460,18 +514,38 @@
html: html-recursive
+html-am:
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -490,22 +564,25 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
- distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+ ctags ctags-recursive distclean 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-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ 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 installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-libtool \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-am
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- doc/lib/Makefile.in
+++ doc/lib/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
@@ -19,15 +20,12 @@
####################################
# Everything below here is generic #
####################################
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -56,13 +54,19 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -84,8 +88,6 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ERROR_CFLAGS = @ERROR_CFLAGS@
EXEEXT = @EXEEXT@
FARSIGHT2_CFLAGS = @FARSIGHT2_CFLAGS@
@@ -96,9 +98,8 @@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -115,6 +116,7 @@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
@@ -145,12 +147,12 @@
TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@
TELEPATHY_LIBS = @TELEPATHY_LIBS@
VERSION = @VERSION@
-WANT_PYTHON_FALSE = @WANT_PYTHON_FALSE@
-WANT_PYTHON_TRUE = @WANT_PYTHON_TRUE@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -162,6 +164,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -194,9 +197,12 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-abs_top_builddir = @abs_top_builddir@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
# We require automake 1.6 at least.
AUTOMAKE_OPTIONS = 1.6
@@ -322,14 +328,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/lib/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/lib/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/lib/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/lib/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -347,16 +353,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
tags: TAGS
TAGS:
@@ -365,30 +368,32 @@
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/../..
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -422,6 +427,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -432,8 +438,7 @@
distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
- distclean-local
+distclean-am: clean-am distclean-generic distclean-local
dvi: dvi-am
@@ -441,18 +446,38 @@
html: html-am
+html-am:
+
info: info-am
info-am:
install-data-am: install-data-local
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -472,19 +497,23 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
+
+.MAKE: check-am install-am install-strip
.PHONY: all all-am all-local check check-am check-local clean \
clean-generic clean-libtool clean-local dist-hook distclean \
distclean-generic distclean-libtool distclean-local distdir \
dvi dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-data-local install-exec \
- install-exec-am install-info install-info-am install-man \
+ install-data install-data-am install-data-local 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 \
maintainer-clean-local mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am uninstall-local
+ uninstall-local
@ENABLE_GTK_DOC_TRUE at all-local: html-build.stamp
@@ -622,6 +651,7 @@
@ENABLE_GTK_DOC_TRUE@ @if test -e $(srcdir)/telepathy-farsight-undeclared.txt &&\
@ENABLE_GTK_DOC_TRUE@ grep . $(srcdir)/telepathy-farsight-undeclared.txt; then\
@ENABLE_GTK_DOC_TRUE@ echo "^^^ Undeclared symbols" >&2; exit 1; fi
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--- doc/lib/html/TfChannel.html
+++ doc/lib/html/TfChannel.html
@@ -3,12 +3,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>TfChannel</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="index.html" title="telepathy-farsight Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="telepathy-farsight Reference Manual">
<link rel="up" href="ch01.html" title="Telepathy Farsight Wrapper Classes">
<link rel="prev" href="ch01.html" title="Telepathy Farsight Wrapper Classes">
<link rel="next" href="TfStream.html" title="TfStream">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.13 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
<link rel="chapter" href="ch01.html" title="Telepathy Farsight Wrapper Classes">
</head>
@@ -23,17 +23,17 @@
</tr>
<tr><td colspan="5" class="shortcuts">
<a href="#TfChannel.synopsis" class="shortcut">Top</a>
- |
- <a href="#TfChannel.description" class="shortcut">Description</a>
- |
- <a href="#TfChannel.object-hierarchy" class="shortcut">Object Hierarchy</a>
- |
- <a href="#TfChannel.properties" class="shortcut">Properties</a>
- |
- <a href="#TfChannel.signals" class="shortcut">Signals</a>
+ |
+ <a href="#TfChannel.description" class="shortcut">Description</a>
+ |
+ <a href="#TfChannel.object-hierarchy" class="shortcut">Object Hierarchy</a>
+ |
+ <a href="#TfChannel.properties" class="shortcut">Properties</a>
+ |
+ <a href="#TfChannel.signals" class="shortcut">Signals</a>
</td></tr>
</table>
-<div class="refentry" lang="en">
+<div class="refentry" title="TfChannel">
<a name="TfChannel"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
@@ -42,73 +42,42 @@
</td>
<td valign="top" align="right"></td>
</tr></table></div>
-<div class="refsynopsisdiv">
+<div class="refsynopsisdiv" title="Synopsis">
<a name="TfChannel.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
- <a class="link" href="TfChannel.html#TfChannel-struct" title="TfChannel">TfChannel</a>;
+<pre class="synopsis"> <a class="link" href="TfChannel.html#TfChannel-struct" title="TfChannel">TfChannel</a>;
<a class="link" href="TfChannel.html#TfChannelClass" title="TfChannelClass">TfChannelClass</a>;
-<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> * <a class="link" href="TfChannel.html#tf-channel-new" title="tf_channel_new ()">tf_channel_new</a> (<a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html#TpChannel"
->TpChannel</a> *channel_proxy);
-<a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> <a class="link" href="TfChannel.html#tf-channel-error" title="tf_channel_error ()">tf_channel_error</a> (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *chan,
- <a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamError"
->TpMediaStreamError</a> error,
- const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a> *message);
-<a class="link" href="TfStream.html" title="TfStream">TfStream</a> * <a class="link" href="TfChannel.html#tf-channel-lookup-stream" title="tf_channel_lookup_stream ()">tf_channel_lookup_stream</a> (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *chan,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> stream_id);
-<a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> (<a class="link" href="TfChannel.html#TfChannelStreamFunc" title="TfChannelStreamFunc ()">*TfChannelStreamFunc</a>) (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *chan,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> stream_id,
- <a class="link" href="TfStream.html" title="TfStream">TfStream</a> *stream,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data);
-<a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> <a class="link" href="TfChannel.html#tf-channel-foreach-stream" title="tf_channel_foreach_stream ()">tf_channel_foreach_stream</a> (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *chan,
- <a class="link" href="TfChannel.html#TfChannelStreamFunc" title="TfChannelStreamFunc ()">TfChannelStreamFunc</a> func,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data);
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a> <a class="link" href="TfChannel.html#tf-channel-bus-message" title="tf_channel_bus_message ()">tf_channel_bus_message</a> (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *channel,
- <a
-href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GstMessage"
->GstMessage</a> *message);
+<a class="link" href="TfChannel.html" title="TfChannel"><span class="returnvalue">TfChannel</span></a> * <a class="link" href="TfChannel.html#tf-channel-new" title="tf_channel_new ()">tf_channel_new</a> (<a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html#TpChannel"><span class="returnvalue">TpChannel</span></a> *channel_proxy);
+<span class="returnvalue">void</span> <a class="link" href="TfChannel.html#tf-channel-error" title="tf_channel_error ()">tf_channel_error</a> (<a class="link" href="TfChannel.html" title="TfChannel"><span class="returnvalue">TfChannel</span></a> *chan,
+ <a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamError"><span class="returnvalue">TpMediaStreamError</span></a> error,
+ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *message);
+<a class="link" href="TfStream.html" title="TfStream"><span class="returnvalue">TfStream</span></a> * <a class="link" href="TfChannel.html#tf-channel-lookup-stream" title="tf_channel_lookup_stream ()">tf_channel_lookup_stream</a> (<a class="link" href="TfChannel.html" title="TfChannel"><span class="returnvalue">TfChannel</span></a> *chan,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> stream_id);
+<span class="returnvalue">void</span> (<a class="link" href="TfChannel.html#TfChannelStreamFunc" title="TfChannelStreamFunc ()">*TfChannelStreamFunc</a>) (<a class="link" href="TfChannel.html" title="TfChannel"><span class="returnvalue">TfChannel</span></a> *chan,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> stream_id,
+ <a class="link" href="TfStream.html" title="TfStream"><span class="returnvalue">TfStream</span></a> *stream,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> user_data);
+<span class="returnvalue">void</span> <a class="link" href="TfChannel.html#tf-channel-foreach-stream" title="tf_channel_foreach_stream ()">tf_channel_foreach_stream</a> (<a class="link" href="TfChannel.html" title="TfChannel"><span class="returnvalue">TfChannel</span></a> *chan,
+ <a class="link" href="TfChannel.html#TfChannelStreamFunc" title="TfChannelStreamFunc ()"><span class="returnvalue">TfChannelStreamFunc</span></a> func,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> user_data);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="TfChannel.html#tf-channel-bus-message" title="tf_channel_bus_message ()">tf_channel_bus_message</a> (<a class="link" href="TfChannel.html" title="TfChannel"><span class="returnvalue">TfChannel</span></a> *channel,
+ <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GstMessage"><span class="returnvalue">GstMessage</span></a> *message);
</pre>
</div>
-<div class="refsect1" lang="en">
+<div class="refsect1" title="Object Hierarchy">
<a name="TfChannel.object-hierarchy"></a><h2>Object Hierarchy</h2>
<pre class="synopsis">
- <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
->GObject</a>
+ <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+----TfChannel
</pre>
</div>
-<div class="refsect1" lang="en">
+<div class="refsect1" title="Properties">
<a name="TfChannel.properties"></a><h2>Properties</h2>
<pre class="synopsis">
- "<a class="link" href="TfChannel.html#TfChannel--channel" title='The "channel" property'>channel</a>" <a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html#TpChannel"
->TpChannel</a>* : Read / Write / Construct Only
- "<a class="link" href="TfChannel.html#TfChannel--object-path" title='The "object-path" property'>object-path</a>" <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a>* : Read
+ "<a class="link" href="TfChannel.html#TfChannel--channel" title='The "channel" property'>channel</a>" <a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a>* : Read / Write / Construct Only
+ "<a class="link" href="TfChannel.html#TfChannel--object-path" title='The "object-path" property'>object-path</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read
</pre>
</div>
-<div class="refsect1" lang="en">
+<div class="refsect1" title="Signals">
<a name="TfChannel.signals"></a><h2>Signals</h2>
<pre class="synopsis">
"<a class="link" href="TfChannel.html#TfChannel-closed" title='The "closed" signal'>closed</a>" : Run Last
@@ -119,27 +88,23 @@
"<a class="link" href="TfChannel.html#TfChannel-stream-get-codec-config" title='The "stream-get-codec-config" signal'>stream-get-codec-config</a>" : Run Last / Has Details
</pre>
</div>
-<div class="refsect1" lang="en">
+<div class="refsect1" title="Description">
<a name="TfChannel.description"></a><h2>Description</h2>
<p>
This class handles the
org.freedesktop.Telepathy.Channel.Interface.MediaSignalling on a
channel using Farsight2.</p>
-<p>
-</p>
</div>
-<div class="refsect1" lang="en">
+<div class="refsect1" title="Details">
<a name="TfChannel.details"></a><h2>Details</h2>
-<div class="refsect2" lang="en">
+<div class="refsect2" title="TfChannel">
<a name="TfChannel-struct"></a><h3>TfChannel</h3>
<pre class="programlisting">typedef struct _TfChannel TfChannel;</pre>
<p>
All members of the object are private</p>
-<p>
-</p>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title="TfChannelClass">
<a name="TfChannelClass"></a><h3>TfChannelClass</h3>
<pre class="programlisting">typedef struct {
GObjectClass parent_class;
@@ -147,37 +112,27 @@
</pre>
<p>
There are no overridable functions</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
-<td><p><span class="term"><a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass"
->GObjectClass</a> <em class="structfield"><code>parent_class</code></em>;</span></p></td>
+<td><p><span class="term"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> <em class="structfield"><code><a name="TfChannelClass.parent-class"></a>parent_class</code></em>;</span></p></td>
<td> the parent <span class="type">GObjecClass</span>
</td>
</tr></tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title="tf_channel_new ()">
<a name="tf-channel-new"></a><h3>tf_channel_new ()</h3>
-<pre class="programlisting"><a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> * tf_channel_new (<a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html#TpChannel"
->TpChannel</a> *channel_proxy);</pre>
+<pre class="programlisting"><a class="link" href="TfChannel.html" title="TfChannel"><span class="returnvalue">TfChannel</span></a> * tf_channel_new (<a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html#TpChannel"><span class="returnvalue">TpChannel</span></a> *channel_proxy);</pre>
<p>
Creates a new <a class="link" href="TfChannel.html" title="TfChannel"><span class="type">TfChannel</span></a> from an existing channel proxy</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>channel_proxy</code></em> :</span></p></td>
-<td> a <a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html#TpChannel"
-><span class="type">TpChannel</span></a> proxy
+<td> a <a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a> proxy
</td>
</tr>
<tr>
@@ -189,22 +144,14 @@
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title="tf_channel_error ()">
<a name="tf-channel-error"></a><h3>tf_channel_error ()</h3>
-<pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> tf_channel_error (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *chan,
- <a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamError"
->TpMediaStreamError</a> error,
- const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a> *message);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span> tf_channel_error (<a class="link" href="TfChannel.html" title="TfChannel"><span class="returnvalue">TfChannel</span></a> *chan,
+ <a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamError"><span class="returnvalue">TpMediaStreamError</span></a> error,
+ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *message);</pre>
<p>
Stops the channel and all stream related to it and sends an error to the
connection manager.</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -215,9 +162,7 @@
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> the error number of type <a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamError"
-><span class="type">TpMediaStreamError</span></a>
+<td> the error number of type <a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamError"><span class="type">TpMediaStreamError</span></a>
</td>
</tr>
<tr>
@@ -229,16 +174,12 @@
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title="tf_channel_lookup_stream ()">
<a name="tf-channel-lookup-stream"></a><h3>tf_channel_lookup_stream ()</h3>
-<pre class="programlisting"><a class="link" href="TfStream.html" title="TfStream">TfStream</a> * tf_channel_lookup_stream (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *chan,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> stream_id);</pre>
+<pre class="programlisting"><a class="link" href="TfStream.html" title="TfStream"><span class="returnvalue">TfStream</span></a> * tf_channel_lookup_stream (<a class="link" href="TfChannel.html" title="TfChannel"><span class="returnvalue">TfChannel</span></a> *chan,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> stream_id);</pre>
<p>
Finds the stream with the specified id if it exists.</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -254,31 +195,21 @@
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a class="link" href="TfStream.html" title="TfStream"><span class="type">TfStream</span></a> or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
+<td> a <a class="link" href="TfStream.html" title="TfStream"><span class="type">TfStream</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title="TfChannelStreamFunc ()">
<a name="TfChannelStreamFunc"></a><h3>TfChannelStreamFunc ()</h3>
-<pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> (*TfChannelStreamFunc) (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *chan,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> stream_id,
- <a class="link" href="TfStream.html" title="TfStream">TfStream</a> *stream,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span> (*TfChannelStreamFunc) (<a class="link" href="TfChannel.html" title="TfChannel"><span class="returnvalue">TfChannel</span></a> *chan,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> stream_id,
+ <a class="link" href="TfStream.html" title="TfStream"><span class="returnvalue">TfStream</span></a> *stream,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> user_data);</pre>
<p>
Callback function called on every stream by <a class="link" href="TfChannel.html#tf-channel-foreach-stream" title="tf_channel_foreach_stream ()"><code class="function">tf_channel_foreach_stream()</code></a></p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -306,19 +237,13 @@
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title="tf_channel_foreach_stream ()">
<a name="tf-channel-foreach-stream"></a><h3>tf_channel_foreach_stream ()</h3>
-<pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> tf_channel_foreach_stream (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *chan,
- <a class="link" href="TfChannel.html#TfChannelStreamFunc" title="TfChannelStreamFunc ()">TfChannelStreamFunc</a> func,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span> tf_channel_foreach_stream (<a class="link" href="TfChannel.html" title="TfChannel"><span class="returnvalue">TfChannel</span></a> *chan,
+ <a class="link" href="TfChannel.html#TfChannelStreamFunc" title="TfChannelStreamFunc ()"><span class="returnvalue">TfChannelStreamFunc</span></a> func,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> user_data);</pre>
<p>
Calls the function func on every stream inside this channel.</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -341,19 +266,13 @@
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title="tf_channel_bus_message ()">
<a name="tf-channel-bus-message"></a><h3>tf_channel_bus_message ()</h3>
-<pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a> tf_channel_bus_message (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *channel,
- <a
-href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GstMessage"
->GstMessage</a> *message);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> tf_channel_bus_message (<a class="link" href="TfChannel.html" title="TfChannel"><span class="returnvalue">TfChannel</span></a> *channel,
+ <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GstMessage"><span class="returnvalue">GstMessage</span></a> *message);</pre>
<p>
You must call this function on call messages received on the async bus.
-<span class="type">GstMessages</span> are not modified.</p>
-<p>
-</p>
+<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GstMessage"><span class="type">GstMessages</span></a> are not modified.</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -364,59 +283,43 @@
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>message</code></em> :</span></p></td>
-<td> A <a
-href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GstMessage"
-><span class="type">GstMessage</span></a> received from the bus
+<td> A <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GstMessage"><span class="type">GstMessage</span></a> received from the bus
</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the message has been handled, <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a> otherwise
+<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the message has been handled, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise
</td>
</tr>
</tbody>
</table></div>
</div>
</div>
-<div class="refsect1" lang="en">
+<div class="refsect1" title="Property Details">
<a name="TfChannel.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "channel" property'>
<a name="TfChannel--channel"></a><h3>The <code class="literal">"channel"</code> property</h3>
-<pre class="programlisting"> "channel" <a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html#TpChannel"
->TpChannel</a>* : Read / Write / Construct Only</pre>
+<pre class="programlisting"> "channel" <a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a>* : Read / Write / Construct Only</pre>
<p>Telepathy channel object which this media channel should operate on.</p>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "object-path" property'>
<a name="TfChannel--object-path"></a><h3>The <code class="literal">"object-path"</code> property</h3>
-<pre class="programlisting"> "object-path" <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a>* : Read</pre>
+<pre class="programlisting"> "object-path" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read</pre>
<p>D-Bus object path of the Telepathy channel which this channel operates on.</p>
<p>Default value: NULL</p>
</div>
</div>
-<div class="refsect1" lang="en">
+<div class="refsect1" title="Signal Details">
<a name="TfChannel.signal-details"></a><h2>Signal Details</h2>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "closed" signal'>
<a name="TfChannel-closed"></a><h3>The <code class="literal">"closed"</code> signal</h3>
-<pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> user_function (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *arg0,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data) : Run Last</pre>
+<pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="TfChannel.html" title="TfChannel"><span class="type">TfChannel</span></a> *arg0,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre>
<p>
This function is called after a channel is closed, either because
it has been closed by the connection manager or because we had a locally
generated error.</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
@@ -426,36 +329,20 @@
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "handler-result" signal'>
<a name="TfChannel-handler-result"></a><h3>The <code class="literal">"handler-result"</code> signal</h3>
-<pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> user_function (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *error,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> arg1,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data) : Run Last</pre>
-<p>
-This message is emitted when we are ready to handle the channel with <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a>
-or with an <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> if we can not handle the channel.</p>
+<pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="TfChannel.html" title="TfChannel"><span class="type">TfChannel</span></a> *error,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> arg1,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre>
<p>
-</p>
+This message is emitted when we are ready to handle the channel with <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+or with an <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> if we can not handle the channel.</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"
-><span class="type">GError</span></a> containing the error or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL--CAPS"
-><code class="literal">NULL</code></a> if there was no error
+<td> a <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> containing the error or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if there was no error
</td>
</tr>
<tr>
@@ -466,29 +353,17 @@
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "session-created" signal'>
<a name="TfChannel-session-created"></a><h3>The <code class="literal">"session-created"</code> signal</h3>
-<pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> user_function (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *tfchannel,
- <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"
->FsConference</a> *conference,
- <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsParticipant.html"
->FsParticipant</a> *participant,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data) : Run Last</pre>
+<pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="TfChannel.html" title="TfChannel"><span class="type">TfChannel</span></a> *tfchannel,
+ <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"><span class="type">FsConference</span></a> *conference,
+ <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsParticipant.html"><span class="type">FsParticipant</span></a> *participant,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre>
<p>
This signal is emitted when a new session has been created in the
-connection manager. The user should add the new <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"
-><span class="type">FsConference</span></a> to a pipeline
+connection manager. The user should add the new <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"><span class="type">FsConference</span></a> to a pipeline
and set it to playing. The user should also set any property he wants to
set.</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -499,16 +374,12 @@
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>conference</code></em> :</span></p></td>
-<td> the <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"
-><span class="type">FsConference</span></a> of the new session
+<td> the <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"><span class="type">FsConference</span></a> of the new session
</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>participant</code></em> :</span></p></td>
-<td> the <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsParticipant.html"
-><span class="type">FsParticipant</span></a> of the new session
+<td> the <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsParticipant.html"><span class="type">FsParticipant</span></a> of the new session
</td>
</tr>
<tr>
@@ -519,32 +390,16 @@
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "session-invalidated" signal'>
<a name="TfChannel-session-invalidated"></a><h3>The <code class="literal">"session-invalidated"</code> signal</h3>
-<pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> user_function (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *tfchannel,
- <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"
->FsConference</a> *conference,
- <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsParticipant.html"
->FsParticipant</a> *participant,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data) : Run Last</pre>
+<pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="TfChannel.html" title="TfChannel"><span class="type">TfChannel</span></a> *tfchannel,
+ <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"><span class="type">FsConference</span></a> *conference,
+ <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsParticipant.html"><span class="type">FsParticipant</span></a> *participant,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre>
<p>
This signal is emitted when a session has been invalidated.
-The <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"
-><span class="type">FsConference</span></a> and <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsParticipant.html"
-><span class="type">FsParticipant</span></a> for this session are returned.
-The <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"
-><span class="type">FsConference</span></a> should be removed from the pipeline.</p>
-<p>
-</p>
+The <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"><span class="type">FsConference</span></a> and <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsParticipant.html"><span class="type">FsParticipant</span></a> for this session are returned.
+The <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"><span class="type">FsConference</span></a> should be removed from the pipeline.</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -555,16 +410,12 @@
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>conference</code></em> :</span></p></td>
-<td> the <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"
-><span class="type">FsConference</span></a> of the new session
+<td> the <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"><span class="type">FsConference</span></a> of the new session
</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>participant</code></em> :</span></p></td>
-<td> the <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsParticipant.html"
-><span class="type">FsParticipant</span></a> of the new session
+<td> the <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsParticipant.html"><span class="type">FsParticipant</span></a> of the new session
</td>
</tr>
<tr>
@@ -575,20 +426,14 @@
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "stream-created" signal'>
<a name="TfChannel-stream-created"></a><h3>The <code class="literal">"stream-created"</code> signal</h3>
-<pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> user_function (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *tfchannel,
- <a class="link" href="TfStream.html" title="TfStream">TfStream</a> *stream,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data) : Run Last</pre>
+<pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="TfChannel.html" title="TfChannel"><span class="type">TfChannel</span></a> *tfchannel,
+ <a class="link" href="TfStream.html" title="TfStream"><span class="type">TfStream</span></a> *stream,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre>
<p>
This signal is emitted when a new stream has been created in the connection
manager and a local proxy has been generated.</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -610,26 +455,16 @@
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "stream-get-codec-config" signal'>
<a name="TfChannel-stream-get-codec-config"></a><h3>The <code class="literal">"stream-get-codec-config"</code> signal</h3>
-<pre class="programlisting">FsCodecGList* user_function (<a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a> *tfchannel,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> stream_id,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> media_type,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> direction,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data) : Run Last / Has Details</pre>
+<pre class="programlisting"><span class="returnvalue">FsCodecGList</span>* user_function (<a class="link" href="TfChannel.html" title="TfChannel"><span class="type">TfChannel</span></a> *tfchannel,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> stream_id,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> media_type,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> direction,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last / Has Details</pre>
<p>
This is emitted when a new stream is created and allows the caller to
specify his codec preferences.</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -645,16 +480,12 @@
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>media_type</code></em> :</span></p></td>
-<td> The <a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamType"
-><span class="type">TpMediaStreamType</span></a> of the stream
+<td> The <a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamType"><span class="type">TpMediaStreamType</span></a> of the stream
</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>direction</code></em> :</span></p></td>
-<td> The <a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamDirection"
-><span class="type">TpMediaStreamDirection</span></a> of the stream
+<td> The <a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamDirection"><span class="type">TpMediaStreamDirection</span></a> of the stream
</td>
</tr>
<tr>
@@ -663,11 +494,7 @@
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"
-><span class="type">GList</span></a> of <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/farsight2-libs-FsCodec.html#FsCodec"
-><span class="type">FsCodec</span></a>
+<td> a <a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> of <a href="http://farsight.freedesktop.org/apidoc/farsight2/farsight2-libs-FsCodec.html#FsCodec"><span class="type">FsCodec</span></a>
</td>
</tr>
</tbody>
@@ -677,6 +504,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.11</div>
+ Generated by GTK-Doc V1.13</div>
</body>
-</html>
+</html>
\ No newline at end of file
--- doc/lib/html/TfStream.html
+++ doc/lib/html/TfStream.html
@@ -3,11 +3,11 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>TfStream</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="index.html" title="telepathy-farsight Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="telepathy-farsight Reference Manual">
<link rel="up" href="ch01.html" title="Telepathy Farsight Wrapper Classes">
<link rel="prev" href="TfChannel.html" title="TfChannel">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.13 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
<link rel="chapter" href="ch01.html" title="Telepathy Farsight Wrapper Classes">
</head>
@@ -22,17 +22,17 @@
</tr>
<tr><td colspan="5" class="shortcuts">
<a href="#TfStream.synopsis" class="shortcut">Top</a>
- |
- <a href="#TfStream.description" class="shortcut">Description</a>
- |
- <a href="#TfStream.object-hierarchy" class="shortcut">Object Hierarchy</a>
- |
- <a href="#TfStream.properties" class="shortcut">Properties</a>
- |
- <a href="#TfStream.signals" class="shortcut">Signals</a>
+ |
+ <a href="#TfStream.description" class="shortcut">Description</a>
+ |
+ <a href="#TfStream.object-hierarchy" class="shortcut">Object Hierarchy</a>
+ |
+ <a href="#TfStream.properties" class="shortcut">Properties</a>
+ |
+ <a href="#TfStream.signals" class="shortcut">Signals</a>
</td></tr>
</table>
-<div class="refentry" lang="en">
+<div class="refentry" title="TfStream">
<a name="TfStream"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
@@ -41,69 +41,43 @@
</td>
<td valign="top" align="right"></td>
</tr></table></div>
-<div class="refsynopsisdiv">
+<div class="refsynopsisdiv" title="Synopsis">
<a name="TfStream.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
- <a class="link" href="TfStream.html#TfStream-struct" title="TfStream">TfStream</a>;
+<pre class="synopsis"> <a class="link" href="TfStream.html#TfStream-struct" title="TfStream">TfStream</a>;
<a class="link" href="TfStream.html#TfStreamClass" title="TfStreamClass">TfStreamClass</a>;
-<a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> <a class="link" href="TfStream.html#tf-stream-error" title="tf_stream_error ()">tf_stream_error</a> (<a class="link" href="TfStream.html" title="TfStream">TfStream</a> *self,
- <a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamError"
->TpMediaStreamError</a> error,
- const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a> *message);
-<a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> <a class="link" href="TfStream.html#tf-stream-get-id" title="tf_stream_get_id ()">tf_stream_get_id</a> (<a class="link" href="TfStream.html" title="TfStream">TfStream</a> *stream);
+<span class="returnvalue">void</span> <a class="link" href="TfStream.html#tf-stream-error" title="tf_stream_error ()">tf_stream_error</a> (<a class="link" href="TfStream.html" title="TfStream"><span class="returnvalue">TfStream</span></a> *self,
+ <a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamError"><span class="returnvalue">TpMediaStreamError</span></a> error,
+ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *message);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> <a class="link" href="TfStream.html#tf-stream-get-id" title="tf_stream_get_id ()">tf_stream_get_id</a> (<a class="link" href="TfStream.html" title="TfStream"><span class="returnvalue">TfStream</span></a> *stream);
</pre>
</div>
-<div class="refsect1" lang="en">
+<div class="refsect1" title="Object Hierarchy">
<a name="TfStream.object-hierarchy"></a><h2>Object Hierarchy</h2>
<pre class="synopsis">
- <a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"
->GObject</a>
+ <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
+----TfStream
</pre>
</div>
-<div class="refsect1" lang="en">
+<div class="refsect1" title="Properties">
<a name="TfStream.properties"></a><h2>Properties</h2>
<pre class="synopsis">
- "<a class="link" href="TfStream.html#TfStream--channel" title='The "channel" property'>channel</a>" <a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a>* : Read / Write / Construct Only
- "<a class="link" href="TfStream.html#TfStream--codec-preferences" title='The "codec-preferences" property'>codec-preferences</a>" FsCodecGList* : Read / Write / Construct Only
- "<a class="link" href="TfStream.html#TfStream--direction" title='The "direction" property'>direction</a>" <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> : Read / Write / Construct Only
- "<a class="link" href="TfStream.html#TfStream--farsight-conference" title='The "farsight-conference" property'>farsight-conference</a>" <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"
->FsConference</a>* : Read / Write / Construct Only
- "<a class="link" href="TfStream.html#TfStream--farsight-participant" title='The "farsight-participant" property'>farsight-participant</a>" <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsParticipant.html"
->FsParticipant</a>* : Read / Write / Construct Only
- "<a class="link" href="TfStream.html#TfStream--media-type" title='The "media-type" property'>media-type</a>" <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> : Read / Write / Construct Only
- "<a class="link" href="TfStream.html#TfStream--nat-properties" title='The "nat-properties" property'>nat-properties</a>" <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> : Write / Construct Only
- "<a class="link" href="TfStream.html#TfStream--proxy" title='The "proxy" property'>proxy</a>" <a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-media-interfaces.html#TpMediaStreamHandler"
->TpMediaStreamHandler</a>* : Read / Write / Construct Only
- "<a class="link" href="TfStream.html#TfStream--sink-pad" title='The "sink-pad" property'>sink-pad</a>" <a
-href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"
->GstPad</a>* : Read
- "<a class="link" href="TfStream.html#TfStream--stream-id" title='The "stream-id" property'>stream-id</a>" <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> : Read / Write / Construct Only
- "<a class="link" href="TfStream.html#TfStream--tos" title='The "tos" property'>tos</a>" <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> : Read / Write
+ "<a class="link" href="TfStream.html#TfStream--channel" title='The "channel" property'>channel</a>" <a class="link" href="TfChannel.html" title="TfChannel"><span class="type">TfChannel</span></a>* : Read / Write / Construct Only
+ "<a class="link" href="TfStream.html#TfStream--codec-preferences" title='The "codec-preferences" property'>codec-preferences</a>" <span class="type">FsCodecGList</span>* : Read / Write / Construct Only
+ "<a class="link" href="TfStream.html#TfStream--direction" title='The "direction" property'>direction</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct Only
+ "<a class="link" href="TfStream.html#TfStream--farsight-conference" title='The "farsight-conference" property'>farsight-conference</a>" <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"><span class="type">FsConference</span></a>* : Read / Write / Construct Only
+ "<a class="link" href="TfStream.html#TfStream--farsight-participant" title='The "farsight-participant" property'>farsight-participant</a>" <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsParticipant.html"><span class="type">FsParticipant</span></a>* : Read / Write / Construct Only
+ "<a class="link" href="TfStream.html#TfStream--farsight-session" title='The "farsight-session" property'>farsight-session</a>" <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsSession.html"><span class="type">FsSession</span></a>* : Read
+ "<a class="link" href="TfStream.html#TfStream--farsight-stream" title='The "farsight-stream" property'>farsight-stream</a>" <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsStream.html"><span class="type">FsStream</span></a>* : Read
+ "<a class="link" href="TfStream.html#TfStream--media-type" title='The "media-type" property'>media-type</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct Only
+ "<a class="link" href="TfStream.html#TfStream--nat-properties" title='The "nat-properties" property'>nat-properties</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> : Write / Construct Only
+ "<a class="link" href="TfStream.html#TfStream--proxy" title='The "proxy" property'>proxy</a>" <a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-media-interfaces.html#TpMediaStreamHandler"><span class="type">TpMediaStreamHandler</span></a>* : Read / Write / Construct Only
+ "<a class="link" href="TfStream.html#TfStream--resources" title='The "resources" property'>resources</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read
+ "<a class="link" href="TfStream.html#TfStream--sink-pad" title='The "sink-pad" property'>sink-pad</a>" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a>* : Read
+ "<a class="link" href="TfStream.html#TfStream--stream-id" title='The "stream-id" property'>stream-id</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct Only
+ "<a class="link" href="TfStream.html#TfStream--tos" title='The "tos" property'>tos</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write
</pre>
</div>
-<div class="refsect1" lang="en">
+<div class="refsect1" title="Signals">
<a name="TfStream.signals"></a><h2>Signals</h2>
<pre class="synopsis">
"<a class="link" href="TfStream.html#TfStream-closed" title='The "closed" signal'>closed</a>" : Run Last
@@ -113,31 +87,27 @@
"<a class="link" href="TfStream.html#TfStream-src-pad-added" title='The "src-pad-added" signal'>src-pad-added</a>" : Run Last
</pre>
</div>
-<div class="refsect1" lang="en">
+<div class="refsect1" title="Description">
<a name="TfStream.description"></a><h2>Description</h2>
<p>
These objects handle media streams and wrap the appropriate Farsight 2
objects. It is used to interact on a stream level with the other parts
of the media pipeline and the proper UI.</p>
-<p>
-</p>
</div>
-<div class="refsect1" lang="en">
+<div class="refsect1" title="Details">
<a name="TfStream.details"></a><h2>Details</h2>
-<div class="refsect2" lang="en">
+<div class="refsect2" title="TfStream">
<a name="TfStream-struct"></a><h3>TfStream</h3>
<pre class="programlisting">typedef struct _TfStream TfStream;</pre>
<p>
All other members are privated</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody></tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title="TfStreamClass">
<a name="TfStreamClass"></a><h3>TfStreamClass</h3>
<pre class="programlisting">typedef struct {
GObjectClass parent_class;
@@ -145,36 +115,24 @@
</pre>
<p>
There are no overridable functions</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
-<td><p><span class="term"><a
-href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass"
->GObjectClass</a> <em class="structfield"><code>parent_class</code></em>;</span></p></td>
+<td><p><span class="term"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> <em class="structfield"><code><a name="TfStreamClass.parent-class"></a>parent_class</code></em>;</span></p></td>
<td> the parent <span class="type">GObjecClass</span>
</td>
</tr></tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title="tf_stream_error ()">
<a name="tf-stream-error"></a><h3>tf_stream_error ()</h3>
-<pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> tf_stream_error (<a class="link" href="TfStream.html" title="TfStream">TfStream</a> *self,
- <a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamError"
->TpMediaStreamError</a> error,
- const <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"
->gchar</a> *message);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span> tf_stream_error (<a class="link" href="TfStream.html" title="TfStream"><span class="returnvalue">TfStream</span></a> *self,
+ <a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamError"><span class="returnvalue">TpMediaStreamError</span></a> error,
+ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *message);</pre>
<p>
This function can be used to tell the connection manager that an error
has happened on a specific stream.</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -185,9 +143,7 @@
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> the error number as a <a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamError"
-><span class="type">TpMediaStreamError</span></a>
+<td> the error number as a <a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html#TpMediaStreamError"><span class="type">TpMediaStreamError</span></a>
</td>
</tr>
<tr>
@@ -199,15 +155,11 @@
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title="tf_stream_get_id ()">
<a name="tf-stream-get-id"></a><h3>tf_stream_get_id ()</h3>
-<pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> tf_stream_get_id (<a class="link" href="TfStream.html" title="TfStream">TfStream</a> *stream);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> tf_stream_get_id (<a class="link" href="TfStream.html" title="TfStream"><span class="returnvalue">TfStream</span></a> *stream);</pre>
<p>
Quick getter for the stream id</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -225,114 +177,110 @@
</table></div>
</div>
</div>
-<div class="refsect1" lang="en">
+<div class="refsect1" title="Property Details">
<a name="TfStream.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "channel" property'>
<a name="TfStream--channel"></a><h3>The <code class="literal">"channel"</code> property</h3>
-<pre class="programlisting"> "channel" <a class="link" href="TfChannel.html" title="TfChannel">TfChannel</a>* : Read / Write / Construct Only</pre>
+<pre class="programlisting"> "channel" <a class="link" href="TfChannel.html" title="TfChannel"><span class="type">TfChannel</span></a>* : Read / Write / Construct Only</pre>
<p>The TfChannel this stream is in.</p>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "codec-preferences" property'>
<a name="TfStream--codec-preferences"></a><h3>The <code class="literal">"codec-preferences"</code> property</h3>
-<pre class="programlisting"> "codec-preferences" FsCodecGList* : Read / Write / Construct Only</pre>
+<pre class="programlisting"> "codec-preferences" <span class="type">FsCodecGList</span>* : Read / Write / Construct Only</pre>
<p>A GList of FsCodec representing preferences to be passed to the fs_session_set_local_preferences() function.</p>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "direction" property'>
<a name="TfStream--direction"></a><h3>The <code class="literal">"direction"</code> property</h3>
-<pre class="programlisting"> "direction" <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> : Read / Write / Construct Only</pre>
+<pre class="programlisting"> "direction" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct Only</pre>
<p>The Telepathy stream direction (a TpMediaStreamDirection).</p>
<p>Allowed values: <= 3</p>
<p>Default value: 3</p>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "farsight-conference" property'>
<a name="TfStream--farsight-conference"></a><h3>The <code class="literal">"farsight-conference"</code> property</h3>
-<pre class="programlisting"> "farsight-conference" <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"
->FsConference</a>* : Read / Write / Construct Only</pre>
+<pre class="programlisting"> "farsight-conference" <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsConference.html"><span class="type">FsConference</span></a>* : Read / Write / Construct Only</pre>
<p>The Farsight conference this stream will create streams within.</p>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "farsight-participant" property'>
<a name="TfStream--farsight-participant"></a><h3>The <code class="literal">"farsight-participant"</code> property</h3>
-<pre class="programlisting"> "farsight-participant" <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/FsParticipant.html"
->FsParticipant</a>* : Read / Write / Construct Only</pre>
+<pre class="programlisting"> "farsight-participant" <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsParticipant.html"><span class="type">FsParticipant</span></a>* : Read / Write / Construct Only</pre>
<p>The Farsight participant this stream will create streams for.</p>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "farsight-session" property'>
+<a name="TfStream--farsight-session"></a><h3>The <code class="literal">"farsight-session"</code> property</h3>
+<pre class="programlisting"> "farsight-session" <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsSession.html"><span class="type">FsSession</span></a>* : Read</pre>
+<p>The Farsight session.</p>
+</div>
+<hr>
+<div class="refsect2" title='The "farsight-stream" property'>
+<a name="TfStream--farsight-stream"></a><h3>The <code class="literal">"farsight-stream"</code> property</h3>
+<pre class="programlisting"> "farsight-stream" <a href="http://farsight.freedesktop.org/apidoc/farsight2/FsStream.html"><span class="type">FsStream</span></a>* : Read</pre>
+<p>The Farsight stream.</p>
+</div>
+<hr>
+<div class="refsect2" title='The "media-type" property'>
<a name="TfStream--media-type"></a><h3>The <code class="literal">"media-type"</code> property</h3>
-<pre class="programlisting"> "media-type" <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> : Read / Write / Construct Only</pre>
+<pre class="programlisting"> "media-type" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct Only</pre>
<p>The Telepathy stream media type (as a TpStreamMediaType).</p>
<p>Allowed values: <= 1</p>
<p>Default value: 0</p>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "nat-properties" property'>
<a name="TfStream--nat-properties"></a><h3>The <code class="literal">"nat-properties"</code> property</h3>
-<pre class="programlisting"> "nat-properties" <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> : Write / Construct Only</pre>
+<pre class="programlisting"> "nat-properties" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> : Write / Construct Only</pre>
<p>A pointer to a TfNatProperties structure detailing which NAT traversal method and parameters to use for this stream.</p>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "proxy" property'>
<a name="TfStream--proxy"></a><h3>The <code class="literal">"proxy"</code> property</h3>
-<pre class="programlisting"> "proxy" <a
-href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-media-interfaces.html#TpMediaStreamHandler"
->TpMediaStreamHandler</a>* : Read / Write / Construct Only</pre>
+<pre class="programlisting"> "proxy" <a href="/usr/share/gtk-doc/html/telepathy-glib/telepathy-glib-media-interfaces.html#TpMediaStreamHandler"><span class="type">TpMediaStreamHandler</span></a>* : Read / Write / Construct Only</pre>
<p>The stream handler proxy which this stream interacts with.</p>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "resources" property'>
+<a name="TfStream--resources"></a><h3>The <code class="literal">"resources"</code> property</h3>
+<pre class="programlisting"> "resources" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read</pre>
+<p>The resources held by a TpMediaStreamDirection.</p>
+<p>Allowed values: <= 3</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2" title='The "sink-pad" property'>
<a name="TfStream--sink-pad"></a><h3>The <code class="literal">"sink-pad"</code> property</h3>
-<pre class="programlisting"> "sink-pad" <a
-href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"
->GstPad</a>* : Read</pre>
+<pre class="programlisting"> "sink-pad" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a>* : Read</pre>
<p>This sink pad that data has to be sent.</p>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "stream-id" property'>
<a name="TfStream--stream-id"></a><h3>The <code class="literal">"stream-id"</code> property</h3>
-<pre class="programlisting"> "stream-id" <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> : Read / Write / Construct Only</pre>
+<pre class="programlisting"> "stream-id" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write / Construct Only</pre>
<p>A number identifying this stream within its channel.</p>
<p>Default value: 0</p>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "tos" property'>
<a name="TfStream--tos"></a><h3>The <code class="literal">"tos"</code> property</h3>
-<pre class="programlisting"> "tos" <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> : Read / Write</pre>
+<pre class="programlisting"> "tos" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write</pre>
<p>The IP Type of Service to set on sent packets.</p>
<p>Allowed values: <= 255</p>
<p>Default value: 0</p>
</div>
</div>
-<div class="refsect1" lang="en">
+<div class="refsect1" title="Signal Details">
<a name="TfStream.signal-details"></a><h2>Signal Details</h2>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "closed" signal'>
<a name="TfStream-closed"></a><h3>The <code class="literal">"closed"</code> signal</h3>
-<pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> user_function (<a class="link" href="TfStream.html" title="TfStream">TfStream</a> *stream,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data) : Run Last</pre>
+<pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="TfStream.html" title="TfStream"><span class="type">TfStream</span></a> *stream,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre>
<p>
This signal is emitted when the <code class="function">Close()</code> signal is received from the
connection manager.</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -349,18 +297,12 @@
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "error" signal'>
<a name="TfStream-error"></a><h3>The <code class="literal">"error"</code> signal</h3>
-<pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> user_function (<a class="link" href="TfStream.html" title="TfStream">TfStream</a> *stream,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data) : Run Last</pre>
+<pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="TfStream.html" title="TfStream"><span class="type">TfStream</span></a> *stream,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre>
<p>
This signal is emitted when there is an error on this stream</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -377,22 +319,14 @@
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "free-resource" signal'>
<a name="TfStream-free-resource"></a><h3>The <code class="literal">"free-resource"</code> signal</h3>
-<pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> user_function (<a class="link" href="TfStream.html" title="TfStream">TfStream</a> *stream,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> direction,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data) : Run Last</pre>
+<pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="TfStream.html" title="TfStream"><span class="type">TfStream</span></a> *stream,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> direction,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre>
<p>
Emitted when the stream no longer needs a resource allocated
from <a class="link" href="TfStream.html#TfStream-request-resource" title='The "request-resource" signal'><span class="type">"request-resource"</span></a> and it can be freed.</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -415,23 +349,15 @@
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "request-resource" signal'>
<a name="TfStream-request-resource"></a><h3>The <code class="literal">"request-resource"</code> signal</h3>
-<pre class="programlisting"><a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"
->gboolean</a> user_function (<a class="link" href="TfStream.html" title="TfStream">TfStream</a> *stream,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"
->guint</a> direction,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data) : Run Last</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> user_function (<a class="link" href="TfStream.html" title="TfStream"><span class="type">TfStream</span></a> *stream,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> direction,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre>
<p>
This signal is emitted when the connection manager ask to send or receive
media. For example, this can be used allocated an X window or open a
camera. The resouces can later be freed on <a class="link" href="TfStream.html#TfStream-free-resource" title='The "free-resource" signal'><span class="type">"free-resource"</span></a></p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -452,11 +378,7 @@
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE--CAPS"
-><code class="literal">TRUE</code></a> if the resources requested could be allocated or <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE--CAPS"
-><code class="literal">FALSE</code></a>
+<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the resources requested could be allocated or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>
otherwise
</td>
</tr>
@@ -464,25 +386,15 @@
</table></div>
</div>
<hr>
-<div class="refsect2" lang="en">
+<div class="refsect2" title='The "src-pad-added" signal'>
<a name="TfStream-src-pad-added"></a><h3>The <code class="literal">"src-pad-added"</code> signal</h3>
-<pre class="programlisting"><a
-href="/usr/share/gtk-doc/html/gnutls/gnutls-gnutls.html#void"
->void</a> user_function (<a class="link" href="TfStream.html" title="TfStream">TfStream</a> *stream,
- <a
-href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"
->GstPad</a> *pad,
- <a
-href="http://farsight.freedesktop.org/apidoc/farsight2/farsight2-libs-FsCodec.html#FsCodec"
->FsCodec</a> *codec,
- <a
-href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"
->gpointer</a> user_data) : Run Last</pre>
+<pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="TfStream.html" title="TfStream"><span class="type">TfStream</span></a> *stream,
+ <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad,
+ <a href="http://farsight.freedesktop.org/apidoc/farsight2/farsight2-libs-FsCodec.html#FsCodec"><span class="type">FsCodec</span></a> *codec,
+ <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre>
<p>
This is emitted when a new src pad comes out. The user must connect
this pad to his pipeline.</p>
-<p>
-</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
@@ -512,6 +424,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.11</div>
+ Generated by GTK-Doc V1.13</div>
</body>
-</html>
+</html>
\ No newline at end of file
--- doc/lib/html/ch01.html
+++ doc/lib/html/ch01.html
@@ -3,12 +3,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Telepathy Farsight Wrapper Classes</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="index.html" title="telepathy-farsight Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="telepathy-farsight Reference Manual">
<link rel="up" href="index.html" title="telepathy-farsight Reference Manual">
<link rel="prev" href="index.html" title="telepathy-farsight Reference Manual">
<link rel="next" href="TfChannel.html" title="TfChannel">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.13 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
<link rel="chapter" href="ch01.html" title="Telepathy Farsight Wrapper Classes">
</head>
@@ -20,9 +20,9 @@
<th width="100%" align="center">telepathy-farsight Reference Manual</th>
<td><a accesskey="n" href="TfChannel.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr></table>
-<div class="chapter" lang="en">
+<div class="chapter" title="Telepathy Farsight Wrapper Classes">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id2638864"></a>Telepathy Farsight Wrapper Classes</h2></div></div></div>
+<a name="id315798"></a>Telepathy Farsight Wrapper Classes</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="TfChannel.html">TfChannel</a></span><span class="refpurpose"> — Handle the MediaSignalling interface on a Channel</span>
@@ -34,6 +34,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.11</div>
+ Generated by GTK-Doc V1.13</div>
</body>
-</html>
+</html>
\ No newline at end of file
--- doc/lib/html/index.html
+++ doc/lib/html/index.html
@@ -3,15 +3,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>telepathy-farsight Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="index.html" title="telepathy-farsight Reference Manual">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="telepathy-farsight Reference Manual">
<link rel="next" href="ch01.html" title="Telepathy Farsight Wrapper Classes">
-<meta name="generator" content="GTK-Doc V1.11 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.13 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
<link rel="chapter" href="ch01.html" title="Telepathy Farsight Wrapper Classes">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<div class="book" lang="en">
+<div class="book" title="telepathy-farsight Reference Manual">
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">telepathy-farsight Reference Manual</p></th></tr></table></div>
@@ -36,6 +36,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.11</div>
+ Generated by GTK-Doc V1.13</div>
</body>
-</html>
+</html>
\ No newline at end of file
--- doc/lib/html/index.sgml
+++ doc/lib/html/index.sgml
@@ -41,9 +41,12 @@
<ANCHOR id="TfStream--direction" href="telepathy-farsight/TfStream.html#TfStream--direction">
<ANCHOR id="TfStream--farsight-conference" href="telepathy-farsight/TfStream.html#TfStream--farsight-conference">
<ANCHOR id="TfStream--farsight-participant" href="telepathy-farsight/TfStream.html#TfStream--farsight-participant">
+<ANCHOR id="TfStream--farsight-session" href="telepathy-farsight/TfStream.html#TfStream--farsight-session">
+<ANCHOR id="TfStream--farsight-stream" href="telepathy-farsight/TfStream.html#TfStream--farsight-stream">
<ANCHOR id="TfStream--media-type" href="telepathy-farsight/TfStream.html#TfStream--media-type">
<ANCHOR id="TfStream--nat-properties" href="telepathy-farsight/TfStream.html#TfStream--nat-properties">
<ANCHOR id="TfStream--proxy" href="telepathy-farsight/TfStream.html#TfStream--proxy">
+<ANCHOR id="TfStream--resources" href="telepathy-farsight/TfStream.html#TfStream--resources">
<ANCHOR id="TfStream--sink-pad" href="telepathy-farsight/TfStream.html#TfStream--sink-pad">
<ANCHOR id="TfStream--stream-id" href="telepathy-farsight/TfStream.html#TfStream--stream-id">
<ANCHOR id="TfStream--tos" href="telepathy-farsight/TfStream.html#TfStream--tos">
--- doc/lib/html/style.css
+++ doc/lib/html/style.css
@@ -1,13 +1,15 @@
.synopsis, .classsynopsis
{
- background: #eeeeee;
- border: solid 1px #aaaaaa;
+ /* tango:aluminium 1/2 */
+ background: #eeeeec;
+ border: solid 1px #d3d7cf;
padding: 0.5em;
}
.programlisting
{
- background: #eeeeff;
- border: solid 1px #aaaaff;
+ /* tango:sky blue 0/1 */
+ background: #e6f3ff;
+ border: solid 1px #729fcf;
padding: 0.5em;
}
.variablelist
@@ -20,64 +22,63 @@
vertical-align: top;
}
-/* this is needed so that the local anchors are displayed below the naviagtion */
@media screen {
sup a.footnote
{
position: relative;
top: 0em ! important;
+
}
- div.refnamediv a[name], div.refsect1 a[name]
+ /* this is needed so that the local anchors are displayed below the naviagtion */
+ div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
{
position: relative;
- top: -4.5em;
+ padding-top:4.5em;
}
+ /* this seems to be a bug in the xsl style sheets when generating indexes */
+ div.index div.index
+ {
+ top: 0em;
+ }
+ /* make space for the fixed navigation bar and add space at the bottom so that
+ * link targets appear somewhat close to top
+ */
+ body
+ {
+ padding-top: 3.2em;
+ padding-bottom: 20em;
+ }
+ /* style and size the navigation bar */
table.navigation#top
{
- background: #ffeeee;
- border: solid 1px #ffaaaa;
+ position: fixed;
+ /* tango:scarlet red 0/1 */
+ background: #ffe6e6;
+ border: solid 1px #ef2929;
margin-top: 0;
margin-bottom: 0;
- position: fixed;
top: 0;
left: 0;
- height: 2em;
- z-index: 1;
+ height: 3em;
+ z-index: 10;
}
- .navigation a
+ .navigation a, .navigation a:visited
{
- color: #770000;
+ /* tango:scarlet red 3 */
+ color: #a40000;
}
- .navigation a:visited
+ .navigation a:hover
{
- color: #550000;
+ /* tango:scarlet red 1 */
+ color: #ef2929;
}
td.shortcuts
{
- color: #770000;
+ /* tango:scarlet red 1 */
+ color: #ef2929;
font-size: 80%;
white-space: nowrap;
}
- div.refentry, div.chapter, div.reference, div.part, div.book, div.glossary, div.sect1, div.appendix, div.preface
- {
- position: relative;
- top: 3em;
- z-index: 0;
- }
- div.glossary, div.index
- {
- position: relative;
- top: 2em;
- z-index: 0;
- }
- div.refnamediv
- {
- margin-top: 2em;
- }
- body
- {
- padding-bottom: 20em;
- }
}
@media print {
table.navigation {
@@ -87,13 +88,14 @@
div.titlepage table.navigation {
visibility: visible;
display: table;
- background: #ffeeee;
- border: solid 1px #ffaaaa;
+ /* tango:scarlet red 0/1 */
+ background: #ffe6e6;
+ border: solid 1px #ef2929;
margin-top: 0;
margin-bottom: 0;
top: 0;
left: 0;
- height: 2em;
+ height: 3em;
}
}
@@ -102,7 +104,6 @@
font-size: 200%;
}
-
div.gallery-float
{
float: left;
@@ -116,44 +117,48 @@
{
clear: both;
}
-a
+
+a, a:visited
{
text-decoration: none;
+ /* tango:sky blue 2 */
+ color: #3465a4;
}
a:hover
{
text-decoration: underline;
- color: #FF0000;
+ /* tango:sky blue 1 */
+ color: #729fcf;
}
div.table table
{
border-collapse: collapse;
border-spacing: 0px;
- border-style: solid;
- border-color: #777777;
- border-width: 1px;
+ /* tango:aluminium 3 */
+ border: solid 1px #babdb6;
}
div.table table td, div.table table th
{
- border-style: solid;
- border-color: #777777;
- border-width: 1px;
+ /* tango:aluminium 3 */
+ border: solid 1px #babdb6;
padding: 3px;
vertical-align: top;
}
div.table table th
{
- background-color: #eeeeee;
+ /* tango:aluminium 2 */
+ background-color: #d3d7cf;
}
hr
{
- color: #777777;
- background: #777777;
- border: 0;
+ /* tango:aluminium 3 */
+ color: #babdb6;
+ background: #babdb6;
+ border: none 0px;
height: 1px;
clear: both;
}
@@ -161,7 +166,92 @@
.footer
{
padding-top: 3.5em;
- color: #777777;
+ /* tango:aluminium 3 */
+ color: #babdb6;
text-align: center;
font-size: 80%;
}
+
+.warning
+{
+ /* tango:orange 0/1 */
+ background: #ffeed9;
+ border-color: #ffb04f;
+}
+.note
+{
+ /* tango:chameleon 0/0.5 */
+ background: #d8ffb2;
+ border-color: #abf562;
+}
+.note, .warning
+{
+ padding: 0.5em;
+ border-width: 1px;
+ border-style: solid;
+}
+.note h3, .warning h3
+{
+ margin-top: 0.0em
+}
+.note p, .warning p
+{
+ margin-bottom: 0.0em
+}
+
+/* blob links */
+h2 .extralinks, h3 .extralinks
+{
+ float: right;
+ /* tango:aluminium 3 */
+ color: #babdb6;
+ font-size: 80%;
+ font-weight: normal;
+}
+
+/* code listings */
+
+.programlisting .cbracket { color: #a40000; } /* tango: scarlet red 3 */
+.programlisting .comment { color: #a1a39d; } /* tango: aluminium 4 */
+.programlisting .function { color: #000000; font-weight: bold; }
+.programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */
+.programlisting .keyword { color: #4e9a06; } /* tango: chameleon 3 */
+.programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */
+.programlisting .normal { color: #000000; }
+.programlisting .number { color: #75507b; } /* tango: plum 2 */
+.programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */
+.programlisting .string { color: #c17d11; } /* tango: chocolate 2 */
+.programlisting .type { color: #000000; }
+.programlisting .type a { color: #11326b; } /* tango: sky blue 4 */
+.programlisting .symbol { color: #ce5c00; } /* tango: orange 3 */
+
+.listing_frame {
+ /* tango:sky blue 1 */
+ border: solid 1px #729fcf;
+ padding: 0px;
+}
+
+.listing_lines, .listing_code {
+ margin-top: 0px;
+ margin-bottom: 0px;
+ padding: 0.5em;
+}
+.listing_lines {
+ /* tango:sky blue 0.5 */
+ background: #a6c5e3;
+ /* tango:aluminium 6 */
+ color: #2e3436;
+}
+.listing_code {
+ /* tango:sky blue 0 */
+ background: #e6f3ff;
+}
+.listing_code .programlisting {
+ /* override from previous */
+ border: none 0px;
+ padding: 0px;
+}
+.listing_lines pre, .listing_code pre {
+ margin: 0px;
+}
+
--- doc/lib/html/telepathy-farsight.devhelp
+++ doc/lib/html/telepathy-farsight.devhelp
@@ -33,9 +33,12 @@
<function name="The "direction" property" link="TfStream.html#TfStream--direction"/>
<function name="The "farsight-conference" property" link="TfStream.html#TfStream--farsight-conference"/>
<function name="The "farsight-participant" property" link="TfStream.html#TfStream--farsight-participant"/>
+ <function name="The "farsight-session" property" link="TfStream.html#TfStream--farsight-session"/>
+ <function name="The "farsight-stream" property" link="TfStream.html#TfStream--farsight-stream"/>
<function name="The "media-type" property" link="TfStream.html#TfStream--media-type"/>
<function name="The "nat-properties" property" link="TfStream.html#TfStream--nat-properties"/>
<function name="The "proxy" property" link="TfStream.html#TfStream--proxy"/>
+ <function name="The "resources" property" link="TfStream.html#TfStream--resources"/>
<function name="The "sink-pad" property" link="TfStream.html#TfStream--sink-pad"/>
<function name="The "stream-id" property" link="TfStream.html#TfStream--stream-id"/>
<function name="The "tos" property" link="TfStream.html#TfStream--tos"/>
--- doc/lib/html/telepathy-farsight.devhelp2
+++ doc/lib/html/telepathy-farsight.devhelp2
@@ -33,9 +33,12 @@
<keyword type="property" name="The "direction" property" link="TfStream.html#TfStream--direction"/>
<keyword type="property" name="The "farsight-conference" property" link="TfStream.html#TfStream--farsight-conference"/>
<keyword type="property" name="The "farsight-participant" property" link="TfStream.html#TfStream--farsight-participant"/>
+ <keyword type="property" name="The "farsight-session" property" link="TfStream.html#TfStream--farsight-session"/>
+ <keyword type="property" name="The "farsight-stream" property" link="TfStream.html#TfStream--farsight-stream"/>
<keyword type="property" name="The "media-type" property" link="TfStream.html#TfStream--media-type"/>
<keyword type="property" name="The "nat-properties" property" link="TfStream.html#TfStream--nat-properties"/>
<keyword type="property" name="The "proxy" property" link="TfStream.html#TfStream--proxy"/>
+ <keyword type="property" name="The "resources" property" link="TfStream.html#TfStream--resources"/>
<keyword type="property" name="The "sink-pad" property" link="TfStream.html#TfStream--sink-pad"/>
<keyword type="property" name="The "stream-id" property" link="TfStream.html#TfStream--stream-id"/>
<keyword type="property" name="The "tos" property" link="TfStream.html#TfStream--tos"/>
--- doc/lib/tmpl/channel.sgml
+++ doc/lib/tmpl/channel.sgml
@@ -9,11 +9,13 @@
</para>
+
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
+
<!-- ##### SECTION Stability_Level ##### -->
--- doc/lib/tmpl/stream.sgml
+++ doc/lib/tmpl/stream.sgml
@@ -9,11 +9,13 @@
</para>
+
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
+
<!-- ##### SECTION Stability_Level ##### -->
@@ -88,6 +90,16 @@
</para>
+<!-- ##### ARG TfStream:farsight-session ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG TfStream:farsight-stream ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG TfStream:media-type ##### -->
<para>
@@ -102,6 +114,11 @@
<para>
</para>
+
+<!-- ##### ARG TfStream:resources ##### -->
+<para>
+
+</para>
<!-- ##### ARG TfStream:sink-pad ##### -->
<para>
--- doc/lib/tmpl/telepathy-farsight-unused.sgml
+++ doc/lib/tmpl/telepathy-farsight-unused.sgml
-<!-- ##### FUNCTION tf_channel_new_from_proxy ##### -->
-<para>
-
-</para>
-
- at channel_proxy:
- at Returns:
-
--- doc/lib/xml/api-index-full.xml
+++ doc/lib/xml/api-index-full.xml
@@ -2,7 +2,7 @@
<!DOCTYPE indexdiv PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
<indexdiv>
-<indexdiv><title>T</title>
+<indexdiv><title>C</title>
<indexentry><primaryie linkends="TfChannel-struct"><link linkend="TfChannel-struct">TfChannel</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfChannel-closed"><link linkend="TfChannel-closed">TfChannel::closed</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfChannel-handler-result"><link linkend="TfChannel-handler-result">TfChannel::handler-result</link></primaryie></indexentry>
@@ -14,6 +14,13 @@
<indexentry><primaryie linkends="TfChannel--object-path"><link linkend="TfChannel--object-path">TfChannel:object-path</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfChannelClass"><link linkend="TfChannelClass">TfChannelClass</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfChannelStreamFunc"><link linkend="TfChannelStreamFunc">TfChannelStreamFunc</link></primaryie></indexentry>
+<indexentry><primaryie linkends="tf-channel-bus-message"><link linkend="tf-channel-bus-message">tf_channel_bus_message</link></primaryie></indexentry>
+<indexentry><primaryie linkends="tf-channel-error"><link linkend="tf-channel-error">tf_channel_error</link></primaryie></indexentry>
+<indexentry><primaryie linkends="tf-channel-foreach-stream"><link linkend="tf-channel-foreach-stream">tf_channel_foreach_stream</link></primaryie></indexentry>
+<indexentry><primaryie linkends="tf-channel-lookup-stream"><link linkend="tf-channel-lookup-stream">tf_channel_lookup_stream</link></primaryie></indexentry>
+<indexentry><primaryie linkends="tf-channel-new"><link linkend="tf-channel-new">tf_channel_new</link></primaryie></indexentry>
+</indexdiv>
+<indexdiv><title>S</title>
<indexentry><primaryie linkends="TfStream-struct"><link linkend="TfStream-struct">TfStream</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfStream-closed"><link linkend="TfStream-closed">TfStream::closed</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfStream-error"><link linkend="TfStream-error">TfStream::error</link></primaryie></indexentry>
@@ -25,18 +32,16 @@
<indexentry><primaryie linkends="TfStream--direction"><link linkend="TfStream--direction">TfStream:direction</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfStream--farsight-conference"><link linkend="TfStream--farsight-conference">TfStream:farsight-conference</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfStream--farsight-participant"><link linkend="TfStream--farsight-participant">TfStream:farsight-participant</link></primaryie></indexentry>
+<indexentry><primaryie linkends="TfStream--farsight-session"><link linkend="TfStream--farsight-session">TfStream:farsight-session</link></primaryie></indexentry>
+<indexentry><primaryie linkends="TfStream--farsight-stream"><link linkend="TfStream--farsight-stream">TfStream:farsight-stream</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfStream--media-type"><link linkend="TfStream--media-type">TfStream:media-type</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfStream--nat-properties"><link linkend="TfStream--nat-properties">TfStream:nat-properties</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfStream--proxy"><link linkend="TfStream--proxy">TfStream:proxy</link></primaryie></indexentry>
+<indexentry><primaryie linkends="TfStream--resources"><link linkend="TfStream--resources">TfStream:resources</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfStream--sink-pad"><link linkend="TfStream--sink-pad">TfStream:sink-pad</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfStream--stream-id"><link linkend="TfStream--stream-id">TfStream:stream-id</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfStream--tos"><link linkend="TfStream--tos">TfStream:tos</link></primaryie></indexentry>
<indexentry><primaryie linkends="TfStreamClass"><link linkend="TfStreamClass">TfStreamClass</link></primaryie></indexentry>
-<indexentry><primaryie linkends="tf-channel-bus-message"><link linkend="tf-channel-bus-message">tf_channel_bus_message</link></primaryie></indexentry>
-<indexentry><primaryie linkends="tf-channel-error"><link linkend="tf-channel-error">tf_channel_error</link></primaryie></indexentry>
-<indexentry><primaryie linkends="tf-channel-foreach-stream"><link linkend="tf-channel-foreach-stream">tf_channel_foreach_stream</link></primaryie></indexentry>
-<indexentry><primaryie linkends="tf-channel-lookup-stream"><link linkend="tf-channel-lookup-stream">tf_channel_lookup_stream</link></primaryie></indexentry>
-<indexentry><primaryie linkends="tf-channel-new"><link linkend="tf-channel-new">tf_channel_new</link></primaryie></indexentry>
<indexentry><primaryie linkends="tf-stream-error"><link linkend="tf-stream-error">tf_stream_error</link></primaryie></indexentry>
<indexentry><primaryie linkends="tf-stream-get-id"><link linkend="tf-stream-get-id">tf_stream_get_id</link></primaryie></indexentry>
</indexdiv>
--- doc/lib/xml/channel.xml
+++ doc/lib/xml/channel.xml
@@ -7,7 +7,6 @@
<manvolnum>3</manvolnum>
<refmiscinfo>TELEPATHY-FARSIGHT Library</refmiscinfo>
</refmeta>
-
<refnamediv>
<refname>TfChannel</refname>
<refpurpose>Handle the MediaSignalling interface on a Channel</refpurpose>
@@ -16,27 +15,25 @@
<refsynopsisdiv id="TfChannel.synopsis" role="synopsis">
<title role="synopsis.title">Synopsis</title>
-<synopsis>
- <link linkend="TfChannel-struct">TfChannel</link>;
+<synopsis> <link linkend="TfChannel-struct">TfChannel</link>;
<link linkend="TfChannelClass">TfChannelClass</link>;
-<link linkend="TfChannel">TfChannel</link> * <link linkend="tf-channel-new">tf_channel_new</link> (<link linkend="TpChannel">TpChannel</link> *channel_proxy);
-<link linkend="void">void</link> <link linkend="tf-channel-error">tf_channel_error</link> (<link linkend="TfChannel">TfChannel</link> *chan,
- <link linkend="TpMediaStreamError">TpMediaStreamError</link> error,
- const <link linkend="gchar">gchar</link> *message);
-<link linkend="TfStream">TfStream</link> * <link linkend="tf-channel-lookup-stream">tf_channel_lookup_stream</link> (<link linkend="TfChannel">TfChannel</link> *chan,
- <link linkend="guint">guint</link> stream_id);
-<link linkend="void">void</link> (<link linkend="TfChannelStreamFunc">*TfChannelStreamFunc</link>) (<link linkend="TfChannel">TfChannel</link> *chan,
- <link linkend="guint">guint</link> stream_id,
- <link linkend="TfStream">TfStream</link> *stream,
- <link linkend="gpointer">gpointer</link> user_data);
-<link linkend="void">void</link> <link linkend="tf-channel-foreach-stream">tf_channel_foreach_stream</link> (<link linkend="TfChannel">TfChannel</link> *chan,
- <link linkend="TfChannelStreamFunc">TfChannelStreamFunc</link> func,
- <link linkend="gpointer">gpointer</link> user_data);
-<link linkend="gboolean">gboolean</link> <link linkend="tf-channel-bus-message">tf_channel_bus_message</link> (<link linkend="TfChannel">TfChannel</link> *channel,
- <link linkend="GstMessage">GstMessage</link> *message);
+<link linkend="TfChannel"><returnvalue>TfChannel</returnvalue></link> * <link linkend="tf-channel-new">tf_channel_new</link> (<link linkend="TpChannel"><returnvalue>TpChannel</returnvalue></link> *channel_proxy);
+<link linkend="void"><returnvalue>void</returnvalue></link> <link linkend="tf-channel-error">tf_channel_error</link> (<link linkend="TfChannel"><returnvalue>TfChannel</returnvalue></link> *chan,
+ <link linkend="TpMediaStreamError"><returnvalue>TpMediaStreamError</returnvalue></link> error,
+ const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *message);
+<link linkend="TfStream"><returnvalue>TfStream</returnvalue></link> * <link linkend="tf-channel-lookup-stream">tf_channel_lookup_stream</link> (<link linkend="TfChannel"><returnvalue>TfChannel</returnvalue></link> *chan,
+ <link linkend="guint"><returnvalue>guint</returnvalue></link> stream_id);
+<link linkend="void"><returnvalue>void</returnvalue></link> (<link linkend="TfChannelStreamFunc">*TfChannelStreamFunc</link>) (<link linkend="TfChannel"><returnvalue>TfChannel</returnvalue></link> *chan,
+ <link linkend="guint"><returnvalue>guint</returnvalue></link> stream_id,
+ <link linkend="TfStream"><returnvalue>TfStream</returnvalue></link> *stream,
+ <link linkend="gpointer"><returnvalue>gpointer</returnvalue></link> user_data);
+<link linkend="void"><returnvalue>void</returnvalue></link> <link linkend="tf-channel-foreach-stream">tf_channel_foreach_stream</link> (<link linkend="TfChannel"><returnvalue>TfChannel</returnvalue></link> *chan,
+ <link linkend="TfChannelStreamFunc"><returnvalue>TfChannelStreamFunc</returnvalue></link> func,
+ <link linkend="gpointer"><returnvalue>gpointer</returnvalue></link> user_data);
+<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link> <link linkend="tf-channel-bus-message">tf_channel_bus_message</link> (<link linkend="TfChannel"><returnvalue>TfChannel</returnvalue></link> *channel,
+ <link linkend="GstMessage"><returnvalue>GstMessage</returnvalue></link> *message);
</synopsis>
</refsynopsisdiv>
-
<refsect1 id="TfChannel.object-hierarchy" role="object_hierarchy">
<title role="object_hierarchy.title">Object Hierarchy</title>
<synopsis>
@@ -44,19 +41,13 @@
+----TfChannel
</synopsis>
</refsect1>
-
-
-
-
-
<refsect1 id="TfChannel.properties" role="properties">
<title role="properties.title">Properties</title>
<synopsis>
- "<link linkend="TfChannel--channel">channel</link>" <link linkend="TpChannel">TpChannel</link>* : Read / Write / Construct Only
- "<link linkend="TfChannel--object-path">object-path</link>" <link linkend="gchar">gchar</link>* : Read
+ "<link linkend="TfChannel--channel">channel</link>" <link linkend="TpChannel"><type>TpChannel</type></link>* : Read / Write / Construct Only
+ "<link linkend="TfChannel--object-path">object-path</link>" <link linkend="gchar"><type>gchar</type></link>* : Read
</synopsis>
</refsect1>
-
<refsect1 id="TfChannel.signals" role="signal_proto">
<title role="signal_proto.title">Signals</title>
<synopsis>
@@ -69,49 +60,45 @@
</synopsis>
</refsect1>
-
<refsect1 id="TfChannel.description" role="desc">
<title role="desc.title">Description</title>
<para>
This class handles the
org.freedesktop.Telepathy.Channel.Interface.MediaSignalling on a
channel using Farsight2.</para>
-<para>
-</para>
-</refsect1>
+</refsect1>
<refsect1 id="TfChannel.details" role="details">
<title role="details.title">Details</title>
<refsect2 id="TfChannel-struct" role="struct">
<title>TfChannel</title>
-<indexterm zone="TfChannel-struct"><primary sortas="TfChannel">TfChannel</primary></indexterm><programlisting>typedef struct _TfChannel TfChannel;</programlisting>
+<indexterm zone="TfChannel-struct"><primary>TfChannel</primary></indexterm>
+<programlisting>typedef struct _TfChannel TfChannel;</programlisting>
<para>
All members of the object are private</para>
-<para>
-</para></refsect2>
+</refsect2>
<refsect2 id="TfChannelClass" role="struct">
<title>TfChannelClass</title>
-<indexterm zone="TfChannelClass"><primary sortas="TfChannelClass">TfChannelClass</primary></indexterm><programlisting>typedef struct {
+<indexterm zone="TfChannelClass"><primary>TfChannelClass</primary></indexterm>
+<programlisting>typedef struct {
GObjectClass parent_class;
} TfChannelClass;
</programlisting>
<para>
There are no overridable functions</para>
-<para>
-</para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="GObjectClass">GObjectClass</link> <structfield>parent_class</structfield>;</term>
+<variablelist role="struct">
+<varlistentry><term><link linkend="GObjectClass"><type>GObjectClass</type></link> <structfield id="TfChannelClass.parent-class">parent_class</structfield>;</term>
<listitem><simpara> the parent <link linkend="GObjecClass"><type>GObjecClass</type></link>
</simpara></listitem>
</varlistentry>
</variablelist></refsect2>
<refsect2 id="tf-channel-new" role="function">
<title>tf_channel_new ()</title>
-<indexterm zone="tf-channel-new"><primary sortas="tf_channel_new">tf_channel_new</primary></indexterm><programlisting><link linkend="TfChannel">TfChannel</link> * tf_channel_new (<link linkend="TpChannel">TpChannel</link> *channel_proxy);</programlisting>
+<indexterm zone="tf-channel-new"><primary>tf_channel_new</primary></indexterm>
+<programlisting><link linkend="TfChannel"><returnvalue>TfChannel</returnvalue></link> * tf_channel_new (<link linkend="TpChannel"><returnvalue>TpChannel</returnvalue></link> *channel_proxy);</programlisting>
<para>
Creates a new <link linkend="TfChannel"><type>TfChannel</type></link> from an existing channel proxy</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>channel_proxy</parameter> :</term>
<listitem><simpara> a <link linkend="TpChannel"><type>TpChannel</type></link> proxy
</simpara></listitem></varlistentry>
@@ -120,14 +107,14 @@
</variablelist></refsect2>
<refsect2 id="tf-channel-error" role="function">
<title>tf_channel_error ()</title>
-<indexterm zone="tf-channel-error"><primary sortas="tf_channel_error">tf_channel_error</primary></indexterm><programlisting><link linkend="void">void</link> tf_channel_error (<link linkend="TfChannel">TfChannel</link> *chan,
- <link linkend="TpMediaStreamError">TpMediaStreamError</link> error,
- const <link linkend="gchar">gchar</link> *message);</programlisting>
+<indexterm zone="tf-channel-error"><primary>tf_channel_error</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> tf_channel_error (<link linkend="TfChannel"><returnvalue>TfChannel</returnvalue></link> *chan,
+ <link linkend="TpMediaStreamError"><returnvalue>TpMediaStreamError</returnvalue></link> error,
+ const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *message);</programlisting>
<para>
Stops the channel and all stream related to it and sends an error to the
connection manager.</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>chan</parameter> :</term>
<listitem><simpara> a <link linkend="TfChannel"><type>TfChannel</type></link>
</simpara></listitem></varlistentry>
@@ -140,31 +127,31 @@
</variablelist></refsect2>
<refsect2 id="tf-channel-lookup-stream" role="function">
<title>tf_channel_lookup_stream ()</title>
-<indexterm zone="tf-channel-lookup-stream"><primary sortas="tf_channel_lookup_stream">tf_channel_lookup_stream</primary></indexterm><programlisting><link linkend="TfStream">TfStream</link> * tf_channel_lookup_stream (<link linkend="TfChannel">TfChannel</link> *chan,
- <link linkend="guint">guint</link> stream_id);</programlisting>
+<indexterm zone="tf-channel-lookup-stream"><primary>tf_channel_lookup_stream</primary></indexterm>
+<programlisting><link linkend="TfStream"><returnvalue>TfStream</returnvalue></link> * tf_channel_lookup_stream (<link linkend="TfChannel"><returnvalue>TfChannel</returnvalue></link> *chan,
+ <link linkend="guint"><returnvalue>guint</returnvalue></link> stream_id);</programlisting>
<para>
Finds the stream with the specified id if it exists.</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>chan</parameter> :</term>
<listitem><simpara> a <link linkend="TfChannel"><type>TfChannel</type></link>
</simpara></listitem></varlistentry>
<varlistentry><term><parameter>stream_id</parameter> :</term>
<listitem><simpara> the stream id to look for
</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> a <link linkend="TfStream"><type>TfStream</type></link> or <link linkend="NULL--CAPS"><literal>NULL</literal></link>
+<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> a <link linkend="TfStream"><type>TfStream</type></link> or <link linkend="NULL:CAPS"><literal>NULL</literal></link>
</simpara></listitem></varlistentry>
</variablelist></refsect2>
<refsect2 id="TfChannelStreamFunc" role="function">
<title>TfChannelStreamFunc ()</title>
-<indexterm zone="TfChannelStreamFunc"><primary sortas="TfChannelStreamFunc">TfChannelStreamFunc</primary></indexterm><programlisting><link linkend="void">void</link> (*TfChannelStreamFunc) (<link linkend="TfChannel">TfChannel</link> *chan,
- <link linkend="guint">guint</link> stream_id,
- <link linkend="TfStream">TfStream</link> *stream,
- <link linkend="gpointer">gpointer</link> user_data);</programlisting>
+<indexterm zone="TfChannelStreamFunc"><primary>TfChannelStreamFunc</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> (*TfChannelStreamFunc) (<link linkend="TfChannel"><returnvalue>TfChannel</returnvalue></link> *chan,
+ <link linkend="guint"><returnvalue>guint</returnvalue></link> stream_id,
+ <link linkend="TfStream"><returnvalue>TfStream</returnvalue></link> *stream,
+ <link linkend="gpointer"><returnvalue>gpointer</returnvalue></link> user_data);</programlisting>
<para>
Callback function called on every stream by <link linkend="tf-channel-foreach-stream"><function>tf_channel_foreach_stream()</function></link></para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>chan</parameter> :</term>
<listitem><simpara> The <link linkend="TpMediaChannel"><type>TpMediaChannel</type></link>
</simpara></listitem></varlistentry>
@@ -180,13 +167,13 @@
</variablelist></refsect2>
<refsect2 id="tf-channel-foreach-stream" role="function">
<title>tf_channel_foreach_stream ()</title>
-<indexterm zone="tf-channel-foreach-stream"><primary sortas="tf_channel_foreach_stream">tf_channel_foreach_stream</primary></indexterm><programlisting><link linkend="void">void</link> tf_channel_foreach_stream (<link linkend="TfChannel">TfChannel</link> *chan,
- <link linkend="TfChannelStreamFunc">TfChannelStreamFunc</link> func,
- <link linkend="gpointer">gpointer</link> user_data);</programlisting>
+<indexterm zone="tf-channel-foreach-stream"><primary>tf_channel_foreach_stream</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> tf_channel_foreach_stream (<link linkend="TfChannel"><returnvalue>TfChannel</returnvalue></link> *chan,
+ <link linkend="TfChannelStreamFunc"><returnvalue>TfChannelStreamFunc</returnvalue></link> func,
+ <link linkend="gpointer"><returnvalue>gpointer</returnvalue></link> user_data);</programlisting>
<para>
Calls the function func on every stream inside this channel.</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>chan</parameter> :</term>
<listitem><simpara> a <link linkend="TfChannel"><type>TfChannel</type></link>
</simpara></listitem></varlistentry>
@@ -199,20 +186,20 @@
</variablelist></refsect2>
<refsect2 id="tf-channel-bus-message" role="function">
<title>tf_channel_bus_message ()</title>
-<indexterm zone="tf-channel-bus-message"><primary sortas="tf_channel_bus_message">tf_channel_bus_message</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link> tf_channel_bus_message (<link linkend="TfChannel">TfChannel</link> *channel,
- <link linkend="GstMessage">GstMessage</link> *message);</programlisting>
+<indexterm zone="tf-channel-bus-message"><primary>tf_channel_bus_message</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link> tf_channel_bus_message (<link linkend="TfChannel"><returnvalue>TfChannel</returnvalue></link> *channel,
+ <link linkend="GstMessage"><returnvalue>GstMessage</returnvalue></link> *message);</programlisting>
<para>
You must call this function on call messages received on the async bus.
<link linkend="GstMessages"><type>GstMessages</type></link> are not modified.</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>channel</parameter> :</term>
<listitem><simpara> A <link linkend="TfChannel"><type>TfChannel</type></link>
</simpara></listitem></varlistentry>
<varlistentry><term><parameter>message</parameter> :</term>
<listitem><simpara> A <link linkend="GstMessage"><type>GstMessage</type></link> received from the bus
</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if the message has been handled, <link linkend="FALSE--CAPS"><literal>FALSE</literal></link> otherwise
+<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> <link linkend="TRUE:CAPS"><literal>TRUE</literal></link> if the message has been handled, <link linkend="FALSE:CAPS"><literal>FALSE</literal></link> otherwise
</simpara></listitem></varlistentry>
</variablelist></refsect2>
@@ -220,53 +207,54 @@
<refsect1 id="TfChannel.property-details" role="property_details">
<title role="property_details.title">Property Details</title>
<refsect2 id="TfChannel--channel" role="property"><title>The <literal>"channel"</literal> property</title>
-<indexterm zone="TfChannel--channel"><primary sortas="TfChannel:channel">TfChannel:channel</primary></indexterm><programlisting> "channel" <link linkend="TpChannel">TpChannel</link>* : Read / Write / Construct Only</programlisting>
+<indexterm zone="TfChannel--channel"><primary>TfChannel:channel</primary></indexterm>
+<programlisting> "channel" <link linkend="TpChannel"><type>TpChannel</type></link>* : Read / Write / Construct Only</programlisting>
<para>Telepathy channel object which this media channel should operate on.</para></refsect2>
<refsect2 id="TfChannel--object-path" role="property"><title>The <literal>"object-path"</literal> property</title>
-<indexterm zone="TfChannel--object-path"><primary sortas="TfChannel:object-path">TfChannel:object-path</primary></indexterm><programlisting> "object-path" <link linkend="gchar">gchar</link>* : Read</programlisting>
+<indexterm zone="TfChannel--object-path"><primary>TfChannel:object-path</primary></indexterm>
+<programlisting> "object-path" <link linkend="gchar"><type>gchar</type></link>* : Read</programlisting>
<para>D-Bus object path of the Telepathy channel which this channel operates on.</para><para>Default value: NULL</para>
</refsect2>
</refsect1>
-
<refsect1 id="TfChannel.signal-details" role="signals">
<title role="signals.title">Signal Details</title>
<refsect2 id="TfChannel-closed" role="signal"><title>The <literal>"closed"</literal> signal</title>
-<indexterm zone="TfChannel-closed"><primary sortas="TfChannel::closed">TfChannel::closed</primary></indexterm><programlisting><link linkend="void">void</link> user_function (<link linkend="TfChannel">TfChannel</link> *arg0,
- <link linkend="gpointer">gpointer</link> user_data) : Run Last</programlisting>
+<indexterm zone="TfChannel-closed"><primary>TfChannel::closed</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> user_function (<link linkend="TfChannel"><type>TfChannel</type></link> *arg0,
+ <link linkend="gpointer"><type>gpointer</type></link> user_data) : Run Last</programlisting>
<para>
This function is called after a channel is closed, either because
it has been closed by the connection manager or because we had a locally
generated error.</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>user_data</parameter> :</term>
<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
</variablelist></refsect2><refsect2 id="TfChannel-handler-result" role="signal"><title>The <literal>"handler-result"</literal> signal</title>
-<indexterm zone="TfChannel-handler-result"><primary sortas="TfChannel::handler-result">TfChannel::handler-result</primary></indexterm><programlisting><link linkend="void">void</link> user_function (<link linkend="TfChannel">TfChannel</link> *error,
- <link linkend="gpointer">gpointer</link> arg1,
- <link linkend="gpointer">gpointer</link> user_data) : Run Last</programlisting>
+<indexterm zone="TfChannel-handler-result"><primary>TfChannel::handler-result</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> user_function (<link linkend="TfChannel"><type>TfChannel</type></link> *error,
+ <link linkend="gpointer"><type>gpointer</type></link> arg1,
+ <link linkend="gpointer"><type>gpointer</type></link> user_data) : Run Last</programlisting>
<para>
-This message is emitted when we are ready to handle the channel with <link linkend="NULL--CAPS"><literal>NULL</literal></link>
+This message is emitted when we are ready to handle the channel with <link linkend="NULL:CAPS"><literal>NULL</literal></link>
or with an <link linkend="GError"><type>GError</type></link> if we can not handle the channel.</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>error</parameter> :</term>
-<listitem><simpara> a <link linkend="GError"><type>GError</type></link> containing the error or <link linkend="NULL--CAPS"><literal>NULL</literal></link> if there was no error
+<listitem><simpara> a <link linkend="GError"><type>GError</type></link> containing the error or <link linkend="NULL:CAPS"><literal>NULL</literal></link> if there was no error
</simpara></listitem></varlistentry>
<varlistentry><term><parameter>user_data</parameter> :</term>
<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
</variablelist></refsect2><refsect2 id="TfChannel-session-created" role="signal"><title>The <literal>"session-created"</literal> signal</title>
-<indexterm zone="TfChannel-session-created"><primary sortas="TfChannel::session-created">TfChannel::session-created</primary></indexterm><programlisting><link linkend="void">void</link> user_function (<link linkend="TfChannel">TfChannel</link> *tfchannel,
- <link linkend="FsConference">FsConference</link> *conference,
- <link linkend="FsParticipant">FsParticipant</link> *participant,
- <link linkend="gpointer">gpointer</link> user_data) : Run Last</programlisting>
+<indexterm zone="TfChannel-session-created"><primary>TfChannel::session-created</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> user_function (<link linkend="TfChannel"><type>TfChannel</type></link> *tfchannel,
+ <link linkend="FsConference"><type>FsConference</type></link> *conference,
+ <link linkend="FsParticipant"><type>FsParticipant</type></link> *participant,
+ <link linkend="gpointer"><type>gpointer</type></link> user_data) : Run Last</programlisting>
<para>
This signal is emitted when a new session has been created in the
connection manager. The user should add the new <link linkend="FsConference"><type>FsConference</type></link> to a pipeline
and set it to playing. The user should also set any property he wants to
set.</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>tfchannel</parameter> :</term>
<listitem><simpara> the <link linkend="TfChannel"><type>TfChannel</type></link> which has a new stream
</simpara></listitem></varlistentry>
@@ -279,16 +267,16 @@
<varlistentry><term><parameter>user_data</parameter> :</term>
<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
</variablelist></refsect2><refsect2 id="TfChannel-session-invalidated" role="signal"><title>The <literal>"session-invalidated"</literal> signal</title>
-<indexterm zone="TfChannel-session-invalidated"><primary sortas="TfChannel::session-invalidated">TfChannel::session-invalidated</primary></indexterm><programlisting><link linkend="void">void</link> user_function (<link linkend="TfChannel">TfChannel</link> *tfchannel,
- <link linkend="FsConference">FsConference</link> *conference,
- <link linkend="FsParticipant">FsParticipant</link> *participant,
- <link linkend="gpointer">gpointer</link> user_data) : Run Last</programlisting>
+<indexterm zone="TfChannel-session-invalidated"><primary>TfChannel::session-invalidated</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> user_function (<link linkend="TfChannel"><type>TfChannel</type></link> *tfchannel,
+ <link linkend="FsConference"><type>FsConference</type></link> *conference,
+ <link linkend="FsParticipant"><type>FsParticipant</type></link> *participant,
+ <link linkend="gpointer"><type>gpointer</type></link> user_data) : Run Last</programlisting>
<para>
This signal is emitted when a session has been invalidated.
The <link linkend="FsConference"><type>FsConference</type></link> and <link linkend="FsParticipant"><type>FsParticipant</type></link> for this session are returned.
The <link linkend="FsConference"><type>FsConference</type></link> should be removed from the pipeline.</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>tfchannel</parameter> :</term>
<listitem><simpara> the <link linkend="TfChannel"><type>TfChannel</type></link> which has a new stream
</simpara></listitem></varlistentry>
@@ -301,14 +289,14 @@
<varlistentry><term><parameter>user_data</parameter> :</term>
<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
</variablelist></refsect2><refsect2 id="TfChannel-stream-created" role="signal"><title>The <literal>"stream-created"</literal> signal</title>
-<indexterm zone="TfChannel-stream-created"><primary sortas="TfChannel::stream-created">TfChannel::stream-created</primary></indexterm><programlisting><link linkend="void">void</link> user_function (<link linkend="TfChannel">TfChannel</link> *tfchannel,
- <link linkend="TfStream">TfStream</link> *stream,
- <link linkend="gpointer">gpointer</link> user_data) : Run Last</programlisting>
+<indexterm zone="TfChannel-stream-created"><primary>TfChannel::stream-created</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> user_function (<link linkend="TfChannel"><type>TfChannel</type></link> *tfchannel,
+ <link linkend="TfStream"><type>TfStream</type></link> *stream,
+ <link linkend="gpointer"><type>gpointer</type></link> user_data) : Run Last</programlisting>
<para>
This signal is emitted when a new stream has been created in the connection
manager and a local proxy has been generated.</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>tfchannel</parameter> :</term>
<listitem><simpara> the <link linkend="TfChannel"><type>TfChannel</type></link> which has a new stream
</simpara></listitem></varlistentry>
@@ -318,16 +306,16 @@
<varlistentry><term><parameter>user_data</parameter> :</term>
<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
</variablelist></refsect2><refsect2 id="TfChannel-stream-get-codec-config" role="signal"><title>The <literal>"stream-get-codec-config"</literal> signal</title>
-<indexterm zone="TfChannel-stream-get-codec-config"><primary sortas="TfChannel::stream-get-codec-config">TfChannel::stream-get-codec-config</primary></indexterm><programlisting><link linkend="FsCodecGList">FsCodecGList</link>* user_function (<link linkend="TfChannel">TfChannel</link> *tfchannel,
- <link linkend="guint">guint</link> stream_id,
- <link linkend="guint">guint</link> media_type,
- <link linkend="guint">guint</link> direction,
- <link linkend="gpointer">gpointer</link> user_data) : Run Last / Has Details</programlisting>
+<indexterm zone="TfChannel-stream-get-codec-config"><primary>TfChannel::stream-get-codec-config</primary></indexterm>
+<programlisting><link linkend="FsCodecGList"><returnvalue>FsCodecGList</returnvalue></link>* user_function (<link linkend="TfChannel"><type>TfChannel</type></link> *tfchannel,
+ <link linkend="guint"><type>guint</type></link> stream_id,
+ <link linkend="guint"><type>guint</type></link> media_type,
+ <link linkend="guint"><type>guint</type></link> direction,
+ <link linkend="gpointer"><type>gpointer</type></link> user_data) : Run Last / Has Details</programlisting>
<para>
This is emitted when a new stream is created and allows the caller to
specify his codec preferences.</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>tfchannel</parameter> :</term>
<listitem><simpara> the <link linkend="TfChannel"><type>TfChannel</type></link>
</simpara></listitem></varlistentry>
@@ -347,6 +335,4 @@
</variablelist></refsect2>
</refsect1>
-
-
</refentry>
--- doc/lib/xml/stream.xml
+++ doc/lib/xml/stream.xml
@@ -7,7 +7,6 @@
<manvolnum>3</manvolnum>
<refmiscinfo>TELEPATHY-FARSIGHT Library</refmiscinfo>
</refmeta>
-
<refnamediv>
<refname>TfStream</refname>
<refpurpose>Handles a media Stream</refpurpose>
@@ -16,16 +15,14 @@
<refsynopsisdiv id="TfStream.synopsis" role="synopsis">
<title role="synopsis.title">Synopsis</title>
-<synopsis>
- <link linkend="TfStream-struct">TfStream</link>;
+<synopsis> <link linkend="TfStream-struct">TfStream</link>;
<link linkend="TfStreamClass">TfStreamClass</link>;
-<link linkend="void">void</link> <link linkend="tf-stream-error">tf_stream_error</link> (<link linkend="TfStream">TfStream</link> *self,
- <link linkend="TpMediaStreamError">TpMediaStreamError</link> error,
- const <link linkend="gchar">gchar</link> *message);
-<link linkend="guint">guint</link> <link linkend="tf-stream-get-id">tf_stream_get_id</link> (<link linkend="TfStream">TfStream</link> *stream);
+<link linkend="void"><returnvalue>void</returnvalue></link> <link linkend="tf-stream-error">tf_stream_error</link> (<link linkend="TfStream"><returnvalue>TfStream</returnvalue></link> *self,
+ <link linkend="TpMediaStreamError"><returnvalue>TpMediaStreamError</returnvalue></link> error,
+ const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *message);
+<link linkend="guint"><returnvalue>guint</returnvalue></link> <link linkend="tf-stream-get-id">tf_stream_get_id</link> (<link linkend="TfStream"><returnvalue>TfStream</returnvalue></link> *stream);
</synopsis>
</refsynopsisdiv>
-
<refsect1 id="TfStream.object-hierarchy" role="object_hierarchy">
<title role="object_hierarchy.title">Object Hierarchy</title>
<synopsis>
@@ -33,28 +30,25 @@
+----TfStream
</synopsis>
</refsect1>
-
-
-
-
-
<refsect1 id="TfStream.properties" role="properties">
<title role="properties.title">Properties</title>
<synopsis>
- "<link linkend="TfStream--channel">channel</link>" <link linkend="TfChannel">TfChannel</link>* : Read / Write / Construct Only
- "<link linkend="TfStream--codec-preferences">codec-preferences</link>" <link linkend="FsCodecGList">FsCodecGList</link>* : Read / Write / Construct Only
- "<link linkend="TfStream--direction">direction</link>" <link linkend="guint">guint</link> : Read / Write / Construct Only
- "<link linkend="TfStream--farsight-conference">farsight-conference</link>" <link linkend="FsConference">FsConference</link>* : Read / Write / Construct Only
- "<link linkend="TfStream--farsight-participant">farsight-participant</link>" <link linkend="FsParticipant">FsParticipant</link>* : Read / Write / Construct Only
- "<link linkend="TfStream--media-type">media-type</link>" <link linkend="guint">guint</link> : Read / Write / Construct Only
- "<link linkend="TfStream--nat-properties">nat-properties</link>" <link linkend="gpointer">gpointer</link> : Write / Construct Only
- "<link linkend="TfStream--proxy">proxy</link>" <link linkend="TpMediaStreamHandler">TpMediaStreamHandler</link>* : Read / Write / Construct Only
- "<link linkend="TfStream--sink-pad">sink-pad</link>" <link linkend="GstPad">GstPad</link>* : Read
- "<link linkend="TfStream--stream-id">stream-id</link>" <link linkend="guint">guint</link> : Read / Write / Construct Only
- "<link linkend="TfStream--tos">tos</link>" <link linkend="guint">guint</link> : Read / Write
+ "<link linkend="TfStream--channel">channel</link>" <link linkend="TfChannel"><type>TfChannel</type></link>* : Read / Write / Construct Only
+ "<link linkend="TfStream--codec-preferences">codec-preferences</link>" <link linkend="FsCodecGList"><type>FsCodecGList</type></link>* : Read / Write / Construct Only
+ "<link linkend="TfStream--direction">direction</link>" <link linkend="guint"><type>guint</type></link> : Read / Write / Construct Only
+ "<link linkend="TfStream--farsight-conference">farsight-conference</link>" <link linkend="FsConference"><type>FsConference</type></link>* : Read / Write / Construct Only
+ "<link linkend="TfStream--farsight-participant">farsight-participant</link>" <link linkend="FsParticipant"><type>FsParticipant</type></link>* : Read / Write / Construct Only
+ "<link linkend="TfStream--farsight-session">farsight-session</link>" <link linkend="FsSession"><type>FsSession</type></link>* : Read
+ "<link linkend="TfStream--farsight-stream">farsight-stream</link>" <link linkend="FsStream"><type>FsStream</type></link>* : Read
+ "<link linkend="TfStream--media-type">media-type</link>" <link linkend="guint"><type>guint</type></link> : Read / Write / Construct Only
+ "<link linkend="TfStream--nat-properties">nat-properties</link>" <link linkend="gpointer"><type>gpointer</type></link> : Write / Construct Only
+ "<link linkend="TfStream--proxy">proxy</link>" <link linkend="TpMediaStreamHandler"><type>TpMediaStreamHandler</type></link>* : Read / Write / Construct Only
+ "<link linkend="TfStream--resources">resources</link>" <link linkend="guint"><type>guint</type></link> : Read
+ "<link linkend="TfStream--sink-pad">sink-pad</link>" <link linkend="GstPad"><type>GstPad</type></link>* : Read
+ "<link linkend="TfStream--stream-id">stream-id</link>" <link linkend="guint"><type>guint</type></link> : Read / Write / Construct Only
+ "<link linkend="TfStream--tos">tos</link>" <link linkend="guint"><type>guint</type></link> : Read / Write
</synopsis>
</refsect1>
-
<refsect1 id="TfStream.signals" role="signal_proto">
<title role="signal_proto.title">Signals</title>
<synopsis>
@@ -66,53 +60,49 @@
</synopsis>
</refsect1>
-
<refsect1 id="TfStream.description" role="desc">
<title role="desc.title">Description</title>
<para>
These objects handle media streams and wrap the appropriate Farsight 2
objects. It is used to interact on a stream level with the other parts
of the media pipeline and the proper UI.</para>
-<para>
-</para>
-</refsect1>
+</refsect1>
<refsect1 id="TfStream.details" role="details">
<title role="details.title">Details</title>
<refsect2 id="TfStream-struct" role="struct">
<title>TfStream</title>
-<indexterm zone="TfStream-struct"><primary sortas="TfStream">TfStream</primary></indexterm><programlisting>typedef struct _TfStream TfStream;</programlisting>
+<indexterm zone="TfStream-struct"><primary>TfStream</primary></indexterm>
+<programlisting>typedef struct _TfStream TfStream;</programlisting>
<para>
All other members are privated</para>
-<para>
-</para><variablelist role="struct">
+<variablelist role="struct">
</variablelist></refsect2>
<refsect2 id="TfStreamClass" role="struct">
<title>TfStreamClass</title>
-<indexterm zone="TfStreamClass"><primary sortas="TfStreamClass">TfStreamClass</primary></indexterm><programlisting>typedef struct {
+<indexterm zone="TfStreamClass"><primary>TfStreamClass</primary></indexterm>
+<programlisting>typedef struct {
GObjectClass parent_class;
} TfStreamClass;
</programlisting>
<para>
There are no overridable functions</para>
-<para>
-</para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="GObjectClass">GObjectClass</link> <structfield>parent_class</structfield>;</term>
+<variablelist role="struct">
+<varlistentry><term><link linkend="GObjectClass"><type>GObjectClass</type></link> <structfield id="TfStreamClass.parent-class">parent_class</structfield>;</term>
<listitem><simpara> the parent <link linkend="GObjecClass"><type>GObjecClass</type></link>
</simpara></listitem>
</varlistentry>
</variablelist></refsect2>
<refsect2 id="tf-stream-error" role="function">
<title>tf_stream_error ()</title>
-<indexterm zone="tf-stream-error"><primary sortas="tf_stream_error">tf_stream_error</primary></indexterm><programlisting><link linkend="void">void</link> tf_stream_error (<link linkend="TfStream">TfStream</link> *self,
- <link linkend="TpMediaStreamError">TpMediaStreamError</link> error,
- const <link linkend="gchar">gchar</link> *message);</programlisting>
+<indexterm zone="tf-stream-error"><primary>tf_stream_error</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> tf_stream_error (<link linkend="TfStream"><returnvalue>TfStream</returnvalue></link> *self,
+ <link linkend="TpMediaStreamError"><returnvalue>TpMediaStreamError</returnvalue></link> error,
+ const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *message);</programlisting>
<para>
This function can be used to tell the connection manager that an error
has happened on a specific stream.</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>self</parameter> :</term>
<listitem><simpara> a <link linkend="TfStream"><type>TfStream</type></link>
</simpara></listitem></varlistentry>
@@ -125,11 +115,11 @@
</variablelist></refsect2>
<refsect2 id="tf-stream-get-id" role="function">
<title>tf_stream_get_id ()</title>
-<indexterm zone="tf-stream-get-id"><primary sortas="tf_stream_get_id">tf_stream_get_id</primary></indexterm><programlisting><link linkend="guint">guint</link> tf_stream_get_id (<link linkend="TfStream">TfStream</link> *stream);</programlisting>
+<indexterm zone="tf-stream-get-id"><primary>tf_stream_get_id</primary></indexterm>
+<programlisting><link linkend="guint"><returnvalue>guint</returnvalue></link> tf_stream_get_id (<link linkend="TfStream"><returnvalue>TfStream</returnvalue></link> *stream);</programlisting>
<para>
Quick getter for the stream id</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>stream</parameter> :</term>
<listitem><simpara> A <link linkend="TfStream"><type>TfStream</type></link>
</simpara></listitem></varlistentry>
@@ -141,83 +131,107 @@
<refsect1 id="TfStream.property-details" role="property_details">
<title role="property_details.title">Property Details</title>
<refsect2 id="TfStream--channel" role="property"><title>The <literal>"channel"</literal> property</title>
-<indexterm zone="TfStream--channel"><primary sortas="TfStream:channel">TfStream:channel</primary></indexterm><programlisting> "channel" <link linkend="TfChannel">TfChannel</link>* : Read / Write / Construct Only</programlisting>
+<indexterm zone="TfStream--channel"><primary>TfStream:channel</primary></indexterm>
+<programlisting> "channel" <link linkend="TfChannel"><type>TfChannel</type></link>* : Read / Write / Construct Only</programlisting>
<para>The TfChannel this stream is in.</para></refsect2>
<refsect2 id="TfStream--codec-preferences" role="property"><title>The <literal>"codec-preferences"</literal> property</title>
-<indexterm zone="TfStream--codec-preferences"><primary sortas="TfStream:codec-preferences">TfStream:codec-preferences</primary></indexterm><programlisting> "codec-preferences" <link linkend="FsCodecGList">FsCodecGList</link>* : Read / Write / Construct Only</programlisting>
+<indexterm zone="TfStream--codec-preferences"><primary>TfStream:codec-preferences</primary></indexterm>
+<programlisting> "codec-preferences" <link linkend="FsCodecGList"><type>FsCodecGList</type></link>* : Read / Write / Construct Only</programlisting>
<para>A GList of FsCodec representing preferences to be passed to the fs_session_set_local_preferences() function.</para></refsect2>
<refsect2 id="TfStream--direction" role="property"><title>The <literal>"direction"</literal> property</title>
-<indexterm zone="TfStream--direction"><primary sortas="TfStream:direction">TfStream:direction</primary></indexterm><programlisting> "direction" <link linkend="guint">guint</link> : Read / Write / Construct Only</programlisting>
+<indexterm zone="TfStream--direction"><primary>TfStream:direction</primary></indexterm>
+<programlisting> "direction" <link linkend="guint"><type>guint</type></link> : Read / Write / Construct Only</programlisting>
<para>The Telepathy stream direction (a TpMediaStreamDirection).</para><para>Allowed values: <= 3</para>
<para>Default value: 3</para>
</refsect2>
<refsect2 id="TfStream--farsight-conference" role="property"><title>The <literal>"farsight-conference"</literal> property</title>
-<indexterm zone="TfStream--farsight-conference"><primary sortas="TfStream:farsight-conference">TfStream:farsight-conference</primary></indexterm><programlisting> "farsight-conference" <link linkend="FsConference">FsConference</link>* : Read / Write / Construct Only</programlisting>
+<indexterm zone="TfStream--farsight-conference"><primary>TfStream:farsight-conference</primary></indexterm>
+<programlisting> "farsight-conference" <link linkend="FsConference"><type>FsConference</type></link>* : Read / Write / Construct Only</programlisting>
<para>The Farsight conference this stream will create streams within.</para></refsect2>
<refsect2 id="TfStream--farsight-participant" role="property"><title>The <literal>"farsight-participant"</literal> property</title>
-<indexterm zone="TfStream--farsight-participant"><primary sortas="TfStream:farsight-participant">TfStream:farsight-participant</primary></indexterm><programlisting> "farsight-participant" <link linkend="FsParticipant">FsParticipant</link>* : Read / Write / Construct Only</programlisting>
+<indexterm zone="TfStream--farsight-participant"><primary>TfStream:farsight-participant</primary></indexterm>
+<programlisting> "farsight-participant" <link linkend="FsParticipant"><type>FsParticipant</type></link>* : Read / Write / Construct Only</programlisting>
<para>The Farsight participant this stream will create streams for.</para></refsect2>
+<refsect2 id="TfStream--farsight-session" role="property"><title>The <literal>"farsight-session"</literal> property</title>
+<indexterm zone="TfStream--farsight-session"><primary>TfStream:farsight-session</primary></indexterm>
+<programlisting> "farsight-session" <link linkend="FsSession"><type>FsSession</type></link>* : Read</programlisting>
+<para>The Farsight session.</para></refsect2>
+<refsect2 id="TfStream--farsight-stream" role="property"><title>The <literal>"farsight-stream"</literal> property</title>
+<indexterm zone="TfStream--farsight-stream"><primary>TfStream:farsight-stream</primary></indexterm>
+<programlisting> "farsight-stream" <link linkend="FsStream"><type>FsStream</type></link>* : Read</programlisting>
+<para>The Farsight stream.</para></refsect2>
<refsect2 id="TfStream--media-type" role="property"><title>The <literal>"media-type"</literal> property</title>
-<indexterm zone="TfStream--media-type"><primary sortas="TfStream:media-type">TfStream:media-type</primary></indexterm><programlisting> "media-type" <link linkend="guint">guint</link> : Read / Write / Construct Only</programlisting>
+<indexterm zone="TfStream--media-type"><primary>TfStream:media-type</primary></indexterm>
+<programlisting> "media-type" <link linkend="guint"><type>guint</type></link> : Read / Write / Construct Only</programlisting>
<para>The Telepathy stream media type (as a TpStreamMediaType).</para><para>Allowed values: <= 1</para>
<para>Default value: 0</para>
</refsect2>
<refsect2 id="TfStream--nat-properties" role="property"><title>The <literal>"nat-properties"</literal> property</title>
-<indexterm zone="TfStream--nat-properties"><primary sortas="TfStream:nat-properties">TfStream:nat-properties</primary></indexterm><programlisting> "nat-properties" <link linkend="gpointer">gpointer</link> : Write / Construct Only</programlisting>
+<indexterm zone="TfStream--nat-properties"><primary>TfStream:nat-properties</primary></indexterm>
+<programlisting> "nat-properties" <link linkend="gpointer"><type>gpointer</type></link> : Write / Construct Only</programlisting>
<para>A pointer to a TfNatProperties structure detailing which NAT traversal method and parameters to use for this stream.</para></refsect2>
<refsect2 id="TfStream--proxy" role="property"><title>The <literal>"proxy"</literal> property</title>
-<indexterm zone="TfStream--proxy"><primary sortas="TfStream:proxy">TfStream:proxy</primary></indexterm><programlisting> "proxy" <link linkend="TpMediaStreamHandler">TpMediaStreamHandler</link>* : Read / Write / Construct Only</programlisting>
+<indexterm zone="TfStream--proxy"><primary>TfStream:proxy</primary></indexterm>
+<programlisting> "proxy" <link linkend="TpMediaStreamHandler"><type>TpMediaStreamHandler</type></link>* : Read / Write / Construct Only</programlisting>
<para>The stream handler proxy which this stream interacts with.</para></refsect2>
+<refsect2 id="TfStream--resources" role="property"><title>The <literal>"resources"</literal> property</title>
+<indexterm zone="TfStream--resources"><primary>TfStream:resources</primary></indexterm>
+<programlisting> "resources" <link linkend="guint"><type>guint</type></link> : Read</programlisting>
+<para>The resources held by a TpMediaStreamDirection.</para><para>Allowed values: <= 3</para>
+<para>Default value: 0</para>
+</refsect2>
<refsect2 id="TfStream--sink-pad" role="property"><title>The <literal>"sink-pad"</literal> property</title>
-<indexterm zone="TfStream--sink-pad"><primary sortas="TfStream:sink-pad">TfStream:sink-pad</primary></indexterm><programlisting> "sink-pad" <link linkend="GstPad">GstPad</link>* : Read</programlisting>
+<indexterm zone="TfStream--sink-pad"><primary>TfStream:sink-pad</primary></indexterm>
+<programlisting> "sink-pad" <link linkend="GstPad"><type>GstPad</type></link>* : Read</programlisting>
<para>This sink pad that data has to be sent.</para></refsect2>
<refsect2 id="TfStream--stream-id" role="property"><title>The <literal>"stream-id"</literal> property</title>
-<indexterm zone="TfStream--stream-id"><primary sortas="TfStream:stream-id">TfStream:stream-id</primary></indexterm><programlisting> "stream-id" <link linkend="guint">guint</link> : Read / Write / Construct Only</programlisting>
+<indexterm zone="TfStream--stream-id"><primary>TfStream:stream-id</primary></indexterm>
+<programlisting> "stream-id" <link linkend="guint"><type>guint</type></link> : Read / Write / Construct Only</programlisting>
<para>A number identifying this stream within its channel.</para><para>Default value: 0</para>
</refsect2>
<refsect2 id="TfStream--tos" role="property"><title>The <literal>"tos"</literal> property</title>
-<indexterm zone="TfStream--tos"><primary sortas="TfStream:tos">TfStream:tos</primary></indexterm><programlisting> "tos" <link linkend="guint">guint</link> : Read / Write</programlisting>
+<indexterm zone="TfStream--tos"><primary>TfStream:tos</primary></indexterm>
+<programlisting> "tos" <link linkend="guint"><type>guint</type></link> : Read / Write</programlisting>
<para>The IP Type of Service to set on sent packets.</para><para>Allowed values: <= 255</para>
<para>Default value: 0</para>
</refsect2>
</refsect1>
-
<refsect1 id="TfStream.signal-details" role="signals">
<title role="signals.title">Signal Details</title>
<refsect2 id="TfStream-closed" role="signal"><title>The <literal>"closed"</literal> signal</title>
-<indexterm zone="TfStream-closed"><primary sortas="TfStream::closed">TfStream::closed</primary></indexterm><programlisting><link linkend="void">void</link> user_function (<link linkend="TfStream">TfStream</link> *stream,
- <link linkend="gpointer">gpointer</link> user_data) : Run Last</programlisting>
+<indexterm zone="TfStream-closed"><primary>TfStream::closed</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> user_function (<link linkend="TfStream"><type>TfStream</type></link> *stream,
+ <link linkend="gpointer"><type>gpointer</type></link> user_data) : Run Last</programlisting>
<para>
This signal is emitted when the <link linkend="Close"><function>Close()</function></link> signal is received from the
connection manager.</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>stream</parameter> :</term>
<listitem><simpara> the stream that has been closed
</simpara></listitem></varlistentry>
<varlistentry><term><parameter>user_data</parameter> :</term>
<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
</variablelist></refsect2><refsect2 id="TfStream-error" role="signal"><title>The <literal>"error"</literal> signal</title>
-<indexterm zone="TfStream-error"><primary sortas="TfStream::error">TfStream::error</primary></indexterm><programlisting><link linkend="void">void</link> user_function (<link linkend="TfStream">TfStream</link> *stream,
- <link linkend="gpointer">gpointer</link> user_data) : Run Last</programlisting>
+<indexterm zone="TfStream-error"><primary>TfStream::error</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> user_function (<link linkend="TfStream"><type>TfStream</type></link> *stream,
+ <link linkend="gpointer"><type>gpointer</type></link> user_data) : Run Last</programlisting>
<para>
This signal is emitted when there is an error on this stream</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>stream</parameter> :</term>
<listitem><simpara> the stream that has been errored
</simpara></listitem></varlistentry>
<varlistentry><term><parameter>user_data</parameter> :</term>
<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
</variablelist></refsect2><refsect2 id="TfStream-free-resource" role="signal"><title>The <literal>"free-resource"</literal> signal</title>
-<indexterm zone="TfStream-free-resource"><primary sortas="TfStream::free-resource">TfStream::free-resource</primary></indexterm><programlisting><link linkend="void">void</link> user_function (<link linkend="TfStream">TfStream</link> *stream,
- <link linkend="guint">guint</link> direction,
- <link linkend="gpointer">gpointer</link> user_data) : Run Last</programlisting>
+<indexterm zone="TfStream-free-resource"><primary>TfStream::free-resource</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> user_function (<link linkend="TfStream"><type>TfStream</type></link> *stream,
+ <link linkend="guint"><type>guint</type></link> direction,
+ <link linkend="gpointer"><type>gpointer</type></link> user_data) : Run Last</programlisting>
<para>
Emitted when the stream no longer needs a resource allocated
from <link linkend="TfStream-request-resource"><type>"request-resource"</type></link> and it can be freed.</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>stream</parameter> :</term>
<listitem><simpara> the stream for which resources can be freed
</simpara></listitem></varlistentry>
@@ -228,15 +242,15 @@
<varlistentry><term><parameter>user_data</parameter> :</term>
<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
</variablelist></refsect2><refsect2 id="TfStream-request-resource" role="signal"><title>The <literal>"request-resource"</literal> signal</title>
-<indexterm zone="TfStream-request-resource"><primary sortas="TfStream::request-resource">TfStream::request-resource</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link> user_function (<link linkend="TfStream">TfStream</link> *stream,
- <link linkend="guint">guint</link> direction,
- <link linkend="gpointer">gpointer</link> user_data) : Run Last</programlisting>
+<indexterm zone="TfStream-request-resource"><primary>TfStream::request-resource</primary></indexterm>
+<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link> user_function (<link linkend="TfStream"><type>TfStream</type></link> *stream,
+ <link linkend="guint"><type>guint</type></link> direction,
+ <link linkend="gpointer"><type>gpointer</type></link> user_data) : Run Last</programlisting>
<para>
This signal is emitted when the connection manager ask to send or receive
media. For example, this can be used allocated an X window or open a
camera. The resouces can later be freed on <link linkend="TfStream-free-resource"><type>"free-resource"</type></link></para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>stream</parameter> :</term>
<listitem><simpara> the stream requesting the resources
</simpara></listitem></varlistentry>
@@ -246,19 +260,19 @@
</simpara></listitem></varlistentry>
<varlistentry><term><parameter>user_data</parameter> :</term>
<listitem><simpara>user data set when the signal handler was connected.</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> <link linkend="TRUE--CAPS"><literal>TRUE</literal></link> if the resources requested could be allocated or <link linkend="FALSE--CAPS"><literal>FALSE</literal></link>
+<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> <link linkend="TRUE:CAPS"><literal>TRUE</literal></link> if the resources requested could be allocated or <link linkend="FALSE:CAPS"><literal>FALSE</literal></link>
otherwise
</simpara></listitem></varlistentry>
</variablelist></refsect2><refsect2 id="TfStream-src-pad-added" role="signal"><title>The <literal>"src-pad-added"</literal> signal</title>
-<indexterm zone="TfStream-src-pad-added"><primary sortas="TfStream::src-pad-added">TfStream::src-pad-added</primary></indexterm><programlisting><link linkend="void">void</link> user_function (<link linkend="TfStream">TfStream</link> *stream,
- <link linkend="GstPad">GstPad</link> *pad,
- <link linkend="FsCodec">FsCodec</link> *codec,
- <link linkend="gpointer">gpointer</link> user_data) : Run Last</programlisting>
+<indexterm zone="TfStream-src-pad-added"><primary>TfStream::src-pad-added</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link> user_function (<link linkend="TfStream"><type>TfStream</type></link> *stream,
+ <link linkend="GstPad"><type>GstPad</type></link> *pad,
+ <link linkend="FsCodec"><type>FsCodec</type></link> *codec,
+ <link linkend="gpointer"><type>gpointer</type></link> user_data) : Run Last</programlisting>
<para>
This is emitted when a new src pad comes out. The user must connect
this pad to his pipeline.</para>
-<para>
-</para><variablelist role="params">
+<variablelist role="params">
<varlistentry><term><parameter>stream</parameter> :</term>
<listitem><simpara> the stream which has a new pad
</simpara></listitem></varlistentry>
@@ -273,6 +287,4 @@
</variablelist></refsect2>
</refsect1>
-
-
</refentry>
--- ltmain.sh
+++ ltmain.sh
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
-# ltmain.sh (GNU libtool) 2.2.6
+# ltmain.sh (GNU libtool) 2.2.6b
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6
+# $progname: (GNU libtool) 2.2.6b
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -73,9 +73,9 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=2.2.6
+VERSION=2.2.6b
TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3017
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -116,15 +116,15 @@
: ${CP="cp -f"}
: ${ECHO="echo"}
-: ${EGREP="/usr/bin/grep -E"}
-: ${FGREP="/usr/bin/grep -F"}
-: ${GREP="/usr/bin/grep"}
+: ${EGREP="/bin/grep -E"}
+: ${FGREP="/bin/grep -F"}
+: ${GREP="/bin/grep"}
: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="/opt/local/bin/gsed"}
+: ${SED="/bin/sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
--- m4/Makefile.in
+++ m4/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
@@ -13,15 +14,12 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -49,13 +47,19 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -77,8 +81,6 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ERROR_CFLAGS = @ERROR_CFLAGS@
EXEEXT = @EXEEXT@
FARSIGHT2_CFLAGS = @FARSIGHT2_CFLAGS@
@@ -89,9 +91,8 @@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -108,6 +109,7 @@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
@@ -138,12 +140,12 @@
TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@
TELEPATHY_LIBS = @TELEPATHY_LIBS@
VERSION = @VERSION@
-WANT_PYTHON_FALSE = @WANT_PYTHON_FALSE@
-WANT_PYTHON_TRUE = @WANT_PYTHON_TRUE@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -155,6 +157,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -187,8 +190,12 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
as-compiler-flag.m4 \
as-version.m4 \
@@ -202,14 +209,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu m4/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu m4/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -227,16 +234,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
tags: TAGS
TAGS:
@@ -245,29 +249,32 @@
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -295,6 +302,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -305,7 +313,7 @@
distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -313,18 +321,38 @@
html: html-am
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -343,17 +371,21 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ 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-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- m4/ltversion.m4
+++ m4/ltversion.m4
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
-# serial 3012 ltversion.m4
+# serial 3017 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
--- python/Makefile.in
+++ python/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
@@ -15,15 +16,12 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -52,14 +50,29 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(pytpfarsightdir)"
-pytpfarsightLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pytpfarsight_LTLIBRARIES)
am__DEPENDENCIES_1 =
tpfarsight_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -68,34 +81,85 @@
nodist_tpfarsight_la_OBJECTS = pytpfarsight.lo
tpfarsight_la_OBJECTS = $(am_tpfarsight_la_OBJECTS) \
$(nodist_tpfarsight_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+tpfarsight_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(tpfarsight_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+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_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+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_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(tpfarsight_la_SOURCES) $(nodist_tpfarsight_la_SOURCES)
DIST_SOURCES = $(tpfarsight_la_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -117,8 +181,6 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ERROR_CFLAGS = @ERROR_CFLAGS@
EXEEXT = @EXEEXT@
FARSIGHT2_CFLAGS = @FARSIGHT2_CFLAGS@
@@ -129,9 +191,8 @@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -148,6 +209,7 @@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
@@ -178,12 +240,12 @@
TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@
TELEPATHY_LIBS = @TELEPATHY_LIBS@
VERSION = @VERSION@
-WANT_PYTHON_FALSE = @WANT_PYTHON_FALSE@
-WANT_PYTHON_TRUE = @WANT_PYTHON_TRUE@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -195,6 +257,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -227,8 +290,12 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = codegen
PYDEFS = `pkg-config --variable=defsdir pygtk-2.0`
GSTPYDEFS = `pkg-config --variable=defsdir gst-python-0.10`
@@ -275,14 +342,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu python/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu python/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu python/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu python/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -300,23 +367,28 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pytpfarsightLTLIBRARIES: $(pytpfarsight_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(pytpfarsightdir)" || $(mkdir_p) "$(DESTDIR)$(pytpfarsightdir)"
- @list='$(pytpfarsight_LTLIBRARIES)'; for p in $$list; do \
+ test -z "$(pytpfarsightdir)" || $(MKDIR_P) "$(DESTDIR)$(pytpfarsightdir)"
+ @list='$(pytpfarsight_LTLIBRARIES)'; test -n "$(pytpfarsightdir)" || list=; \
+ list2=; for p in $$list; do \
if test -f $$p; then \
- f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(pytpfarsightLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pytpfarsightdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(pytpfarsightLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pytpfarsightdir)/$$f"; \
+ list2="$$list2 $$p"; \
else :; fi; \
- done
+ done; \
+ test -z "$$list2" || { \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pytpfarsightdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pytpfarsightdir)"; \
+ }
uninstall-pytpfarsightLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @set -x; list='$(pytpfarsight_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pytpfarsightdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pytpfarsightdir)/$$p"; \
+ @list='$(pytpfarsight_LTLIBRARIES)'; test -n "$(pytpfarsightdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pytpfarsightdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pytpfarsightdir)/$$f"; \
done
clean-pytpfarsightLTLIBRARIES:
@@ -328,7 +400,7 @@
rm -f "$${dir}/so_locations"; \
done
tpfarsight.la: $(tpfarsight_la_OBJECTS) $(tpfarsight_la_DEPENDENCIES)
- $(LINK) -rpath $(pytpfarsightdir) $(tpfarsight_la_LDFLAGS) $(tpfarsight_la_OBJECTS) $(tpfarsight_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(tpfarsight_la_LINK) -rpath $(pytpfarsightdir) $(tpfarsight_la_OBJECTS) $(tpfarsight_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -341,22 +413,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pytpfarsightmodule.Plo at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -367,10 +442,6 @@
clean-libtool:
-rm -rf .libs _libs
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
@@ -378,7 +449,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -395,16 +466,15 @@
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -430,16 +500,16 @@
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -447,14 +517,14 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -466,81 +536,101 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
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; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- 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; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -552,7 +642,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(pytpfarsightdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-recursive
@@ -576,6 +666,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -590,7 +681,7 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
+ distclean-tags
dvi: dvi-recursive
@@ -598,18 +689,38 @@
html: html-recursive
+html-am:
+
info: info-recursive
info-am:
install-data-am: install-pytpfarsightLTLIBRARIES
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -630,24 +741,26 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-pytpfarsightLTLIBRARIES
+uninstall-am: uninstall-pytpfarsightLTLIBRARIES
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-libtool \
- clean-pytpfarsightLTLIBRARIES clean-recursive ctags \
- ctags-recursive distclean distclean-compile distclean-generic \
- distclean-libtool distclean-recursive distclean-tags distdir \
- dvi dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man \
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+ ctags-recursive install install-am install-strip \
+ tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+ clean-pytpfarsightLTLIBRARIES ctags ctags-recursive 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-pytpfarsightLTLIBRARIES install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am \
uninstall-pytpfarsightLTLIBRARIES
@@ -657,6 +770,7 @@
--register $(GSTPYDEFS)/gst-types.defs \
--override $(srcdir)/pytpfarsight.override \
$(srcdir)/pytpfarsight.defs > $@
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--- python/codegen/Makefile.in
+++ python/codegen/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
@@ -13,15 +14,12 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -49,13 +47,19 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -77,8 +81,6 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ERROR_CFLAGS = @ERROR_CFLAGS@
EXEEXT = @EXEEXT@
FARSIGHT2_CFLAGS = @FARSIGHT2_CFLAGS@
@@ -89,9 +91,8 @@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -108,6 +109,7 @@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
@@ -138,12 +140,12 @@
TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@
TELEPATHY_LIBS = @TELEPATHY_LIBS@
VERSION = @VERSION@
-WANT_PYTHON_FALSE = @WANT_PYTHON_FALSE@
-WANT_PYTHON_TRUE = @WANT_PYTHON_TRUE@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -155,6 +157,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -187,8 +190,12 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
argtypes.py \
code-coverage.py \
@@ -212,14 +219,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu python/codegen/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu python/codegen/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu python/codegen/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu python/codegen/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -237,16 +244,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
tags: TAGS
TAGS:
@@ -255,29 +259,32 @@
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -305,6 +312,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -315,7 +323,7 @@
distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -323,18 +331,38 @@
html: html-am
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -353,17 +381,21 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ 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-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- telepathy-farsight/Makefile.in
+++ telepathy-farsight/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
@@ -16,15 +17,12 @@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -55,15 +53,30 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = telepathy-farsight.pc \
telepathy-farsight-uninstalled.pc
+CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(tfincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libtelepathy_farsight_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -75,31 +88,50 @@
libtelepathy_farsight_la_OBJECTS = \
$(am_libtelepathy_farsight_la_OBJECTS) \
$(nodist_libtelepathy_farsight_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+libtelepathy_farsight_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(libtelepathy_farsight_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+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_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+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_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(libtelepathy_farsight_la_SOURCES) \
$(nodist_libtelepathy_farsight_la_SOURCES)
DIST_SOURCES = $(libtelepathy_farsight_la_SOURCES)
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
DATA = $(pkgconfig_DATA)
-tfincludeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(tfinclude_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -121,8 +153,6 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ERROR_CFLAGS = @ERROR_CFLAGS@
EXEEXT = @EXEEXT@
FARSIGHT2_CFLAGS = @FARSIGHT2_CFLAGS@
@@ -133,9 +163,8 @@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -152,6 +181,7 @@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
@@ -182,12 +212,12 @@
TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@
TELEPATHY_LIBS = @TELEPATHY_LIBS@
VERSION = @VERSION@
-WANT_PYTHON_FALSE = @WANT_PYTHON_FALSE@
-WANT_PYTHON_TRUE = @WANT_PYTHON_TRUE@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -199,6 +229,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -231,8 +262,12 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
BUILT_SOURCES = \
tf-signals-marshal.h \
tf-signals-marshal.c
@@ -285,14 +320,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu telepathy-farsight/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu telepathy-farsight/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu telepathy-farsight/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu telepathy-farsight/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -310,27 +345,32 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
telepathy-farsight.pc: $(top_builddir)/config.status $(srcdir)/telepathy-farsight.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
telepathy-farsight-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/telepathy-farsight-uninstalled.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
if test -f $$p; then \
- f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ list2="$$list2 $$p"; \
else :; fi; \
- done
+ done; \
+ test -z "$$list2" || { \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+ }
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
done
clean-libLTLIBRARIES:
@@ -342,7 +382,7 @@
rm -f "$${dir}/so_locations"; \
done
libtelepathy-farsight.la: $(libtelepathy_farsight_la_OBJECTS) $(libtelepathy_farsight_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libtelepathy_farsight_la_LDFLAGS) $(libtelepathy_farsight_la_OBJECTS) $(libtelepathy_farsight_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(libtelepathy_farsight_la_LINK) -rpath $(libdir) $(libtelepathy_farsight_la_OBJECTS) $(libtelepathy_farsight_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -356,22 +396,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tf-signals-marshal.Plo at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -381,117 +424,126 @@
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
done
uninstall-pkgconfigDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- done
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
install-tfincludeHEADERS: $(tfinclude_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(tfincludedir)" || $(mkdir_p) "$(DESTDIR)$(tfincludedir)"
- @list='$(tfinclude_HEADERS)'; for p in $$list; do \
+ test -z "$(tfincludedir)" || $(MKDIR_P) "$(DESTDIR)$(tfincludedir)"
+ @list='$(tfinclude_HEADERS)'; test -n "$(tfincludedir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(tfincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(tfincludedir)/$$f'"; \
- $(tfincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(tfincludedir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(tfincludedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(tfincludedir)" || exit $$?; \
done
uninstall-tfincludeHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(tfinclude_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(tfincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(tfincludedir)/$$f"; \
- done
+ @list='$(tfinclude_HEADERS)'; test -n "$(tfincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(tfincludedir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(tfincludedir)" && rm -f $$files
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; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ 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; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
- 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; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -501,7 +553,7 @@
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(tfincludedir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
@@ -525,6 +577,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -539,7 +592,7 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
+ distclean-tags
dvi: dvi-am
@@ -547,18 +600,38 @@
html: html-am
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgconfigDATA install-tfincludeHEADERS
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am: install-libLTLIBRARIES
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -579,22 +652,25 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
- uninstall-pkgconfigDATA uninstall-tfincludeHEADERS
+uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
+ uninstall-tfincludeHEADERS
+
+.MAKE: all check install install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libLTLIBRARIES clean-libtool 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-exec \
- install-exec-am install-info install-info-am \
- install-libLTLIBRARIES install-man install-pkgconfigDATA \
- install-strip install-tfincludeHEADERS 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 uninstall-info-am \
- uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
+ 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-libLTLIBRARIES install-man install-pdf install-pdf-am \
+ install-pkgconfigDATA install-ps install-ps-am install-strip \
+ install-tfincludeHEADERS 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 uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
uninstall-tfincludeHEADERS
@@ -616,6 +692,7 @@
%-signals-marshal.c: %-signals-marshal.list Makefile.in
glib-genmarshal --body --prefix=_$(subst -,_,$*)_marshal $< > $*-signals-marshal.c
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--- telepathy-farsight/channel.c
+++ telepathy-farsight/channel.c
@@ -177,7 +177,7 @@
g_free (self->priv->nat_props.nat_traversal);
self->priv->nat_props.nat_traversal = NULL;
- if (G_VALUE_HOLDS_STRING (value))
+ if (G_VALUE_HOLDS_STRING (value) && g_value_get_string (value)[0])
self->priv->nat_props.nat_traversal = g_value_dup_string (value);
}
else if (id == self->priv->prop_id_stun_server)
@@ -185,7 +185,7 @@
g_free (self->priv->nat_props.stun_server);
self->priv->nat_props.stun_server = NULL;
- if (G_VALUE_HOLDS_STRING (value))
+ if (G_VALUE_HOLDS_STRING (value) && g_value_get_string (value)[0])
self->priv->nat_props.stun_server = g_value_dup_string (value);
}
else if (id == self->priv->prop_id_gtalk_p2p_relay_token)
@@ -193,7 +193,7 @@
g_free (self->priv->nat_props.relay_token);
self->priv->nat_props.relay_token = NULL;
- if (G_VALUE_HOLDS_STRING (value))
+ if (G_VALUE_HOLDS_STRING (value) && g_value_get_string (value)[0])
self->priv->nat_props.relay_token = g_value_dup_string (value);
}
else if (id == self->priv->prop_id_stun_port)
--- telepathy-farsight/stream.c
+++ telepathy-farsight/stream.c
@@ -125,6 +125,8 @@
{
PROP_CHANNEL = 1,
PROP_FARSIGHT_CONFERENCE,
+ PROP_FARSIGHT_SESSION,
+ PROP_FARSIGHT_STREAM,
PROP_FARSIGHT_PARTICIPANT,
PROP_PROXY,
PROP_STREAM_ID,
@@ -133,7 +135,8 @@
PROP_NAT_PROPERTIES,
PROP_SINK_PAD,
PROP_LOCAL_PREFERENCES,
- PROP_TOS
+ PROP_TOS,
+ PROP_RESOURCES
};
static void get_all_properties_cb (TpProxy *proxy,
@@ -179,7 +182,7 @@
static void stop_telephony_event (TpMediaStreamHandler *proxy,
gpointer user_data, GObject *object);
-static void close (TpMediaStreamHandler *proxy,
+static void stream_close (TpMediaStreamHandler *proxy,
gpointer user_data, GObject *object);
static void invalidated_cb (TpMediaStreamHandler *proxy,
@@ -237,6 +240,12 @@
case PROP_FARSIGHT_PARTICIPANT:
g_value_set_object (value, self->priv->fs_participant);
break;
+ case PROP_FARSIGHT_SESSION:
+ g_value_set_object (value, self->priv->fs_session);
+ break;
+ case PROP_FARSIGHT_STREAM:
+ g_value_set_object (value, self->priv->fs_stream);
+ break;
case PROP_PROXY:
g_value_set_object (value, self->priv->stream_handler_proxy);
break;
@@ -266,6 +275,9 @@
else
g_value_set_uint (value, self->priv->tos);
break;
+ case PROP_RESOURCES:
+ g_value_set_uint (value, self->priv->has_resource);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@@ -461,6 +473,20 @@
FS_TYPE_PARTICIPANT,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (object_class, PROP_FARSIGHT_SESSION,
+ g_param_spec_object ("farsight-session",
+ "Farsight session",
+ "The Farsight session",
+ FS_TYPE_SESSION,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (object_class, PROP_FARSIGHT_STREAM,
+ g_param_spec_object ("farsight-stream",
+ "Farsight stream",
+ "The Farsight stream",
+ FS_TYPE_STREAM,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
g_object_class_install_property (object_class, PROP_PROXY,
g_param_spec_object ("proxy",
"TpMediaStreamHandler proxy",
@@ -540,6 +566,15 @@
0, 255, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (object_class, PROP_RESOURCES,
+ g_param_spec_uint ("resources",
+ "Resources held by the stream",
+ "The resources held by a TpMediaStreamDirection",
+ TP_MEDIA_STREAM_DIRECTION_NONE,
+ TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL,
+ TP_MEDIA_STREAM_DIRECTION_NONE,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
/**
* TfStream::closed:
* @stream: the stream that has been closed
@@ -655,6 +690,7 @@
gboolean created_locally = TRUE;
gboolean valid = FALSE;
guint i;
+ gboolean do_controlling = FALSE;
if (dbus_error &&
!(dbus_error->domain == DBUS_GERROR &&
@@ -696,7 +732,7 @@
(stream->priv->stream_handler_proxy, stop_telephony_event, NULL, NULL,
(GObject*) stream, NULL);
tp_cli_media_stream_handler_connect_to_close
- (stream->priv->stream_handler_proxy, close, NULL, NULL,
+ (stream->priv->stream_handler_proxy, stream_close, NULL, NULL,
(GObject*) stream, NULL);
memset (params, 0, sizeof(GParameter) * MAX_STREAM_TRANS_PARAMS);
@@ -709,6 +745,7 @@
if (!nat_traversal || !strcmp (nat_traversal, "gtalk-p2p"))
{
transmitter = "nice";
+ do_controlling = TRUE;
params[n_args].name = "compatibility-mode";
g_value_init (¶ms[n_args].value, G_TYPE_UINT);
@@ -718,10 +755,12 @@
else if (!strcmp (nat_traversal, "ice-udp"))
{
transmitter = "nice";
+ do_controlling = TRUE;
}
else if (!strcmp (nat_traversal, "wlm-8.5"))
{
transmitter = "nice";
+ do_controlling = TRUE;
params[n_args].name = "compatibility-mode";
g_value_init (¶ms[n_args].value, G_TYPE_UINT);
@@ -731,12 +770,17 @@
else if (!strcmp (nat_traversal, "wlm-2009"))
{
transmitter = "nice";
+ do_controlling = TRUE;
params[n_args].name = "compatibility-mode";
g_value_init (¶ms[n_args].value, G_TYPE_UINT);
g_value_set_uint (¶ms[n_args].value, 3);
n_args++;
}
+ else if (!strcmp (nat_traversal, "shm"))
+ {
+ transmitter = "shm";
+ }
else
{
transmitter = "rawudp";
@@ -828,7 +872,6 @@
if (dbus_relay_info && dbus_relay_info->len)
{
GValueArray *fs_relay_info = g_value_array_new (0);
- guint i;
GValue val = {0};
g_value_init (&val, GST_TYPE_STRUCTURE);
@@ -889,7 +932,7 @@
g_value_array_free (fs_relay_info);
}
- if (out_Properties)
+ if (out_Properties && do_controlling)
{
created_locally = tp_asv_get_boolean (out_Properties, "CreatedLocally",
&valid);
@@ -1257,6 +1300,13 @@
g_strdup (param->value));
}
+ if (fsc->ABI.ABI.ptime)
+ g_hash_table_insert (params, g_strdup ("ptime"),
+ g_strdup_printf ("%u", fsc->ABI.ABI.ptime));
+ if (fsc->ABI.ABI.maxptime)
+ g_hash_table_insert (params, g_strdup ("maxptime"),
+ g_strdup_printf ("%u", fsc->ABI.ABI.maxptime));
+
g_value_init (&codec, TP_STRUCT_TYPE_MEDIA_STREAM_HANDLER_CODEC);
g_value_take_boxed (&codec,
dbus_g_type_specialized_construct (TP_STRUCT_TYPE_MEDIA_STREAM_HANDLER_CODEC));
@@ -1386,7 +1436,12 @@
{
FsCodec *codec = user_data;
- fs_codec_add_optional_parameter (codec, key, value);
+ if (!strcmp (key, "ptime") && atoi (value) > 0)
+ codec->ABI.ABI.ptime = atoi (value);
+ else if (!strcmp (key, "maxptime") && atoi (value) > 0)
+ codec->ABI.ABI.maxptime = atoi (value);
+ else
+ fs_codec_add_optional_parameter (codec, key, value);
}
static void
@@ -1727,7 +1782,7 @@
static void
-close (TpMediaStreamHandler *proxy G_GNUC_UNUSED,
+stream_close (TpMediaStreamHandler *proxy G_GNUC_UNUSED,
gpointer user_data G_GNUC_UNUSED,
GObject *object)
{
@@ -1853,7 +1908,6 @@
{
const gchar *debug = NULL;
const GstStructure *s = gst_message_get_structure (message);
- const GValue *value = NULL;
if (GST_MESSAGE_TYPE (message) != GST_MESSAGE_ELEMENT)
return FALSE;
@@ -1864,6 +1918,7 @@
if (gst_structure_has_name (s, "farsight-error"))
{
GObject *object;
+ const GValue *value = NULL;
value = gst_structure_get_value (s, "src-object");
object = g_value_get_object (value);
--- tools/Makefile.in
+++ tools/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
@@ -13,15 +14,12 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -49,13 +47,19 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -77,8 +81,6 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ERROR_CFLAGS = @ERROR_CFLAGS@
EXEEXT = @EXEEXT@
FARSIGHT2_CFLAGS = @FARSIGHT2_CFLAGS@
@@ -89,9 +91,8 @@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -108,6 +109,7 @@
LT_CURRENT = @LT_CURRENT@
LT_REVISION = @LT_REVISION@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
@@ -138,12 +140,12 @@
TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@
TELEPATHY_LIBS = @TELEPATHY_LIBS@
VERSION = @VERSION@
-WANT_PYTHON_FALSE = @WANT_PYTHON_FALSE@
-WANT_PYTHON_TRUE = @WANT_PYTHON_TRUE@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -155,6 +157,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -187,8 +190,12 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
telepathy.am
@@ -200,14 +207,14 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tools/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu tools/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -225,16 +232,13 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
tags: TAGS
TAGS:
@@ -243,29 +247,32 @@
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -293,6 +300,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -303,7 +311,7 @@
distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -311,18 +319,38 @@
html: html-am
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -341,17 +369,20 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ 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-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
maintainer-update-from-telepathy-glib:
set -e && cd $(srcdir) && \
@@ -360,6 +391,7 @@
cp $(TELEPATHY_GLIB_SRCDIR)/tools/$$x $$x; \
fi; \
done
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
++++++ telepathy-farsight.yaml
--- telepathy-farsight.yaml
+++ telepathy-farsight.yaml
@@ -1,6 +1,6 @@
Name: telepathy-farsight
Summary: Telepathy client to handle media streaming channels
-Version: 0.0.12
+Version: 0.0.14
Release: 1
Group: Applications/Communications
License: LGPLv2+
@@ -18,7 +18,7 @@
PkgConfigBR:
- dbus-glib-1
- - farsight2-0.10
+ - farsight2-0.10 >=0.0.17
- telepathy-glib
- gtk-doc
- gst-python-0.10
More information about the MeeGo-commits
mailing list