1 files changed, 21 insertions, 23 deletions

diff --git a/libraries/eina/Makefile.am b/libraries/eina/Makefile.am
index 7778fd8..501653c 100644
--- a/libraries/eina/Makefile.am
+++ b/libraries/eina/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I m4/common -I m4/eina
 
 SUBDIRS = src doc
 
@@ -38,18 +38,18 @@ autogen.sh \
 eina.pc.in \
 eina.spec \
 eina.spec.in \
-m4/efl_attribute.m4 \
-m4/efl_benchmark.m4 \
-m4/efl_compiler_flag.m4 \
-m4/efl_coverage.m4 \
-m4/efl_cpu.m4 \
-m4/efl_doxygen.m4 \
-m4/efl_fnmatch.m4 \
-m4/efl_tests.m4 \
-m4/efl_threads.m4 \
-m4/eina_bench.m4 \
-m4/eina_check.m4 \
-m4/efl_path_max.m4
+m4/common/efl_attribute.m4 \
+m4/common/efl_benchmark.m4 \
+m4/common/efl_compiler_flag.m4 \
+m4/common/efl_coverage.m4 \
+m4/common/efl_cpu.m4 \
+m4/common/efl_doxygen.m4 \
+m4/common/efl_fnmatch.m4 \
+m4/common/efl_tests.m4 \
+m4/common/efl_threads.m4 \
+m4/common/efl_path_max.m4 \
+m4/eina/eina_bench.m4 \
+m4/eina/eina_check.m4
 
 .PHONY: doc coverage benchmark
 
@@ -77,18 +77,16 @@ endif
 
 if EFL_ENABLE_COVERAGE
 lcov-reset:
-        @rm -rf coverage
-        @find . -name "*.gcda" -exec rm {} \;
-        @lcov --directory . --zerocounters
+        @rm -rf $(top_builddir)/coverage
+        @find $(top_builddir) -name "*.gcda" -delete
+        @lcov --zerocounters --directory $(top_builddir)
 
 lcov-report:
-        @mkdir coverage
-        @lcov --compat-libtool --directory $(top_srcdir)/src --capture --output-file coverage/coverage.info
-        @lcov -l coverage/coverage.info |grep "\\.h"  |cut -d " " -f 2 > coverage/remove
-        @lcov -r coverage/coverage.info `cat coverage/remove` > coverage/coverage.cleaned.info
-        @rm coverage/remove
-        @mv coverage/coverage.cleaned.info coverage/coverage.info
-        @genhtml -t "$(PACKAGE_STRING)" -o coverage coverage/coverage.info
+        @mkdir $(top_builddir)/coverage
+        lcov --capture --compat-libtool --output-file $(top_builddir)/coverage/coverage.info --directory $(top_builddir)
+        lcov --remove $(top_builddir)/coverage/coverage.info '*.h' --output-file $(top_builddir)/coverage/coverage.cleaned.info
+        genhtml -t "$(PACKAGE_STRING)" -o $(top_builddir)/coverage/html $(top_builddir)/coverage/coverage.cleaned.info
+        @echo "Coverage Report at $(top_builddir)/coverage/html"
 
 coverage:
         @$(MAKE) lcov-reset