[Telepathy-commits] [telepathy-gabble/master] tests: vastly simplify linking

[Simon McVittie]

---
 tests/Makefile.am |   31 +------------------------------
 1 files changed, 1 insertions(+), 30 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0a3cc51..d272abe 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,40 +11,11 @@ noinst_PROGRAMS = \
 	test-parse-message \
 	test-presence
 
-test_presence_LDADD = \
-    $(top_builddir)/src/libgabble-convenience.la \
-    $(top_builddir)/lib/gibber/libgibber.la \
-    $(ALL_LIBS)
-
-test_base64_LDADD = \
-    $(top_builddir)/src/libgabble-convenience.la \
-    $(top_builddir)/lib/gibber/libgibber.la \
-    $(ALL_LIBS)
-
-test_handles_LDADD = \
-    $(top_builddir)/src/libgabble-convenience.la \
-    $(top_builddir)/lib/gibber/libgibber.la \
-    $(ALL_LIBS)
-
-test_jid_decode_LDADD = \
-    $(top_builddir)/src/libgabble-convenience.la \
-    $(top_builddir)/lib/gibber/libgibber.la \
-    $(ALL_LIBS)
-
-test_parse_message_LDADD = \
-    $(top_builddir)/src/libgabble-convenience.la \
-    $(top_builddir)/lib/gibber/libgibber.la \
-    $(ALL_LIBS)
-
-test_dtube_unique_names_LDADD = \
-    $(top_builddir)/src/libgabble-convenience.la \
-    $(top_builddir)/lib/gibber/libgibber.la \
-    $(ALL_LIBS)
+LDADD = $(top_builddir)/src/libgabble-convenience.la
 
 AM_CFLAGS = $(ERROR_CFLAGS) @DBUS_CFLAGS@ @GLIB_CFLAGS@ @LOUDMOUTH_CFLAGS@ \
     @TP_GLIB_CFLAGS@ \
     -I $(top_srcdir) -I $(top_builddir)
-ALL_LIBS = @DBUS_LIBS@ @GLIB_LIBS@ @LOUDMOUTH_LIBS@ @TP_GLIB_LIBS@
 
 TESTS = $(noinst_PROGRAMS)
 
-- 
1.5.6.5