Eo: make benchmark

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/PROTO/eobj@76504 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/Makefile.am b/Makefile.am
index 765232e..1f21acb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,18 +74,10 @@ if EFL_ENABLE_COVERAGE
        @$(MAKE) lcov-report
 endif
 
-if EFL_ENABLE_BENCHMARK
-
 benchmark:
        @cd src && $(MAKE) benchmark
        @mkdir result || true
-       @cd result && ../src/tests/eo_bench `date +%F_%s`
-
-else
-
-benchmark:
-       @echo "reconfigure with --enable-benchmark"
-endif
+       @cd result && ../src/benchmarks/eo_bench `date +%F_%s`
 
 clean-local:
        @rm -rf coverage benchmark

diff --git a/configure.ac b/configure.ac
index 78e4bc1..078e045 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -171,8 +171,6 @@ AC_SUBST([lt_enable_auto_import])
 
 ### Unit tests, coverage and benchmarking
 
-EFL_CHECK_BENCHMARK([enable_benchmark="yes"], [enable_benchmark="no"])
-
 AC_SUBST([requirements_pc_eo])
 
 

diff --git a/src/Makefile.am b/src/Makefile.am
index b6a0867..c3b7c36 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,14 +5,5 @@ SUBDIRS = lib benchmarks examples tests
 
 .PHONY: benchmark
 
-if EFL_ENABLE_BENCHMARK
-
-benchmark: all
-       cd benchamrks && make eo_bench
-
-else
-
 benchmark:
-       @echo "reconfigure with --enable-benchmark"
-
-endif
+       @cd benchmarks && $(MAKE) benchmark

diff --git a/src/benchmarks/Makefile.am b/src/benchmarks/Makefile.am
index a3a853e..33b6ac7 100644 (file)
--- a/src/benchmarks/Makefile.am
+++ b/src/benchmarks/Makefile.am
@@ -7,9 +7,9 @@ AM_CPPFLAGS = \
 @EFL_EO_BUILD@ \
 @EO_CFLAGS@
 
-if EFL_ENABLE_BENCHMARK
+EXTRA_PROGRAMS = eo_bench
 
-noinst_PROGRAMS = eo_bench
+benchmark: eo_bench
 
 eo_bench_SOURCES = \
 class_simple.c \
@@ -20,7 +20,5 @@ eo_bench_eo_do.c
 
 eo_bench_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
 
-endif
-
 clean-local:
        rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda