[next] telepathy-glib: logger tests: use the uninstalled libtelepathy-logger-1

Simon McVittie smcv at kemper.freedesktop.org
Tue Mar 18 05:30:08 PDT 2014


Module: telepathy-glib
Branch: next
Commit: e42e05adc2e94a2c66b487d15e57c1acb9743184
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=e42e05adc2e94a2c66b487d15e57c1acb9743184

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Mar 17 19:29:44 2014 +0000

logger tests: use the uninstalled libtelepathy-logger-1

When GLib is in the configured ${libdir}, this order prefers the
uninstalled libtelepathy-logger-1 if it also exists in the configured
${libdir}, whereas the previous order selected the installed (and
probably outdated) libtelepathy-logger-1. I'm not entirely sure why.

Reviewed-by: Guillaume Desmottes

---

 tests/logger/dbus/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/logger/dbus/Makefile.am b/tests/logger/dbus/Makefile.am
index cb84655..2cda6b6 100644
--- a/tests/logger/dbus/Makefile.am
+++ b/tests/logger/dbus/Makefile.am
@@ -17,8 +17,8 @@ noinst_PROGRAMS = \
 TESTS = $(noinst_PROGRAMS)
 
 LDADD = \
-	$(top_builddir)/tests/lib/libtp-logger-tests.la		\
 	$(top_builddir)/telepathy-logger/libtelepathy-logger-1.la	\
+	$(top_builddir)/tests/lib/libtp-logger-tests.la		\
 	$(TPL_LIBS) 						\
 	$(NULL)
 



More information about the telepathy-commits mailing list