summaryrefslogtreecommitdiff
path: root/src/Makefile_Eina.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-31 00:46:14 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-31 00:46:14 +0000
commitdf1b3d30c4ca130fcecce67b2c0fcbbbcfa5a29c (patch)
treee26086071ac285910d3e162c39819f3a2c3affea /src/Makefile_Eina.am
parent51f8fe26fc4774e69be3547d49ae902c287c8b61 (diff)
efl: refactor CFLAGS, LIBS, LIBADD and LDADD usage.
- remove EFL_LIBS and EFL_CFLAGS, use per-lib values that inherit from EFL (general) - add NAME_LDFLAGS and EFL_LDFLAGS for linker flags. - LDADD (binaries) now use NAME_LDFLAGS instead of NAME_LIBS, as they link to libname.la and that will pull in the libtool dependencies SVN revision: 81915
Diffstat (limited to 'src/Makefile_Eina.am')
-rw-r--r--src/Makefile_Eina.am20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index d457f18018..ed8c80ef87 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -161,10 +161,10 @@ chained_pool_module_la_CPPFLAGS = \
161-I$(top_srcdir)/src/lib/eina \ 161-I$(top_srcdir)/src/lib/eina \
162-I$(top_builddir)/src/lib/eina \ 162-I$(top_builddir)/src/lib/eina \
163-DEFL_EINA_BUILD 163-DEFL_EINA_BUILD
164chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ @VALGRIND_CFLAGS@ 164chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@
165chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 165chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
166chained_pool_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ 166chained_pool_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
167chained_pool_module_la_LDFLAGS = -no-undefined -module -avoid-version @EFL_PTHREAD_LIBS@ 167chained_pool_module_la_LDFLAGS = -no-undefined -module -avoid-version
168chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static 168chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static
169endif 169endif
170 170
@@ -178,10 +178,10 @@ one_big_module_la_CPPFLAGS = \
178-I$(top_srcdir)/src/lib/eina \ 178-I$(top_srcdir)/src/lib/eina \
179-I$(top_builddir)/src/lib/eina \ 179-I$(top_builddir)/src/lib/eina \
180-DEFL_EINA_BUILD 180-DEFL_EINA_BUILD
181one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ @VALGRIND_CFLAGS@ 181one_big_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@
182one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 182one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
183one_big_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ 183one_big_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
184one_big_module_la_LDFLAGS = -no-undefined -module -avoid-version @EFL_PTHREAD_LIBS@ 184one_big_module_la_LDFLAGS = -no-undefined -module -avoid-version
185one_big_module_la_LIBTOOLFLAGS = --tag=disable-static 185one_big_module_la_LIBTOOLFLAGS = --tag=disable-static
186endif 186endif
187 187
@@ -209,14 +209,16 @@ lib_eina_libeina_la_CPPFLAGS = \
209-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 209-DPACKAGE_LIB_DIR=\"$(libdir)\" \
210-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 210-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
211-DEFL_EINA_BUILD \ 211-DEFL_EINA_BUILD \
212@EFL_CFLAGS@ \
213@EFL_COV_CFLAGS@ \ 212@EFL_COV_CFLAGS@ \
214@EFL_PTHREAD_CFLAGS@ \
215@EINA_CFLAGS@ \ 213@EINA_CFLAGS@ \
216@VALGRIND_CFLAGS@ \ 214@VALGRIND_CFLAGS@ \
217@USE_EVIL_CFLAGS@ 215@USE_EVIL_CFLAGS@
218 216
219lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ @USE_EVIL_LIBS@ @DL_LIBS@ 217lib_eina_libeina_la_LIBADD = \
218@EINA_LIBS@ \
219@EFL_COV_LIBS@ \
220@USE_EVIL_LIBS@ \
221@DL_LIBS@
220lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 222lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
221 223
222### Script 224### Script
@@ -279,7 +281,7 @@ tests_eina_eina_suite_CPPFLAGS = \
279tests_eina_eina_suite_LDADD = \ 281tests_eina_eina_suite_LDADD = \
280lib/eina/libeina.la \ 282lib/eina/libeina.la \
281@CHECK_LIBS@ \ 283@CHECK_LIBS@ \
282@EINA_LIBS@ 284@EINA_LDFLAGS@
283 285
284tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx 286tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx
285 287
@@ -291,7 +293,7 @@ tests_eina_cxx_compile_test_CPPFLAGS = \
291 293
292tests_eina_cxx_compile_test_LDADD = \ 294tests_eina_cxx_compile_test_LDADD = \
293lib/eina/libeina.la \ 295lib/eina/libeina.la \
294@EINA_LIBS@ 296@EINA_LDFLAGS@
295 297
296EXTRA_LTLIBRARIES = tests/eina/module_dummy.la 298EXTRA_LTLIBRARIES = tests/eina/module_dummy.la
297 299