summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-22 06:44:32 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-22 06:44:32 +0000
commita05d6a0419732eecd0fde8fb1fb6ab15ce6e01e8 (patch)
tree1910fef4b4448f757bd262b636be2a86904ec482 /Makefile.am
parent9de9bccb9a5423631db9bb0e257f854a0d41ab43 (diff)
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.am21
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
67 67
68doc: 68doc:
69 @echo "entering doc/" 69 @echo "entering doc/"
70 make -C doc doc 70 $(MAKE) $(AM_MAKEFLAGS) -C doc doc
71 71
72# Unit tests 72# Unit tests
73 73
@@ -91,11 +91,12 @@ if EFL_ENABLE_TESTS
91 91
92check-local: 92check-local:
93if EFL_ENABLE_COVERAGE 93if EFL_ENABLE_COVERAGE
94 @$(MAKE) lcov-reset 94 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset
95endif 95endif
96 @./src/tests/eet/eet_suite 96 @./src/tests/eina/eina_suite$(EXEEXT)
97 @./src/tests/eet/eet_suite$(EXEEXT)
97if EFL_ENABLE_COVERAGE 98if EFL_ENABLE_COVERAGE
98 @$(MAKE) lcov-report 99 @$(MAKE) $(AM_MAKEFLAGS) lcov-report
99endif 100endif
100 101
101endif 102endif
@@ -103,22 +104,22 @@ endif
103# benchmark 104# benchmark
104 105
105benchmark: 106benchmark:
106 @$(MAKE) -C src benchmark 107 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
107 @mkdir benchmark || true 108 @mkdir benchmark || true
108 @cd benchmark && ../src/benchmarks/eina/eina_bench `date +%F_%s` 109 @cd benchmark && ../src/benchmarks/eina/eina_bench$(EXEEXT) `date +%F_%s`
109 110
110benchmark-e17: 111benchmark-e17:
111 @$(MAKE) -C src benchmark-e17 112 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17
112 @mkdir benchmark || true 113 @mkdir benchmark || true
113 @cd benchmark && ../src/benchmarks/eina/eina_bench `date +%F_%s` 114 @cd benchmark && ../src/benchmarks/eina/eina_bench$(EXEEXT) `date +%F_%s`
114 115
115# examples 116# examples
116 117
117examples: 118examples:
118 @$(MAKE) -C src examples 119 @$(MAKE) $(AM_MAKEFLAGS) -C src examples
119 120
120install-examples: 121install-examples:
121 @$(MAKE) -C src install-examples 122 @$(MAKE) $(AM_MAKEFLAGS) -C src install-examples
122 123
123# cleaning 124# cleaning
124 125