Makefile.am: include lcov.mak

Original commit message from CVS:
* Makefile.am:
include lcov.mak
* configure.ac:
add GCOV_LIBS to GST_LIBS

diff --git a/ChangeLog b/ChangeLog
index 4820dd0..6d66a84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-02  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * Makefile.am:
+         include lcov.mak
+       * configure.ac:
+         add GCOV_LIBS to GST_LIBS
+
 2006-07-02  Tim-Philipp Müller  <tim at centricular dot net>
 
        Patch by: Michael Sheldon  <webmaster at mikeasoft com>

diff --git a/Makefile.am b/Makefile.am
index b3b507b..50856a1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,3 +59,5 @@ WIN32_COPY = \
 
 win32-update:
        for f in $(WIN32_COPY); do cp $$f win32/common;done
+
+include $(top_srcdir)/common/coverage/lcov.mak

diff --git a/common b/common
index 2cd1cf8..f411695 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 2cd1cf860cd15e61827c0f5f1db96f877344c722
+Subproject commit f411695f3e009b4d348a8fa2dd32c0171f1ff683

diff --git a/configure.ac b/configure.ac
index 0ac0621..2447374 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -545,6 +545,8 @@ dnl also add builddir include for enumtypes and marshal
 dnl add GST_OPTION_CFLAGS, but overridable
 GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS \$(GST_OPTION_CFLAGS)"
 AC_SUBST(GST_CFLAGS)
+dnl add GCOV libs because libtool strips -fprofile-arcs -ftest-coverage
+GST_LIBS="$GST_LIBS \$(GCOV_LIBS)"
 AC_SUBST(GST_LIBS)
 
 dnl LDFLAGS really should only contain flags, not libs - they get added before