Eina examples: add missing files in distributed tarball, formatting

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

diff --git a/Makefile.am b/Makefile.am
index f1b7a5c..e11c796 100644 (file)
--- a/Makefile.am
+++ b/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
 
@@ -16,31 +16,41 @@ depcomp \
 install-sh \
 ltconfig \
 ltmain.sh \
-missing
+missing \
+$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \
+$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \
+$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc.tar.bz2 \
+m4/libtool.m4 \
+m4/lt~obsolete.m4 \
+m4/ltoptions.m4 \
+m4/ltsugar.m4 \
+m4/ltversion.m4
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = eina-0.pc
+pkgconfig_DATA = eina.pc
 
 EXTRA_DIST = \
 AUTHORS \
 COPYING \
-OLD-COPYING.PLAIN \
 README \
 $(pkgconfig_DATA) \
 autogen.sh \
-eina-0.pc.in \
+eina.pc.in \
 eina.spec \
 eina.spec.in \
-m4/ac_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_pthread.m4 \
-m4/efl_tests.m4 \
-m4/eina_bench.m4 \
-m4/eina_check.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_shm_open.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
 
@@ -48,7 +58,7 @@ m4/eina_check.m4
 
 doc:
        @echo "entering doc/"
-       make -C doc doc
+       @cd doc && $(MAKE) doc
 
 # Unit tests
 
@@ -68,23 +78,21 @@ 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 -v "`cd $(top_srcdir) && pwd`" | cut -d: -f1 > 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"
@@ -99,7 +107,7 @@ endif
 if EFL_ENABLE_BENCHMARK
 
 benchmark:
-       @make -C src benchmark
+       @cd src && $(MAKE) benchmark
        @mkdir result || true
        @cd result && ../src/tests/eina_bench `date +%F_%s`