Make the coverage analysis on Vala code insteead of C code

diff --git a/configure.ac b/configure.ac
index 6fd6ac7..588bcb6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,7 @@ AC_PROG_LIBTOOL
 AC_PATH_PROG(VALAC, valac, valac)
 AC_SUBST(VALAC)
 
+AC_SUBST(VALAFLAGS)
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
@@ -34,12 +35,12 @@ AM_CONDITIONAL(ENABLE_COVERAGE, test x$enable_coverage != xno)
 
 AS_IF([test "x$enable_coverage" != xno],
        [COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage"
+        COVERAGE_VALAFLAGS="-g"
         COVERAGE_LIBS="-lgcov"
         AC_SUBST(COVERAGE_CFLAGS)
+        AC_SUBST(COVERAGE_VALAFLAGS)
         AC_SUBST(COVERAGE_LIBS)
         
-        #FIXME: preserve non -Wall/-g/-O flags from users CFLAGS
-        CFLAGS="-Wall -g -O0"
         AC_PATH_PROG(LCOV, lcov, :)
         AC_SUBST(LCOV)
         AS_IF([test "$LCOV" = :],

diff --git a/gee/Makefile.am b/gee/Makefile.am
index 044bc89..e4b9b73 100644 (file)
--- a/gee/Makefile.am
+++ b/gee/Makefile.am
@@ -63,15 +63,17 @@ geeinclude_HEADERS = \
        gee.h \
        $(NULL)
 
-VALAFLAGS = \
+AM_VALAFLAGS = \
        -H gee.h --vapi gee-1.0.vapi \
        -h gee-internals.h \
        --internal-vapi gee-internals-1.0.vapi \
        --library gee-1.0 --gir Gee-1.0.gir \
+       $(COVERAGE_VALAFLAGS) \
+       $(VALAFLAGS) \
        $(NULL)
 
 gee-1.0.vapi gee.vala.stamp: $(libgee_la_VALASOURCES)
-       $(VALAC) -C $(VALAFLAGS) $^
+       $(VALAC) -C $(AM_VALAFLAGS) $^
        touch $@
 
 libgee_la_LIBADD = \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a57bdf1..6b2377c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -63,7 +63,7 @@ coverage-report:
        lcov --directory @top_srcdir@/gee \
                --output-file @top_builddir@/lcov.info \
                --remove @top_builddir@/lcov.info \
-               /usr/include/\*
+               "/usr/include/*" "*.c" "*.h" "*.vapi"
 
        $(mkdir_p) @top_builddir@/tests/coverage
        git_commit=`GIT_DIR=@top_srcdir@/.git git log -1 --pretty=format:%h 2>/dev/null`;\