summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--configure.ac12
-rw-r--r--src/Makefile_Eina.am12
2 files changed, 7 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index 0df3e01310..5d563d5bd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -841,15 +841,9 @@ requirements_pc_eina="${requirements_pc_eina} ${platform_pc}"
841 841
842# Valgrind 842# Valgrind
843 843
844if test "x${want_valgrind}" = "xyes" ; then 844EFL_OPTIONAL_DEPEND_PKG([eina], [${want_valgrind}],
845 PKG_CHECK_MODULES([VALGRIND], [valgrind >= 2.4.0], 845 [VALGRIND], [valgrind >= 2.4.0])
846 [ 846if test "x${have_valgrind}" = "xno"; then
847 have_valgrind="yes"
848 requirements_pc_eina="valgrind >= 2.4.0 ${requirements_pc_eina}"
849 requirements_pc_deps_eina="valgrind ${requirements_pc_deps_eina}"
850 ],
851 [AC_MSG_ERROR([Valgrind >= 2.4.0 is required])])
852else
853 AC_DEFINE([NVALGRIND], [1], [Valgrind support disabled]) 847 AC_DEFINE([NVALGRIND], [1], [Valgrind support disabled])
854fi 848fi
855 849
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 2e58f0f2eb..d3f5738818 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -160,8 +160,7 @@ einampchainedpool_LTLIBRARIES = chained_pool_module.la
160chained_pool_module_la_CPPFLAGS = \ 160chained_pool_module_la_CPPFLAGS = \
161-I$(top_srcdir)/src/lib/eina \ 161-I$(top_srcdir)/src/lib/eina \
162-I$(top_builddir)/src/lib/eina \ 162-I$(top_builddir)/src/lib/eina \
163-DEFL_EINA_BUILD \ 163-DEFL_EINA_BUILD
164@VALGRIND_CFLAGS@
165chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ 164chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
166chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 165chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
167chained_pool_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ 166chained_pool_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
@@ -178,8 +177,7 @@ einamponebig_LTLIBRARIES = one_big_module.la
178one_big_module_la_CPPFLAGS = \ 177one_big_module_la_CPPFLAGS = \
179-I$(top_srcdir)/src/lib/eina \ 178-I$(top_srcdir)/src/lib/eina \
180-I$(top_builddir)/src/lib/eina \ 179-I$(top_builddir)/src/lib/eina \
181-DEFL_EINA_BUILD \ 180-DEFL_EINA_BUILD
182@VALGRIND_CFLAGS@
183one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ 181one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
184one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 182one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
185one_big_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ 183one_big_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
@@ -196,8 +194,7 @@ einamppassthrough_LTLIBRARIES = pass_through_module.la
196pass_through_module_la_CPPFLAGS = \ 194pass_through_module_la_CPPFLAGS = \
197-I$(top_srcdir)/src/lib/eina \ 195-I$(top_srcdir)/src/lib/eina \
198-I$(top_builddir)/src/lib/eina \ 196-I$(top_builddir)/src/lib/eina \
199-DEFL_EINA_BUILD \ 197-DEFL_EINA_BUILD
200@VALGRIND_CFLAGS@
201pass_through_module_la_CFLAGS = @EINA_CFLAGS@ 198pass_through_module_la_CFLAGS = @EINA_CFLAGS@
202pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 199pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
203pass_through_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ 200pass_through_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
@@ -215,8 +212,7 @@ lib_eina_libeina_la_CPPFLAGS = \
215@EFL_CFLAGS@ \ 212@EFL_CFLAGS@ \
216@EFL_COV_CFLAGS@ \ 213@EFL_COV_CFLAGS@ \
217@EFL_PTHREAD_CFLAGS@ \ 214@EFL_PTHREAD_CFLAGS@ \
218@EINA_CFLAGS@ \ 215@EINA_CFLAGS@
219@VALGRIND_CFLAGS@
220 216
221if HAVE_WINDOWS 217if HAVE_WINDOWS
222lib_eina_libeina_la_CPPFLAGS += \ 218lib_eina_libeina_la_CPPFLAGS += \