From 44467fed7a7be72cffd4c8ed74e080de0afb3901 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Thu, 19 Jan 2012 14:07:35 +0000 Subject: [PATCH] use $(MAKE) instead of make, echo the built doc package. This removes the annoying: make[2]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule. and with the package name I can upload it easily to somewhere else. SVN revision: 67343 --- legacy/eet/Makefile.am | 8 ++++---- legacy/eet/doc/Makefile.am | 1 + legacy/eina/Makefile.am | 10 +++++----- legacy/eina/doc/Makefile.am | 1 + 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/legacy/eet/Makefile.am b/legacy/eet/Makefile.am index bc6e99ad8c..34a576216d 100644 --- a/legacy/eet/Makefile.am +++ b/legacy/eet/Makefile.am @@ -49,7 +49,7 @@ pkgconfig_DATA = eet.pc doc: @echo "entering doc/" - make -C doc doc + $(MAKE) -C doc doc # Unit tests @@ -83,9 +83,9 @@ lcov-report: @genhtml -t "$(PACKAGE_STRING)" -o coverage coverage/coverage.info coverage: - @make lcov-reset - @make check - @make lcov-report + @$(MAKE) lcov-reset + @$(MAKE) check + @$(MAKE) lcov-report clean-local: @rm -rf coverage diff --git a/legacy/eet/doc/Makefile.am b/legacy/eet/doc/Makefile.am index 3790222550..145376f589 100644 --- a/legacy/eet/doc/Makefile.am +++ b/legacy/eet/doc/Makefile.am @@ -20,6 +20,7 @@ doc: doc-clean bzip2 -9 $(PACKAGE_DOCNAME).tar rm -rf $(PACKAGE_DOCNAME)/ mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir) + @echo "Documentation Package: $(top_builddir)/$(PACKAGE_DOCNAME).tar.bz2" clean-local: doc-clean diff --git a/legacy/eina/Makefile.am b/legacy/eina/Makefile.am index a818b10b89..7778fd855e 100644 --- a/legacy/eina/Makefile.am +++ b/legacy/eina/Makefile.am @@ -57,7 +57,7 @@ m4/efl_path_max.m4 doc: @echo "entering doc/" - @cd doc && make doc + @cd doc && $(MAKE) doc # Unit tests @@ -91,9 +91,9 @@ lcov-report: @genhtml -t "$(PACKAGE_STRING)" -o coverage coverage/coverage.info 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" @@ -108,7 +108,7 @@ endif if EFL_ENABLE_BENCHMARK benchmark: - @cd src && make benchmark + @cd src && $(MAKE) benchmark @mkdir result || true @cd result && ../src/tests/eina_bench `date +%F_%s` diff --git a/legacy/eina/doc/Makefile.am b/legacy/eina/doc/Makefile.am index 6f31b96cab..7856c1377f 100644 --- a/legacy/eina/doc/Makefile.am +++ b/legacy/eina/doc/Makefile.am @@ -20,6 +20,7 @@ doc: all bzip2 -9 $(PACKAGE_DOCNAME).tar rm -rf $(PACKAGE_DOCNAME)/ mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir) + @echo "Documentation Package: $(top_builddir)/$(PACKAGE_DOCNAME).tar.bz2" clean-local: doc-clean