[next] telepathy-salut: stop linking on telepathy-glib
Guillaume Desmottes
gdesmott at kemper.freedesktop.org
Thu Jan 30 08:14:34 PST 2014
Module: telepathy-salut
Branch: next
Commit: 40f1ef5400c58921163585860d5fbde433956f42
URL: http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=40f1ef5400c58921163585860d5fbde433956f42
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Thu Jan 30 16:42:33 2014 +0100
stop linking on telepathy-glib
Not sure why this was needed anyway.
---
src/Makefile.am | 6 ++----
tests/Makefile.am | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 24d48c8..64db333 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -197,13 +197,11 @@ check-local: check-coding-style
# TELEPATHY_GLIB_LIBS is only here so compiling against a static lib succeeds
telepathy_salut_android_libs = libsalut-convenience.la \
-lgibber-salut \
- $(top_builddir)/extensions/libsalut-extensions.la \
- -ltelepathy-glib
+ $(top_builddir)/extensions/libsalut-extensions.la
telepathy_salut_1_LDADD = libsalut-convenience.la \
$(top_builddir)/lib/gibber/libgibber.la \
- $(top_builddir)/extensions/libsalut-extensions.la \
- -ltelepathy-glib
+ $(top_builddir)/extensions/libsalut-extensions.la
noinst_LTLIBRARIES = libsalut-convenience.la
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7878b13..cfda4a1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,8 +20,7 @@ telepathy_salut_debug_SOURCES = \
telepathy_salut_debug_LDADD = \
$(top_builddir)/src/libsalut-convenience.la \
$(top_builddir)/lib/gibber/libgibber.la \
- $(top_builddir)/extensions/libsalut-extensions.la \
- -ltelepathy-glib
+ $(top_builddir)/extensions/libsalut-extensions.la
# Teach it how to make libgibber.la
$(top_builddir)/lib/gibber/libgibber.la:
More information about the telepathy-commits
mailing list