summaryrefslogtreecommitdiff
path: root/src/Makefile_Eina.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-31 14:42:35 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-31 14:42:35 +0000
commit8ffc6d6909cfff26db6d759831c3f4161ed70c39 (patch)
tree93c68863406b154415bdf6bc26c01c04e5eb61fa /src/Makefile_Eina.am
parent385d9947092e27e044e7e9037de5a4613ece96ee (diff)
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
Diffstat (limited to 'src/Makefile_Eina.am')
-rw-r--r--src/Makefile_Eina.am74
1 files changed, 39 insertions, 35 deletions
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index fa2a727..4b87f33 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -151,55 +151,59 @@ else
151lib_eina_libeina_la_SOURCES += lib/eina/eina_file.c 151lib_eina_libeina_la_SOURCES += lib/eina/eina_file.c
152endif 152endif
153 153
154EINA_MODULE_COMMON_CPPFLAGS = \
155-I$(top_srcdir)/src/lib/eina \
156-I$(top_builddir)/src/lib/eina \
157-DEFL_EINA_BUILD
158
159EINA_MODULE_COMMON_CFLAGS = \
160@EINA_CFLAGS@ \
161@VALGRIND_CFLAGS@
162
163EINA_MODULE_COMMON_LIBADD = \
164lib/eina/libeina.la \
165@EINA_LIBS@
166
154if EINA_STATIC_BUILD_CHAINED_POOL 167if EINA_STATIC_BUILD_CHAINED_POOL
155lib_eina_libeina_la_SOURCES += modules/eina/mp/chained_pool/eina_chained_mempool.c 168lib_eina_libeina_la_SOURCES += modules/eina/mp/chained_pool/eina_chained_mempool.c
156else 169else
157einampchainedpooldir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH) 170einampchainedpooldir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH)
158einampchainedpool_LTLIBRARIES = chained_pool_module.la 171einampchainedpool_LTLIBRARIES = modules/eina/mp/chained_pool/chained_pool_module.la
159 172
160chained_pool_module_la_CPPFLAGS = \ 173modules_eina_mp_chained_pool_chained_pool_module_la_CPPFLAGS = $(EINA_MODULE_COMMON_CPPFLAGS)
161-I$(top_srcdir)/src/lib/eina \ 174modules_eina_mp_chained_pool_chained_pool_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
162-I$(top_builddir)/src/lib/eina \ 175modules_eina_mp_chained_pool_chained_pool_module_la_LIBADD = $(EINA_MODULE_COMMON_LIBADD)
163-DEFL_EINA_BUILD 176modules_eina_mp_chained_pool_chained_pool_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
164chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@ 177modules_eina_mp_chained_pool_chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static
165chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 178modules_eina_mp_chained_pool_chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
166chained_pool_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
167chained_pool_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
168chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static
169endif 179endif
170 180
171if EINA_STATIC_BUILD_ONE_BIG 181if EINA_STATIC_BUILD_ONE_BIG
172lib_eina_libeina_la_SOURCES += modules/eina/mp/one_big/eina_one_big.c 182lib_eina_libeina_la_SOURCES += modules/eina/mp/one_big/eina_one_big.c
173else 183else
174einamponebigdir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH) 184einamponebigdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH)
175einamponebig_LTLIBRARIES = one_big_module.la 185einamponebig_LTLIBRARIES = modules/eina/mp/one_big/one_big_module.la
176 186
177one_big_module_la_CPPFLAGS = \ 187modules_eina_mp_one_big_one_big_module_la_CPPFLAGS = $(EINA_MODULE_COMMON_CPPFLAGS)
178-I$(top_srcdir)/src/lib/eina \ 188modules_eina_mp_one_big_one_big_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
179-I$(top_builddir)/src/lib/eina \ 189modules_eina_mp_one_big_one_big_module_la_LIBADD = $(EINA_MODULE_COMMON_LIBADD)
180-DEFL_EINA_BUILD 190modules_eina_mp_one_big_one_big_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
181one_big_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@ 191modules_eina_mp_one_big_one_big_module_la_LIBTOOLFLAGS = --tag=disable-static
182one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 192modules_eina_mp_one_big_one_big_module_la_SOURCES = modules/eina/mp/one_big/eina_one_big.c
183one_big_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
184one_big_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
185one_big_module_la_LIBTOOLFLAGS = --tag=disable-static
186endif 193endif
187 194
188if EINA_STATIC_BUILD_PASS_THROUGH 195if EINA_STATIC_BUILD_PASS_THROUGH
189lib_eina_libeina_la_SOURCES += modules/eina/mp/pass_through/eina_pass_through.c 196lib_eina_libeina_la_SOURCES += modules/eina/mp/pass_through/eina_pass_through.c
190else 197else
191einamppassthroughdir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH) 198einamppassthroughdir = $(libdir)/eina/modules/mp/pass_through/$(MODULE_ARCH)
192einamppassthrough_LTLIBRARIES = pass_through_module.la 199einamppassthrough_LTLIBRARIES = modules/eina/mp/pass_through/pass_through_module.la
193 200
194pass_through_module_la_CPPFLAGS = \ 201modules_eina_mp_pass_through_pass_through_module_la_CPPFLAGS = $(EINA_MODULE_COMMON_CPPFLAGS)
195-I$(top_srcdir)/src/lib/eina \ 202modules_eina_mp_pass_through_pass_through_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
196-I$(top_builddir)/src/lib/eina \ 203modules_eina_mp_pass_through_pass_through_module_la_LIBADD = $(EINA_MODULE_COMMON_LIBADD)
197-DEFL_EINA_BUILD 204modules_eina_mp_pass_through_pass_through_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
198pass_through_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@ 205modules_eina_mp_pass_through_pass_through_module_la_LIBTOOLFLAGS = --tag=disable-static
199pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 206modules_eina_mp_pass_through_pass_through_module_la_SOURCES = modules/eina/mp/pass_through/eina_pass_through.c
200pass_through_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
201pass_through_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
202pass_through_module_la_LIBTOOLFLAGS = --tag=disable-static
203endif 207endif
204 208
205lib_eina_libeina_la_CPPFLAGS = \ 209lib_eina_libeina_la_CPPFLAGS = \