summaryrefslogtreecommitdiff
path: root/src/benchmarks
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 /src/benchmarks
parent9de9bccb9a5423631db9bb0e257f854a0d41ab43 (diff)
merge: use $(MAKE) $(AM_MAKEFLAGS) and not just make. Fix benchmark-e17 rule
SVN revision: 77008
Diffstat (limited to 'src/benchmarks')
-rw-r--r--src/benchmarks/Makefile.am4
-rw-r--r--src/benchmarks/eina/Makefile.am4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/benchmarks/Makefile.am b/src/benchmarks/Makefile.am
index 1bf18c0e94..b16aab1fd7 100644
--- a/src/benchmarks/Makefile.am
+++ b/src/benchmarks/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = eina
5.PHONY: benchmark benchmark-e17 5.PHONY: benchmark benchmark-e17
6 6
7benchmark: 7benchmark:
8 @$(MAKE) -C eina benchmark 8 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark
9 9
10benchmark-e17: 10benchmark-e17:
11 @$(MAKE) -C eina benchmark-e17 11 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark-e17
diff --git a/src/benchmarks/eina/Makefile.am b/src/benchmarks/eina/Makefile.am
index 88aec5e91b..d4c39e5dc3 100644
--- a/src/benchmarks/eina/Makefile.am
+++ b/src/benchmarks/eina/Makefile.am
@@ -12,8 +12,8 @@ EXTRA_PROGRAMS = eina_bench
12 12
13benchmark: eina_bench libcity.la 13benchmark: eina_bench libcity.la
14 14
15#benchmark-e17: eina_bench 15benchmark-e17: eina_bench
16# AM_CPPFLAGS += -DEINA_ENABLE_BENCH_E17 16 @$(MAKE) $(AM_MAKEFLAGS) AM_CPPFLAGS="${AM_CPPFLAGS} -DEINA_ENABLE_BENCH_E17"
17 17
18eina_bench_SOURCES = \ 18eina_bench_SOURCES = \
19eina_bench.c \ 19eina_bench.c \