diff options
author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2012-10-10 18:43:15 +0000 |
---|---|---|
committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2012-10-10 18:43:15 +0000 |
commit | 0b19ba7bc23ce175537a29c2816b3ef12e95ed2d (patch) | |
tree | 0efdfaa8435a14f63a2070eb0ec75b25faed49d7 /src | |
parent | b82e878656f76195be22574eae06b59d92b3c24c (diff) |
efl: introduce build profile, simplify options.
Introduced --with-profile={dev,release} that will simplify how to set
build options of EFL.
NOTE-1: specific e17 benchmark is now gone, it will always be built
and is the default benchmark for eina. If we want to have a faster
benchmark in the future, just add a command line option for
eina_suite.
NOTE-2: valgrind build is broken as it needs -fPIC. Will get to it
later. Likely someone needs to revisit the eina mempools for valgrind
and other basic tools (eo? likely evas).
SVN revision: 77771
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 6 | ||||
-rw-r--r-- | src/benchmarks/Makefile.am | 5 | ||||
-rw-r--r-- | src/benchmarks/eina/Makefile.am | 4 |
3 files changed, 3 insertions, 12 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 416bb5ad6c..8b0b50e481 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -2,16 +2,12 @@ MAINTAINERCLEANFILES = Makefile.in | |||
2 | 2 | ||
3 | SUBDIRS = lib modules bin scripts benchmarks tests examples | 3 | SUBDIRS = lib modules bin scripts benchmarks tests examples |
4 | 4 | ||
5 | .PHONY: benchmark benchmark-e17 examples | 5 | .PHONY: benchmark examples |
6 | 6 | ||
7 | benchmark: | 7 | benchmark: |
8 | @$(MAKE) $(AM_MAKEFLAGS) -C lib | 8 | @$(MAKE) $(AM_MAKEFLAGS) -C lib |
9 | @$(MAKE) $(AM_MAKEFLAGS) -C benchmarks benchmark | 9 | @$(MAKE) $(AM_MAKEFLAGS) -C benchmarks benchmark |
10 | 10 | ||
11 | benchmark-e17: | ||
12 | @$(MAKE) $(AM_MAKEFLAGS) -C lib | ||
13 | @$(MAKE) $(AM_MAKEFLAGS) -C benchmarks benchmark-e17 | ||
14 | |||
15 | examples: | 11 | examples: |
16 | @make -C lib | 12 | @make -C lib |
17 | @$(MAKE) $(AM_MAKEFLAGS) -C examples examples | 13 | @$(MAKE) $(AM_MAKEFLAGS) -C examples examples |
diff --git a/src/benchmarks/Makefile.am b/src/benchmarks/Makefile.am index 9ebb2ddd6b..b57b13e28c 100644 --- a/src/benchmarks/Makefile.am +++ b/src/benchmarks/Makefile.am | |||
@@ -2,11 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in | |||
2 | 2 | ||
3 | SUBDIRS = eina eo | 3 | SUBDIRS = eina eo |
4 | 4 | ||
5 | .PHONY: benchmark benchmark-e17 | 5 | .PHONY: benchmark |
6 | 6 | ||
7 | benchmark: | 7 | benchmark: |
8 | @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark | 8 | @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark |
9 | @$(MAKE) $(AM_MAKEFLAGS) -C eo benchmark | 9 | @$(MAKE) $(AM_MAKEFLAGS) -C eo benchmark |
10 | |||
11 | benchmark-e17: | ||
12 | @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark-e17 | ||
diff --git a/src/benchmarks/eina/Makefile.am b/src/benchmarks/eina/Makefile.am index fd44ac0f04..909a38810e 100644 --- a/src/benchmarks/eina/Makefile.am +++ b/src/benchmarks/eina/Makefile.am | |||
@@ -5,6 +5,7 @@ AM_CPPFLAGS = \ | |||
5 | -I$(top_builddir)/src/lib/eina \ | 5 | -I$(top_builddir)/src/lib/eina \ |
6 | -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ | 6 | -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ |
7 | -DCITYHASH_BENCH \ | 7 | -DCITYHASH_BENCH \ |
8 | -DEINA_ENABLE_BENCH_E17 \ | ||
8 | @EINA_CFLAGS@ \ | 9 | @EINA_CFLAGS@ \ |
9 | @GLIB_CFLAGS@ | 10 | @GLIB_CFLAGS@ |
10 | 11 | ||
@@ -12,9 +13,6 @@ EXTRA_PROGRAMS = eina_bench | |||
12 | 13 | ||
13 | benchmark: eina_bench libcity.la | 14 | benchmark: eina_bench libcity.la |
14 | 15 | ||
15 | benchmark-e17: eina_bench | ||
16 | @$(MAKE) $(AM_MAKEFLAGS) AM_CPPFLAGS="${AM_CPPFLAGS} -DEINA_ENABLE_BENCH_E17" | ||
17 | |||
18 | eina_bench_SOURCES = \ | 16 | eina_bench_SOURCES = \ |
19 | eina_bench.c \ | 17 | eina_bench.c \ |
20 | eina_bench_sort.c \ | 18 | eina_bench_sort.c \ |