From 2e8a923218f5cd979065b9c993a5e4fe42357a26 Mon Sep 17 00:00:00 2001 From: cedric Date: Fri, 16 Mar 2012 11:25:14 +0000 Subject: [PATCH] eina: fix build when valgrind is not in a standard location. Patch by Raphael Kubo da Costa . git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@69456 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- ChangeLog | 4 ++++ src/lib/Makefile.am | 3 ++- src/modules/mp/chained_pool/eina_chained_mempool.c | 2 +- src/modules/mp/one_big/eina_one_big.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c58513..1237697 100644 --- a/ChangeLog +++ b/ChangeLog @@ -237,3 +237,7 @@ 2012-03-14 Cedric Bail * Fix a dead lock in Eina_File. + +2012-03-16 Raphael Kubo da Costa + + * Adjust Valgrind's CFLAGS to fix the build when it is in a non-default location. diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 880f00b..5de2848 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -6,7 +6,8 @@ AM_CPPFLAGS = \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -@EFL_EINA_BUILD@ +@EFL_EINA_BUILD@ \ +@VALGRIND_CFLAGS@ base_sources = \ eina_accessor.c \ diff --git a/src/modules/mp/chained_pool/eina_chained_mempool.c b/src/modules/mp/chained_pool/eina_chained_mempool.c index 020d0ad..e56df4c 100644 --- a/src/modules/mp/chained_pool/eina_chained_mempool.c +++ b/src/modules/mp/chained_pool/eina_chained_mempool.c @@ -52,7 +52,7 @@ #include "eina_private.h" #ifndef NVALGRIND -# include +# include #endif #if defined DEBUG || defined EINA_DEBUG_MALLOC diff --git a/src/modules/mp/one_big/eina_one_big.c b/src/modules/mp/one_big/eina_one_big.c index dadec65..1159378 100644 --- a/src/modules/mp/one_big/eina_one_big.c +++ b/src/modules/mp/one_big/eina_one_big.c @@ -42,7 +42,7 @@ #include "eina_lock.h" #ifndef NVALGRIND -# include +# include #endif #include "eina_private.h" -- 2.7.4