summaryrefslogtreecommitdiff
path: root/src/benchmarks
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-31 00:46:14 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-31 00:46:14 +0000
commitdf1b3d30c4ca130fcecce67b2c0fcbbbcfa5a29c (patch)
treee26086071ac285910d3e162c39819f3a2c3affea /src/benchmarks
parent51f8fe26fc4774e69be3547d49ae902c287c8b61 (diff)
efl: refactor CFLAGS, LIBS, LIBADD and LDADD usage.
- remove EFL_LIBS and EFL_CFLAGS, use per-lib values that inherit from EFL (general) - add NAME_LDFLAGS and EFL_LDFLAGS for linker flags. - LDADD (binaries) now use NAME_LDFLAGS instead of NAME_LIBS, as they link to libname.la and that will pull in the libtool dependencies SVN revision: 81915
Diffstat (limited to 'src/benchmarks')
-rw-r--r--src/benchmarks/eina/Makefile.am6
-rw-r--r--src/benchmarks/eo/Makefile.am2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/benchmarks/eina/Makefile.am b/src/benchmarks/eina/Makefile.am
index 909a38810e..23e13411a2 100644
--- a/src/benchmarks/eina/Makefile.am
+++ b/src/benchmarks/eina/Makefile.am
@@ -42,7 +42,11 @@ EXTRA_LTLIBRARIES = libcity.la
42libcity_la_SOURCES = city.cc 42libcity_la_SOURCES = city.cc
43 43
44nodist_EXTRA_eina_bench_SOURCES = dummy.cc 44nodist_EXTRA_eina_bench_SOURCES = dummy.cc
45eina_bench_LDADD = @GLIB_LIBS@ $(top_builddir)/src/lib/eina/libeina.la libcity.la @EINA_LIBS@ 45eina_bench_LDADD = \
46$(top_builddir)/src/lib/eina/libeina.la \
47libcity.la \
48@GLIB_LIBS@ \
49@EINA_LDFLAGS@
46 50
47EXTRA_DIST = strlog 51EXTRA_DIST = strlog
48 52
diff --git a/src/benchmarks/eo/Makefile.am b/src/benchmarks/eo/Makefile.am
index 052b445f33..c57c2e6036 100644
--- a/src/benchmarks/eo/Makefile.am
+++ b/src/benchmarks/eo/Makefile.am
@@ -22,7 +22,7 @@ eo_bench_eo_do.c
22eo_bench_LDADD = \ 22eo_bench_LDADD = \
23$(top_builddir)/src/lib/eo/libeo.la \ 23$(top_builddir)/src/lib/eo/libeo.la \
24$(top_builddir)/src/lib/eina/libeina.la \ 24$(top_builddir)/src/lib/eina/libeina.la \
25@EO_LIBS@ 25@EO_LDFLAGS@
26 26
27clean-local: 27clean-local:
28 rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda 28 rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda