[Telepathy-commits] [telepathy-qt4/master] tests/pinocchio: Include lib.cpp in sources rather than making a library

[Simon McVittie]

This turns out to make strange lcov workarounds unnecessary.
---
 tests/pinocchio/Makefile.am |   14 ++++----------
 tools/lcov.am               |    3 +--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/tests/pinocchio/Makefile.am b/tests/pinocchio/Makefile.am
index a095876..2c08b86 100644
--- a/tests/pinocchio/Makefile.am
+++ b/tests/pinocchio/Makefile.am
@@ -17,11 +17,11 @@ _gen/%.moc.hpp: %
 
 noinst_PROGRAMS = $(TESTS)
 
-test_conn_basics_SOURCES = conn-basics.cpp
-test_conn_basics_LDADD = $(noinst_LTLIBRARIES) $(ALL_LIBS)
+test_conn_basics_SOURCES = conn-basics.cpp lib.cpp
+test_conn_basics_LDADD = $(ALL_LIBS)
 
-test_do_nothing_SOURCES = do-nothing.cpp
-test_do_nothing_LDADD = $(noinst_LTLIBRARIES) $(ALL_LIBS)
+test_do_nothing_SOURCES = do-nothing.cpp lib.cpp
+test_do_nothing_LDADD = $(ALL_LIBS)
 
 LIB_CFLAGS = \
     $(QTCORE_CFLAGS) \
@@ -58,10 +58,4 @@ CLEANFILES = \
 distclean-local:
 	rm -rf _gen
 
-noinst_LTLIBRARIES = libpinocchio-tests.la
-
-libpinocchio_tests_la_SOURCES = \
-    lib.cpp \
-    lib.h
-
 endif
diff --git a/tools/lcov.am b/tools/lcov.am
index 57c4d6b..ca67a82 100644
--- a/tools/lcov.am
+++ b/tools/lcov.am
@@ -1,9 +1,8 @@
 lcov-reset:
 	lcov --directory @top_srcdir@ --zerocounters
+	find @top_srcdir@ -name '*.gcda' -exec rm -f '{}' ';'
 
 lcov-report:
-# this rm is a nasty hack
-	rm -f tests/pinocchio/.libs/lib.gcda
 	lcov --directory @top_srcdir@ --capture \
 		--output-file @top_builddir@/lcov.info
 	$(mkdir_p) @top_builddir@/lcov.html
-- 
1.5.6.5