From 5266203c4ecb59285f2ac31ff4cc5af5698cce18 Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sourceforge.net>
Date: Wed, 9 Jan 2008 13:50:09 +0000
Subject: Makefile.am: Include lcov.mak to allow builging coverage reports.
 Guard check-torture target like in the other packages.

Original commit message from CVS:
* Makefile.am:
Include lcov.mak to allow builging coverage reports. Guard
check-torture target like in the other packages.
---
 ChangeLog   | 6 ++++++
 Makefile.am | 8 ++++++++
 common      | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6d966a8e..b73161c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-09  Stefan Kost  <ensonic@users.sf.net>
+
+	* Makefile.am:
+	  Include lcov.mak to allow builging coverage reports. Guard
+	  check-torture target like in the other packages.
+
 2008-01-09  Sameer Naik  <sameer@damagehead.com>
 
 	reviewed by: Edward Hervey  <edward.hervey@collabora.co.uk>
diff --git a/Makefile.am b/Makefile.am
index 17f646c2..46c6f5bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,5 +47,13 @@ include $(top_srcdir)/common/po.mak
 check-valgrind:
 	cd tests/check && make check-valgrind
 
+if HAVE_GST_CHECK
 check-torture:
 	cd tests/check && make torture
+else
+check-torture:
+	true
+endif
+
+include $(top_srcdir)/common/coverage/lcov.mak
+
diff --git a/common b/common
index 97075907..49c2fc5c 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 970759077c95ee4e85650db023ac6f974e2aa5e1
+Subproject commit 49c2fc5c9bff0e9858e89978bd98164a386de51d
-- 
cgit