From d56568b7f920f7fdcb9049dd9d4b6132f1ff84f5 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Fri, 4 Sep 2009 16:25:18 +0000 Subject: [PATCH] eina_log uses pthreads now (if enabled), so link libeina against pthread SVN revision: 42248 --- legacy/eina/src/lib/Makefile.am | 4 ++-- legacy/eina/src/modules/mp/chained_pool/Makefile.am | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/legacy/eina/src/lib/Makefile.am b/legacy/eina/src/lib/Makefile.am index bb1e988659..8c211d3e24 100644 --- a/legacy/eina/src/lib/Makefile.am +++ b/legacy/eina/src/lib/Makefile.am @@ -69,8 +69,8 @@ libeina_la_SOURCES += $(top_srcdir)/src/modules/mp/pass_through/eina_pass_throug endif libeina_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ -libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ -libeina_la_CFLAGS = @EINA_CFLAGS@ +libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ +libeina_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ clean-local: rm -rf *.gcno diff --git a/legacy/eina/src/modules/mp/chained_pool/Makefile.am b/legacy/eina/src/modules/mp/chained_pool/Makefile.am index 8b84ffe4d1..ffcea5bff0 100644 --- a/legacy/eina/src/modules/mp/chained_pool/Makefile.am +++ b/legacy/eina/src/modules/mp/chained_pool/Makefile.am @@ -4,9 +4,7 @@ AM_CPPFLAGS = \ -I. \ -I$(top_srcdir)/src/include \ -I$(top_builddir)/src/include \ -@EINA_CPPFLAGS@ \ -@EINA_CFLAGS@ \ -@EFL_PTHREAD_CFLAGS@ +@EINA_CPPFLAGS@ if EINA_BUILD_CHAINED_POOL if !EINA_STATIC_BUILD_CHAINED_POOL @@ -17,6 +15,7 @@ controller_LTLIBRARIES = eina_chained_mempool.la eina_chained_mempool_la_SOURCES = \ eina_chained_mempool.c +eina_chained_mempool_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ eina_chained_mempool_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@ eina_chained_mempool_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version @EFL_PTHREAD_LIBS@ eina_chained_mempool_la_LIBTOOLFLAGS = --tag=disable-static