diff options
| author | Vincent Torri <vincent.torri@gmail.com> | 2012-09-22 06:44:32 +0000 |
|---|---|---|
| committer | Vincent Torri <vincent.torri@gmail.com> | 2012-09-22 06:44:32 +0000 |
| commit | a05d6a0419732eecd0fde8fb1fb6ab15ce6e01e8 (patch) | |
| tree | 1910fef4b4448f757bd262b636be2a86904ec482 /Makefile.am | |
| parent | 9de9bccb9a5423631db9bb0e257f854a0d41ab43 (diff) | |
| download | efl-a05d6a0419732eecd0fde8fb1fb6ab15ce6e01e8.tar.gz | |
merge: use $(MAKE) $(AM_MAKEFLAGS) and not just make. Fix benchmark-e17 rule
SVN revision: 77008
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 3da42bde43..c1a9b4507c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,7 +67,7 @@ pkgconfig_DATA += eina.pc eet.pc doc: @echo "entering doc/" - make -C doc doc + $(MAKE) $(AM_MAKEFLAGS) -C doc doc # Unit tests @@ -91,11 +91,12 @@ if EFL_ENABLE_TESTS check-local: if EFL_ENABLE_COVERAGE - @$(MAKE) lcov-reset + @$(MAKE) $(AM_MAKEFLAGS) lcov-reset endif - @./src/tests/eet/eet_suite + @./src/tests/eina/eina_suite$(EXEEXT) + @./src/tests/eet/eet_suite$(EXEEXT) if EFL_ENABLE_COVERAGE - @$(MAKE) lcov-report + @$(MAKE) $(AM_MAKEFLAGS) lcov-report endif endif @@ -103,22 +104,22 @@ endif # benchmark benchmark: - @$(MAKE) -C src benchmark + @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark @mkdir benchmark || true - @cd benchmark && ../src/benchmarks/eina/eina_bench `date +%F_%s` + @cd benchmark && ../src/benchmarks/eina/eina_bench$(EXEEXT) `date +%F_%s` benchmark-e17: - @$(MAKE) -C src benchmark-e17 + @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17 @mkdir benchmark || true - @cd benchmark && ../src/benchmarks/eina/eina_bench `date +%F_%s` + @cd benchmark && ../src/benchmarks/eina/eina_bench$(EXEEXT) `date +%F_%s` # examples examples: - @$(MAKE) -C src examples + @$(MAKE) $(AM_MAKEFLAGS) -C src examples install-examples: - @$(MAKE) -C src install-examples + @$(MAKE) $(AM_MAKEFLAGS) -C src install-examples # cleaning |