summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.am2
m---------common0
-rw-r--r--configure.ac2
4 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4820dd03..6d66a844 100644
--- 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 b3b507bd..50856a19 100644
--- 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
-Subproject 2cd1cf860cd15e61827c0f5f1db96f877344c72
+Subproject f411695f3e009b4d348a8fa2dd32c0171f1ff68
diff --git a/configure.ac b/configure.ac
index 0ac0621c..2447374e 100644
--- 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