fix minor version defines to be at 1.6 (in sync now) ready for going

[framework/uifw/evas.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b42e7f9..d8cb45a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,10 +40,8 @@ evas-software-16-x11.pc.in \
 evas-software-8-x11.pc.in \
 evas-software-gdi.pc.in \
 evas-software-ddraw.pc.in \
-evas-software-16-ddraw.pc.in \
 evas-direct3d.pc.in \
 evas-software-16-wince.pc.in \
-evas-software-sdl.pc.in \
 evas-psl1ght.pc.in \
 evas-wayland-shm.pc.in \
 evas-wayland-egl.pc.in \
@@ -55,6 +53,7 @@ m4/efl_doxygen.m4 \
 m4/efl_fnmatch.m4 \
 m4/efl_path_max.m4 \
 m4/efl_pthread.m4 \
+m4/efl_shm_open.m4 \
 m4/efl_tests.m4 \
 m4/evas_check_engine.m4 \
 m4/evas_check_loader.m4 \
@@ -109,10 +108,6 @@ if BUILD_ENGINE_SOFTWARE_DDRAW
 pkgconfig_DATA += evas-software-ddraw.pc
 endif
 
-if BUILD_ENGINE_SOFTWARE_16_DDRAW
-pkgconfig_DATA += evas-software-16-ddraw.pc
-endif
-
 if BUILD_ENGINE_DIRECT3D
 pkgconfig_DATA += evas-direct3d.pc
 endif
@@ -121,7 +116,7 @@ if BUILD_ENGINE_SOFTWARE_16_WINCE
 pkgconfig_DATA += evas-software-16-wince.pc
 endif
 
-if BUILD_ENGINE_SOFTWARE_SDL
+if BUILD_ENGINE_SOFTWARE_16_SDL
 pkgconfig_DATA += evas-software-sdl.pc
 endif
 
@@ -161,23 +156,22 @@ 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
-       @make check
-       @make lcov-report
+       @$(MAKE) lcov-reset
+       @$(MAKE) check
+       @$(MAKE) lcov-report
 else
 lcov-reset:
        @echo "reconfigure with --enable-coverage"