summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-03-16 11:25:14 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-03-16 11:25:14 +0000
commit51f59ed0f681c6eea49087af5fa1746a14baecd3 (patch)
tree79fd1464ee2cae519da84bd697abf5496d430d38
parent356a798915aa00a5f9a685bec2d6f4f8b29d359e (diff)
eina: fix build when valgrind is not in a standard location.
Patch by Raphael Kubo da Costa <rakuco@freebsd.org>. SVN revision: 69456
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/Makefile.am3
-rw-r--r--src/modules/mp/chained_pool/eina_chained_mempool.c2
-rw-r--r--src/modules/mp/one_big/eina_one_big.c2
4 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e904c8..e7dd7dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,3 +43,7 @@
432012-02-17 Cedric Bail 432012-02-17 Cedric Bail
44 44
45 * Fix forgotten initialization of eina list count during eina_list_split_list. 45 * Fix forgotten initialization of eina list count during eina_list_split_list.
46
472012-03-16 Raphael Kubo da Costa
48
49 * 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 aff0a41..7fcb2ed 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -7,7 +7,8 @@ AM_CPPFLAGS = \
7-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 7-DPACKAGE_LIB_DIR=\"$(libdir)\" \
8-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 8-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
9@EINA_CPPFLAGS@ \ 9@EINA_CPPFLAGS@ \
10@EFL_EINA_BUILD@ 10@EFL_EINA_BUILD@ \
11@VALGRIND_CFLAGS@
11 12
12base_sources = \ 13base_sources = \
13eina_accessor.c \ 14eina_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 df9fe85..7dff285 100644
--- a/src/modules/mp/chained_pool/eina_chained_mempool.c
+++ b/src/modules/mp/chained_pool/eina_chained_mempool.c
@@ -46,7 +46,7 @@
46#include "eina_private.h" 46#include "eina_private.h"
47 47
48#ifndef NVALGRIND 48#ifndef NVALGRIND
49# include <valgrind/memcheck.h> 49# include <memcheck.h>
50#endif 50#endif
51 51
52#ifdef DEBUG 52#ifdef DEBUG
diff --git a/src/modules/mp/one_big/eina_one_big.c b/src/modules/mp/one_big/eina_one_big.c
index 66fed4d..7e3ab73 100644
--- a/src/modules/mp/one_big/eina_one_big.c
+++ b/src/modules/mp/one_big/eina_one_big.c
@@ -41,7 +41,7 @@
41#include "eina_log.h" 41#include "eina_log.h"
42 42
43#ifndef NVALGRIND 43#ifndef NVALGRIND
44# include <valgrind/memcheck.h> 44# include <memcheck.h>
45#endif 45#endif
46 46
47#include "eina_private.h" 47#include "eina_private.h"