[clutter] build: Remove gcov from the build
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] build: Remove gcov from the build
- Date: Tue, 19 Jun 2012 14:48:44 +0000 (UTC)
commit c4acae7752b2c8c95a03b324dbf40dd5007cafbf
Author: Emmanuele Bassi <ebassi gnome org>
Date: Tue Jun 19 14:17:05 2012 +0100
build: Remove gcov from the build
We want to switch to lcov, so let's start with a clean slate.
Makefile.am | 6 +----
build/Makefile.am | 2 -
build/autotools/Makefile.am | 1 -
build/autotools/Makefile.am.gcov | 33 ----------------------------
build/gen-gcov.pl | 44 --------------------------------------
clutter/Makefile.am | 7 +-----
configure.ac | 30 -------------------------
7 files changed, 2 insertions(+), 121 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e8cd0ff..2bf2b89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,10 +37,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags --enable-
include $(top_srcdir)/build/autotools/Makefile.am.changelog
include $(top_srcdir)/build/autotools/Makefile.am.release
-# proxy rule for gcov
-gcov:
- @( cd clutter && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $$?
-
# proxy rules for tests
test-report full-report:
$(MAKE) -C tests/conform $(@)
@@ -48,4 +44,4 @@ test-report full-report:
perf-report:
$(MAKE) -C tests/performance $(@)
-.PHONY: gcov test-report full-report perf-report
+.PHONY: test-report full-report perf-report
diff --git a/build/Makefile.am b/build/Makefile.am
index 4c28453..16b50d4 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -1,3 +1 @@
SUBDIRS = autotools mingw win32
-
-EXTRA_DIST = gen-gcov.pl
diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am
index c30c322..8446ea4 100644
--- a/build/autotools/Makefile.am
+++ b/build/autotools/Makefile.am
@@ -5,7 +5,6 @@ EXTRA_DIST = \
Makefile.am.marshal \
Makefile.am.enums \
Makefile.am.changelog \
- Makefile.am.gcov \
Makefile.am.gitignore \
Makefile.am.release \
introspection.m4 \
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 660a33d..2acd2e3 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -34,7 +34,7 @@ AM_CPPFLAGS = \
$(CLUTTER_PROFILE_CFLAGS) \
$(NULL)
-AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) $(GCOV_CFLAGS)
+AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
# these are the gir files we generate using g-ir-scanner
INTROSPECTION_GIRS =
@@ -831,7 +831,6 @@ nodist_libclutter_ CLUTTER_API_VERSION@_la_SOURCES = \
libclutter_ CLUTTER_API_VERSION@_la_LDFLAGS = \
$(CLUTTER_LINK_FLAGS) \
$(CLUTTER_LT_LDFLAGS) \
- $(GCOV_LDFLAGS) \
-export-dynamic \
-export-symbols-regex "^(clutter|cally).*" \
-rpath $(libdir) \
@@ -1042,7 +1041,3 @@ TESTS = abicheck.sh
endif
EXTRA_DIST += abicheck.sh
-
-# GCov rules
-gcov_sources = $(source_c) $(backend_source_c)
-include $(top_srcdir)/build/autotools/Makefile.am.gcov
diff --git a/configure.ac b/configure.ac
index 86b01f9..d0c31ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -909,36 +909,6 @@ AM_CONDITIONAL(PROFILE, test "x$enable_profile" != "xno")
AC_SUBST(CLUTTER_PROFILE_CFLAGS)
AC_SUBST(CLUTTER_PROFILE_LDFLAGS)
-dnl === Coverage report =======================================================
-
-AC_PATH_PROG([GCOV], [gcov], [enable_gcov=no])
-
-AC_MSG_CHECKING([whether to build with gcov testing])
-
-AC_ARG_ENABLE([gcov],
- [AS_HELP_STRING([--enable-gcov],
- [Whether to enable coverage testing (requires gcc
-and gcov)])],
- [],
- [enable_gcov=no])
-
-AS_IF([test "x$enable_gcov" = "xyes" && test "x$GCC" = "xyes"],
- [
- AS_IF([test "x$enable_conformance" = "xno"],
- [AC_MSG_WARN([Conformance test suite is disabled, the coverage report will be incomplete])],
- [AC_MSG_RESULT([yes])]
- )
-
- GCOV_CFLAGS="-g -O0 -fprofile-arcs -ftest-coverage"
- GCOV_LDFLAGS="-lgcov"
- ],
- [AC_MSG_RESULT([no])]
-)
-
-AM_CONDITIONAL([GCOV_ENABLED], [test "x$enable_gcov" = "xyes"])
-AC_SUBST([GCOV_CFLAGS])
-AC_SUBST([GCOV_LDFLAGS])
-
dnl === Enable strict compiler flags ==========================================
# use strict compiler flags only when building from git; the rules for
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]