diff --git a/legacy/eet/Makefile.am b/legacy/eet/Makefile.am
index 34a576216d..d3622dca5f 100644
--- a/legacy/eet/Makefile.am
+++ b/legacy/eet/Makefile.am
@@ -69,18 +69,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 . --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
diff --git a/legacy/eina/Makefile.am b/legacy/eina/Makefile.am
index 3e779558e7..501653c5fb 100644
--- a/legacy/eina/Makefile.am
+++ b/legacy/eina/Makefile.am
@@ -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