From cd3d6653af9ae6af278e5553761202f196dcee78 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Sun, 30 Dec 2012 21:52:34 +0000 Subject: [PATCH] efl: move -lm to configure.ac variables. EFL_ADD_LIBS() will add to requirements_libs_NAME and that will end into NAME_LIBS. SVN revision: 81910 --- configure.ac | 26 ++++++++++++++++++++------ pc/ecore.pc.in | 2 +- pc/eet.pc.in | 2 +- pc/eina.pc.in | 2 +- pc/embryo.pc.in | 2 +- pc/escape.pc.in | 2 +- src/Makefile_Ecore.am | 3 +-- src/Makefile_Ecore_Audio.am | 6 +++--- src/Makefile_Ecore_Con.am | 2 +- src/Makefile_Ecore_Ipc.am | 9 +++++---- src/Makefile_Eet.am | 3 +-- src/Makefile_Eina.am | 8 +++----- src/Makefile_Embryo.am | 10 +++++++--- src/Makefile_Evas.am | 8 +++----- 14 files changed, 49 insertions(+), 36 deletions(-) diff --git a/configure.ac b/configure.ac index 2b1a3d5a75..b666acea48 100644 --- a/configure.ac +++ b/configure.ac @@ -442,7 +442,7 @@ esac EFL_ATTRIBUTE_VECTOR EFL_ATTRIBUTE_ALWAYS_INLINE -EFL_LIBS= +EFL_LIBS="" AC_SUBST([EFL_LIBS]) ## CPU architecture specific assembly @@ -661,7 +661,7 @@ EFL_LIB_START_OPTIONAL([Escape], [test "${have_ps3}" = "yes"]) ### Checks for programs ### Checks for libraries -EFL_ADD_LIBS([ESCAPE], [-llv2]) +EFL_ADD_LIBS([ESCAPE], [-llv2 -lm -lnet -lsysmodule -liberty]) ### Checks for header files @@ -747,10 +747,10 @@ AC_DEFINE_IF([EINA_STRINGSHARE_USAGE], ### Checks for programs ### Checks for libraries - -## Compatibility layers EFL_PLATFORM_DEPEND([EINA], [all]) +EFL_ADD_LIBS([EINA], [-lm]) + ## Options # Valgrind @@ -857,6 +857,8 @@ EFL_LIB_START([Eet]) EFL_PLATFORM_DEPEND([EET], [evil]) EFL_CRYPTO_DEPEND([EET]) +EFL_ADD_LIBS([EET], [-lm]) + # Cryptography support if test "$build_crypto" != "none" ; then AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in eet]) @@ -1290,8 +1292,7 @@ if test "${have_wince}" = "yes"; then want_evas_image_loader_webp="no" fi -EFL_CHECK_FUNC([DLSYM], [dlsym]) -EFL_ADD_LIBS([EVAS], [${DLSYM_LIBS}]) +EFL_CHECK_FUNC([EVAS], [dlsym]) if test "x${efl_func_dlsym}" = "xno" && test "${with_opengl}" != "none"; then AC_MSG_ERROR([OpenGL cannot work without dlsym()]) @@ -1307,6 +1308,8 @@ EFL_INTERNAL_DEPEND_PKG([EVAS], [eo]) EFL_INTERNAL_DEPEND_PKG([EVAS], [eet]) EFL_INTERNAL_DEPEND_PKG([EVAS], [eina]) +EFL_ADD_LIBS([EVAS], [-lm]) + # Freetype EFL_DEPEND_PKG([EVAS], [FREETYPE], [freetype2 >= 9.3.0]) @@ -1678,6 +1681,8 @@ EFL_LIB_START([Embryo]) EFL_PLATFORM_DEPEND([EMBRYO], [all]) EFL_INTERNAL_DEPEND_PKG([EMBRYO], [eina]) +EFL_ADD_LIBS([EMBRYO], [-lm]) + ### Checks for header files ### Checks for types @@ -1764,6 +1769,8 @@ EFL_PLATFORM_DEPEND([ECORE], [all]) EFL_INTERNAL_DEPEND_PKG([ECORE], [eo]) EFL_INTERNAL_DEPEND_PKG([ECORE], [eina]) +EFL_ADD_LIBS([ECORE], [-lm]) + # glib EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_glib}], [GLIB], [glib-2.0]) @@ -1910,6 +1917,8 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eet]) EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eina]) EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [ecore]) +EFL_ADD_LIBS([ECORE_CON], [-lm]) + EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_curl}], [CURL], [libcurl]) EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_cares}], @@ -2004,6 +2013,8 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore-con]) EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eina]) +EFL_ADD_LIBS([ECORE_IPC], [-lm]) + ### Checks for header files AC_CHECK_HEADERS([winsock2.h]) @@ -2392,6 +2403,8 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eet]) EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eina]) +EFL_ADD_LIBS([ECORE_AUDIO], [-lm]) + EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_alsa}], [ALSA], [alsa]) EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_pulseaudio}], [PULSE], [libpulse]) EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_sndfile}], [SNDFILE], [sndfile]) @@ -3185,6 +3198,7 @@ EFL_INTERNAL_DEPEND_PKG([EFREET], [eina]) EFL_LIB_END([Efreet]) #### End of Efreet +EFL_LIBS="${EFL_LIBS} ${requirements_libs_efl}" AC_CONFIG_FILES([ diff --git a/pc/ecore.pc.in b/pc/ecore.pc.in index f141c4cad7..0fbe8f7d7b 100644 --- a/pc/ecore.pc.in +++ b/pc/ecore.pc.in @@ -8,5 +8,5 @@ Description: Ecore event abstraction library Requires.private: @requirements_pc_ecore@ Version: @VERSION@ Libs: -L${libdir} -lecore -Libs.private: @requirements_libs_ecore@ -lm +Libs.private: @requirements_libs_ecore@ Cflags: -I${includedir}/ecore-@VMAJ@ diff --git a/pc/eet.pc.in b/pc/eet.pc.in index af3304cf38..f932978dc9 100644 --- a/pc/eet.pc.in +++ b/pc/eet.pc.in @@ -8,5 +8,5 @@ Description: Library for speedy data storage, retrieval, and compression Version: @VERSION@ Requires.private: @requirements_pc_eet@ Libs: -L${libdir} -leet -Libs.private: @requirements_libs_eet@ -lm +Libs.private: @requirements_libs_eet@ Cflags: -I${includedir}/eet-@VMAJ@ diff --git a/pc/eina.pc.in b/pc/eina.pc.in index c45b84f7d7..c5a10f2e1a 100644 --- a/pc/eina.pc.in +++ b/pc/eina.pc.in @@ -8,5 +8,5 @@ Description: A Library that implements fast data types and miscellaneous tools Requires.private: @requirements_pc_eina@ Version: @VERSION@ Libs: -L${libdir} -leina @EFL_PTHREAD_LIBS@ -Libs.private: @EFL_PTHREAD_LIBS@ @requirements_libs_eina@ -lm +Libs.private: @EFL_PTHREAD_LIBS@ @requirements_libs_eina@ Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina diff --git a/pc/embryo.pc.in b/pc/embryo.pc.in index 8e5062ca9f..9d7e121ffc 100644 --- a/pc/embryo.pc.in +++ b/pc/embryo.pc.in @@ -11,5 +11,5 @@ Description: A small virtual machine engine and bytecode compiler Version: @VERSION@ Requires.private: @requirements_pc_embryo@ Libs: -L${libdir} -lembryo -Libs.private: @EFL_FNMATCH_LIBS@ -lm +Libs.private: @requirements_libs_embryo@ Cflags: -I${includedir}/embryo-@VMAJ@ diff --git a/pc/escape.pc.in b/pc/escape.pc.in index 5d18d8008e..b021b69e68 100644 --- a/pc/escape.pc.in +++ b/pc/escape.pc.in @@ -7,5 +7,5 @@ Name: escape Description: Library that ports on the PS3 some specific Unix functions. Version: @VERSION@ Libs: -L${libdir} -lescape -Libs.private: -lm -lnet -lsysmodule -liberty +Libs.private: @requirements_libs_escape@ Cflags: -I${includedir}/escape-@VMAJ@ diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am index 9fff02f21a..703bf912b7 100644 --- a/src/Makefile_Ecore.am +++ b/src/Makefile_Ecore.am @@ -65,8 +65,7 @@ lib/eina/libeina.la \ @USE_EVIL_LIBS@ \ @USE_ESCAPE_LIBS@ \ @ECORE_LIBS@ \ -@EFL_COV_LIBS@ \ --lm +@EFL_COV_LIBS@ lib_ecore_libecore_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am index a6cd46ac0c..76db4a299b 100644 --- a/src/Makefile_Ecore_Audio.am +++ b/src/Makefile_Ecore_Audio.am @@ -31,8 +31,8 @@ lib_ecore_audio_libecore_audio_la_LIBADD = \ lib/ecore/libecore.la \ lib/eet/libeet.la \ lib/eo/libeo.la \ -lib/eina/libeina.la - -lib_ecore_audio_libecore_audio_la_LIBADD += @ECORE_AUDIO_LIBS@ @EFL_COV_LIBS@ -lm +lib/eina/libeina.la \ +@ECORE_AUDIO_LIBS@ \ +@EFL_COV_LIBS@ lib_ecore_audio_libecore_audio_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am index df18c90f9f..61b535e496 100644 --- a/src/Makefile_Ecore_Con.am +++ b/src/Makefile_Ecore_Con.am @@ -53,6 +53,6 @@ lib/eo/libeo.la \ lib/eina/libeina.la \ @USE_EVIL_LIBS@ -lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@ -lm +lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@ lib_ecore_con_libecore_con_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am index ea219d1bd4..250c1b50e1 100644 --- a/src/Makefile_Ecore_Ipc.am +++ b/src/Makefile_Ecore_Ipc.am @@ -20,14 +20,15 @@ lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_ipc \ -DEFL_ECORE_IPC_BUILD \ @EFL_CFLAGS@ \ -@EFL_COV_CFLAGS@ +@EFL_COV_CFLAGS@ \ +@ECORE_IPC_CFLAGS@ lib_ecore_ipc_libecore_ipc_la_LIBADD = \ lib/ecore_con/libecore_con.la \ lib/ecore/libecore.la \ lib/eo/libeo.la \ -lib/eina/libeina.la - -lib_ecore_ipc_libecore_ipc_la_LIBADD += @EFL_COV_LIBS@ -lm +lib/eina/libeina.la \ +@EFL_COV_LIBS@ \ +@ECORE_IPC_LIBS@ lib_ecore_ipc_libecore_ipc_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am index 83c24759f1..647f1ea24f 100644 --- a/src/Makefile_Eet.am +++ b/src/Makefile_Eet.am @@ -40,8 +40,7 @@ lib_eet_libeet_la_LIBADD = \ lib/eina/libeina.la \ @USE_EVIL_LIBS@ \ @EET_LIBS@ \ -@EFL_COV_LIBS@ \ --lm +@EFL_COV_LIBS@ lib_eet_libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am index ad17bae531..654c749e69 100644 --- a/src/Makefile_Eina.am +++ b/src/Makefile_Eina.am @@ -216,7 +216,7 @@ lib_eina_libeina_la_CPPFLAGS = \ @VALGRIND_CFLAGS@ \ @USE_EVIL_CFLAGS@ -lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ @USE_EVIL_LIBS@ @DL_LIBS@ -lm +lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ @USE_EVIL_LIBS@ @DL_LIBS@ lib_eina_libeina_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ @@ -280,8 +280,7 @@ tests_eina_eina_suite_CPPFLAGS = \ tests_eina_eina_suite_LDADD = \ lib/eina/libeina.la \ @CHECK_LIBS@ \ -@EINA_LIBS@ \ --lm +@EINA_LIBS@ tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx @@ -311,8 +310,7 @@ tests_eina_module_dummy_la_CPPFLAGS = \ tests_eina_module_dummy_la_LIBADD = \ lib/eina/libeina.la \ -@EINA_LIBS@ \ --lm +@EINA_LIBS@ tests_eina_module_dummy_la_LDFLAGS = -no-undefined -module -avoid-version diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am index 66acb32719..fc11904080 100644 --- a/src/Makefile_Embryo.am +++ b/src/Makefile_Embryo.am @@ -23,10 +23,14 @@ lib_embryo_libembryo_la_CPPFLAGS = \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ -DEFL_EMBRYO_BUILD \ +@EMBRYO_CFLAGS@ \ @EFL_CFLAGS@ \ @USE_EVIL_CFLAGS@ -lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la @USE_EVIL_LIBS@ -lm +lib_embryo_libembryo_la_LIBADD = \ +lib/eina/libeina.la \ +@EMBRYO_LIBS@ \ +@USE_EVIL_LIBS@ lib_embryo_libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @@ -58,13 +62,13 @@ bin_embryo_embryo_cc_CPPFLAGS = \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ @EFL_CFLAGS@ \ +@EMBRYO_CFLAGS@ \ @USE_EVIL_CFLAGS@ bin_embryo_embryo_cc_LDADD = \ lib/embryo/libembryo.la \ lib/eina/libeina.la \ -@USE_EVIL_LIBS@ \ --lm +@USE_EVIL_LIBS@ EXTRA_DIST += \ bin/embryo/embryo_cc_sc5.scp \ diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 8d8441cc71..56696d39bf 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -232,8 +232,7 @@ lib/eina/libeina.la \ lib/eet/libeet.la \ lib/eo/libeo.la \ @EVAS_LIBS@ \ -@EFL_COV_LIBS@ \ --lm +@EFL_COV_LIBS@ lib_evas_libevas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @@ -964,8 +963,7 @@ modules_evas_loaders_bmp_module_la_CPPFLAGS = \ modules_evas_loaders_bmp_module_la_LIBADD = \ lib/evas/libevas.la \ @EFL_LIBS@ \ -@evas_image_loader_bmp_libs@ \ --lm +@evas_image_loader_bmp_libs@ modules_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1582,7 +1580,7 @@ bin_evas_loaders_bmp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/bin/evas \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ -bin_evas_loaders_bmp_module_la_LIBADD = @EFL_LIBS@ -lm +bin_evas_loaders_bmp_module_la_LIBADD = @EFL_LIBS@ bin_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version bin_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static endif