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 /src | |
parent | 9de9bccb9a5423631db9bb0e257f854a0d41ab43 (diff) |
merge: use $(MAKE) $(AM_MAKEFLAGS) and not just make. Fix benchmark-e17 rule
SVN revision: 77008
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 12 | ||||
-rw-r--r-- | src/benchmarks/Makefile.am | 4 | ||||
-rw-r--r-- | src/benchmarks/eina/Makefile.am | 4 | ||||
-rw-r--r-- | src/examples/Makefile.am | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 529892093b..2dd8c0fb6e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -5,16 +5,16 @@ SUBDIRS = lib include modules bin scripts benchmarks tests examples | |||
5 | .PHONY: benchmark benchmark-e17 examples | 5 | .PHONY: benchmark benchmark-e17 examples |
6 | 6 | ||
7 | benchmark: | 7 | benchmark: |
8 | @make -C lib | 8 | @$(MAKE) $(AM_MAKEFLAGS) -C lib |
9 | @$(MAKE) -C benchmarks benchmark | 9 | @$(MAKE) $(AM_MAKEFLAGS) -C benchmarks benchmark |
10 | 10 | ||
11 | benchmark-e17: | 11 | benchmark-e17: |
12 | @make -C lib | 12 | @$(MAKE) $(AM_MAKEFLAGS) -C lib |
13 | @$(MAKE) -C benchmarks benchmark-e17 | 13 | @$(MAKE) $(AM_MAKEFLAGS) -C benchmarks benchmark-e17 |
14 | 14 | ||
15 | examples: | 15 | examples: |
16 | @make -C lib | 16 | @make -C lib |
17 | @$(MAKE) -C examples examples | 17 | @$(MAKE) $(AM_MAKEFLAGS) -C examples examples |
18 | 18 | ||
19 | install-examples: | 19 | install-examples: |
20 | @$(MAKE) -C examples install-examples | 20 | @$(MAKE) $(AM_MAKEFLAGS) -C examples install-examples |
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 | ||
7 | benchmark: | 7 | benchmark: |
8 | @$(MAKE) -C eina benchmark | 8 | @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark |
9 | 9 | ||
10 | benchmark-e17: | 10 | benchmark-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 | ||
13 | benchmark: eina_bench libcity.la | 13 | benchmark: eina_bench libcity.la |
14 | 14 | ||
15 | #benchmark-e17: eina_bench | 15 | benchmark-e17: eina_bench |
16 | # AM_CPPFLAGS += -DEINA_ENABLE_BENCH_E17 | 16 | @$(MAKE) $(AM_MAKEFLAGS) AM_CPPFLAGS="${AM_CPPFLAGS} -DEINA_ENABLE_BENCH_E17" |
17 | 17 | ||
18 | eina_bench_SOURCES = \ | 18 | eina_bench_SOURCES = \ |
19 | eina_bench.c \ | 19 | eina_bench.c \ |
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index 85c8ca3a4e..59a30d0509 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am | |||
@@ -3,9 +3,9 @@ MAINTAINERCLEANFILES = Makefile.in | |||
3 | SUBDIRS = eina eet | 3 | SUBDIRS = eina eet |
4 | 4 | ||
5 | examples: | 5 | examples: |
6 | @$(MAKE) -C eina examples | 6 | @$(MAKE) $(AM_MAKEFLAGS) -C eina examples |
7 | @$(MAKE) -C eet examples | 7 | @$(MAKE) $(AM_MAKEFLAGS) -C eet examples |
8 | 8 | ||
9 | install-examples: | 9 | install-examples: |
10 | @$(MAKE) -C eina install-examples | 10 | @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples |
11 | @$(MAKE) -C eet install-examples \ No newline at end of file | 11 | @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples |