add gcov stuff

Original commit message from CVS:
* Makefile.am:
* configure.ac:
* gst/Makefile.am:
add gcov stuff

diff --git a/ChangeLog b/ChangeLog
index b1b9862..02edc5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-07-03  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+       * Makefile.am:
+       * configure.ac:
+       * gst/Makefile.am:
+         add gcov stuff
+
+2006-07-03  Thomas Vander Stichele  <thomas at apestaart dot org>
+
        * gst/gstmodule.c: (init_gst):
          don't crash when error is NULL
 

diff --git a/Makefile.am b/Makefile.am
index d4e7173..9681a9e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,3 +38,5 @@ check-valgrind:
 
 check-torture:
        @true
+
+include $(top_srcdir)/common/coverage/lcov.mak

diff --git a/configure.ac b/configure.ac
index d0fb0e6..22526d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -40,10 +40,11 @@ AC_SUBST(GTK_REQ,   2.6.0)
 AC_SUBST(GST_REQ,   0.10.2)
 AC_SUBST(GSTPB_REQ, 0.10.0.2)
 
-
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
+GST_ARG_GCOV
+
 dnl check for python
 dnl AM_PATH_PYTHON(2.2)
 AM_PATH_PYTHON
@@ -210,19 +211,13 @@ dnl PYGTK_CODEGEN="$PYTHON \$(top_srcdir)/codegen/codegen.py"
 AC_SUBST(PYGTK_CODEGEN)
 AC_MSG_RESULT($PYGTK_CODEGEN)
 
-dnl decide on error flags
-dnl if we support -Wall, set it unconditionally
-AS_COMPILER_FLAG(-Wall,
-                 PYGST_ERROR_CFLAGS="-Wall",
-                 PYGST_ERROR_CFLAGS="")
-dnl if we're in nano >= 1, add -Werror if supported
-if test "x$GST_CVS" = "xyes"
-then
-  AS_COMPILER_FLAG(-Werror, PYGST_ERROR_CFLAGS="$PYGST_ERROR_CFLAGS -Werror")
-fi
+dnl define an ERROR_CFLAGS Makefile variable
+GST_SET_ERROR_CFLAGS($GST_CVS)
 
-PYGST_CFLAGS="$PYGST_ERROR_CFLAGS"
-AC_SUBST(PYGST_CFLAGS)
+GST_OPTION_CFLAGS="\$(ERROR_CFLAGS) \$(GCOV_CFLAGS)"
+AC_SUBST(GST_OPTION_CFLAGS)
+GST_OPTION_LIBS="\$(GCOV_LIBS)"
+AC_SUBST(GST_OPTION_LIBS)
 
 dnl full installation path
 AS_AC_EXPAND(PYTHONDIR, $pythondir)

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 15a32e9..e2b8bfd 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -1,5 +1,5 @@
-common_cflags = $(PYGTK_CFLAGS) $(GST_CFLAGS) $(PYGST_CFLAGS) -fno-strict-aliasing
-common_libadd = $(GST_LIBS)
+common_cflags = $(PYGTK_CFLAGS) $(GST_CFLAGS) $(GST_OPTION_CFLAGS) -fno-strict-aliasing
+common_libadd = $(GST_LIBS) $(GST_OPTION_LIBS)
 common_ldflags = -module -avoid-version
 
 pkgpyexecdir = $(pyexecdir)/gst-$(GST_MAJORMINOR)/gst