orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efl/eina: fix mempools when they are not static 

although we force them to be fixed to static, we left the automake to
make it possible and they were wrong:
 - missed the proper directory prefix for .la files (were being generated at src/)
 - had typos due copy & paste, with chained being used in some places.



SVN revision: 81933
This commit is contained in:
Gustavo Sverzut Barbieri 2012-12-31 14:42:35 +00:00
parent 385d994709
commit 8ffc6d6909
1 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/Makefile_Eina.am
View File

@ -151,55 +151,59 @@ else
lib_eina_libeina_la_SOURCES += lib/eina/eina_file.c
endif
EINA_MODULE_COMMON_CPPFLAGS = \
-I$(top_srcdir)/src/lib/eina \
-I$(top_builddir)/src/lib/eina \
-DEFL_EINA_BUILD
EINA_MODULE_COMMON_CFLAGS = \
@EINA_CFLAGS@ \
@VALGRIND_CFLAGS@
EINA_MODULE_COMMON_LIBADD = \
lib/eina/libeina.la \
@EINA_LIBS@
if EINA_STATIC_BUILD_CHAINED_POOL
lib_eina_libeina_la_SOURCES += modules/eina/mp/chained_pool/eina_chained_mempool.c
else
einampchainedpooldir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH)
einampchainedpool_LTLIBRARIES = chained_pool_module.la
einampchainedpool_LTLIBRARIES = modules/eina/mp/chained_pool/chained_pool_module.la
chained_pool_module_la_CPPFLAGS = \
-I$(top_srcdir)/src/lib/eina \
-I$(top_builddir)/src/lib/eina \
-DEFL_EINA_BUILD
chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@
chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
chained_pool_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
chained_pool_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static
modules_eina_mp_chained_pool_chained_pool_module_la_CPPFLAGS = $(EINA_MODULE_COMMON_CPPFLAGS)
modules_eina_mp_chained_pool_chained_pool_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
modules_eina_mp_chained_pool_chained_pool_module_la_LIBADD = $(EINA_MODULE_COMMON_LIBADD)
modules_eina_mp_chained_pool_chained_pool_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_eina_mp_chained_pool_chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static
modules_eina_mp_chained_pool_chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
endif
if EINA_STATIC_BUILD_ONE_BIG
lib_eina_libeina_la_SOURCES += modules/eina/mp/one_big/eina_one_big.c
else
einamponebigdir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH)
einamponebig_LTLIBRARIES = one_big_module.la
einamponebigdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH)
einamponebig_LTLIBRARIES = modules/eina/mp/one_big/one_big_module.la
one_big_module_la_CPPFLAGS = \
-I$(top_srcdir)/src/lib/eina \
-I$(top_builddir)/src/lib/eina \
-DEFL_EINA_BUILD
one_big_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@
one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
one_big_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
one_big_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
one_big_module_la_LIBTOOLFLAGS = --tag=disable-static
modules_eina_mp_one_big_one_big_module_la_CPPFLAGS = $(EINA_MODULE_COMMON_CPPFLAGS)
modules_eina_mp_one_big_one_big_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
modules_eina_mp_one_big_one_big_module_la_LIBADD = $(EINA_MODULE_COMMON_LIBADD)
modules_eina_mp_one_big_one_big_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_eina_mp_one_big_one_big_module_la_LIBTOOLFLAGS = --tag=disable-static
modules_eina_mp_one_big_one_big_module_la_SOURCES = modules/eina/mp/one_big/eina_one_big.c
endif
if EINA_STATIC_BUILD_PASS_THROUGH
lib_eina_libeina_la_SOURCES += modules/eina/mp/pass_through/eina_pass_through.c
else
einamppassthroughdir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH)
einamppassthrough_LTLIBRARIES = pass_through_module.la
einamppassthroughdir = $(libdir)/eina/modules/mp/pass_through/$(MODULE_ARCH)
einamppassthrough_LTLIBRARIES = modules/eina/mp/pass_through/pass_through_module.la
pass_through_module_la_CPPFLAGS = \
-I$(top_srcdir)/src/lib/eina \
-I$(top_builddir)/src/lib/eina \
-DEFL_EINA_BUILD
pass_through_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@
pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
pass_through_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
pass_through_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
pass_through_module_la_LIBTOOLFLAGS = --tag=disable-static
modules_eina_mp_pass_through_pass_through_module_la_CPPFLAGS = $(EINA_MODULE_COMMON_CPPFLAGS)
modules_eina_mp_pass_through_pass_through_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
modules_eina_mp_pass_through_pass_through_module_la_LIBADD = $(EINA_MODULE_COMMON_LIBADD)
modules_eina_mp_pass_through_pass_through_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_eina_mp_pass_through_pass_through_module_la_LIBTOOLFLAGS = --tag=disable-static
modules_eina_mp_pass_through_pass_through_module_la_SOURCES = modules/eina/mp/pass_through/eina_pass_through.c
endif
lib_eina_libeina_la_CPPFLAGS = \