summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac26
-rw-r--r--pc/ecore.pc.in2
-rw-r--r--pc/eet.pc.in2
-rw-r--r--pc/eina.pc.in2
-rw-r--r--pc/embryo.pc.in2
-rw-r--r--pc/escape.pc.in2
-rw-r--r--src/Makefile_Ecore.am3
-rw-r--r--src/Makefile_Ecore_Audio.am6
-rw-r--r--src/Makefile_Ecore_Con.am2
-rw-r--r--src/Makefile_Ecore_Ipc.am9
-rw-r--r--src/Makefile_Eet.am3
-rw-r--r--src/Makefile_Eina.am8
-rw-r--r--src/Makefile_Embryo.am10
-rw-r--r--src/Makefile_Evas.am8
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
442EFL_ATTRIBUTE_VECTOR 442EFL_ATTRIBUTE_VECTOR
443EFL_ATTRIBUTE_ALWAYS_INLINE 443EFL_ATTRIBUTE_ALWAYS_INLINE
444 444
445EFL_LIBS= 445EFL_LIBS=""
446AC_SUBST([EFL_LIBS]) 446AC_SUBST([EFL_LIBS])
447 447
448## CPU architecture specific assembly 448## CPU architecture specific assembly
@@ -661,7 +661,7 @@ EFL_LIB_START_OPTIONAL([Escape], [test "${have_ps3}" = "yes"])
661### Checks for programs 661### Checks for programs
662 662
663### Checks for libraries 663### Checks for libraries
664EFL_ADD_LIBS([ESCAPE], [-llv2]) 664EFL_ADD_LIBS([ESCAPE], [-llv2 -lm -lnet -lsysmodule -liberty])
665 665
666### Checks for header files 666### Checks for header files
667 667
@@ -747,10 +747,10 @@ AC_DEFINE_IF([EINA_STRINGSHARE_USAGE],
747### Checks for programs 747### Checks for programs
748 748
749### Checks for libraries 749### Checks for libraries
750
751## Compatibility layers
752EFL_PLATFORM_DEPEND([EINA], [all]) 750EFL_PLATFORM_DEPEND([EINA], [all])
753 751
752EFL_ADD_LIBS([EINA], [-lm])
753
754## Options 754## Options
755 755
756# Valgrind 756# Valgrind
@@ -857,6 +857,8 @@ EFL_LIB_START([Eet])
857EFL_PLATFORM_DEPEND([EET], [evil]) 857EFL_PLATFORM_DEPEND([EET], [evil])
858EFL_CRYPTO_DEPEND([EET]) 858EFL_CRYPTO_DEPEND([EET])
859 859
860EFL_ADD_LIBS([EET], [-lm])
861
860# Cryptography support 862# Cryptography support
861if test "$build_crypto" != "none" ; then 863if test "$build_crypto" != "none" ; then
862 AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in eet]) 864 AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in eet])
@@ -1290,8 +1292,7 @@ if test "${have_wince}" = "yes"; then
1290 want_evas_image_loader_webp="no" 1292 want_evas_image_loader_webp="no"
1291fi 1293fi
1292 1294
1293EFL_CHECK_FUNC([DLSYM], [dlsym]) 1295EFL_CHECK_FUNC([EVAS], [dlsym])
1294EFL_ADD_LIBS([EVAS], [${DLSYM_LIBS}])
1295 1296
1296if test "x${efl_func_dlsym}" = "xno" && test "${with_opengl}" != "none"; then 1297if test "x${efl_func_dlsym}" = "xno" && test "${with_opengl}" != "none"; then
1297 AC_MSG_ERROR([OpenGL cannot work without dlsym()]) 1298 AC_MSG_ERROR([OpenGL cannot work without dlsym()])
@@ -1307,6 +1308,8 @@ EFL_INTERNAL_DEPEND_PKG([EVAS], [eo])
1307EFL_INTERNAL_DEPEND_PKG([EVAS], [eet]) 1308EFL_INTERNAL_DEPEND_PKG([EVAS], [eet])
1308EFL_INTERNAL_DEPEND_PKG([EVAS], [eina]) 1309EFL_INTERNAL_DEPEND_PKG([EVAS], [eina])
1309 1310
1311EFL_ADD_LIBS([EVAS], [-lm])
1312
1310# Freetype 1313# Freetype
1311EFL_DEPEND_PKG([EVAS], [FREETYPE], [freetype2 >= 9.3.0]) 1314EFL_DEPEND_PKG([EVAS], [FREETYPE], [freetype2 >= 9.3.0])
1312 1315
@@ -1678,6 +1681,8 @@ EFL_LIB_START([Embryo])
1678EFL_PLATFORM_DEPEND([EMBRYO], [all]) 1681EFL_PLATFORM_DEPEND([EMBRYO], [all])
1679EFL_INTERNAL_DEPEND_PKG([EMBRYO], [eina]) 1682EFL_INTERNAL_DEPEND_PKG([EMBRYO], [eina])
1680 1683
1684EFL_ADD_LIBS([EMBRYO], [-lm])
1685
1681### Checks for header files 1686### Checks for header files
1682 1687
1683### Checks for types 1688### Checks for types
@@ -1764,6 +1769,8 @@ EFL_PLATFORM_DEPEND([ECORE], [all])
1764EFL_INTERNAL_DEPEND_PKG([ECORE], [eo]) 1769EFL_INTERNAL_DEPEND_PKG([ECORE], [eo])
1765EFL_INTERNAL_DEPEND_PKG([ECORE], [eina]) 1770EFL_INTERNAL_DEPEND_PKG([ECORE], [eina])
1766 1771
1772EFL_ADD_LIBS([ECORE], [-lm])
1773
1767# glib 1774# glib
1768 1775
1769EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_glib}], [GLIB], [glib-2.0]) 1776EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_glib}], [GLIB], [glib-2.0])
@@ -1910,6 +1917,8 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eet])
1910EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eina]) 1917EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eina])
1911EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [ecore]) 1918EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [ecore])
1912 1919
1920EFL_ADD_LIBS([ECORE_CON], [-lm])
1921
1913EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_curl}], [CURL], [libcurl]) 1922EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_curl}], [CURL], [libcurl])
1914 1923
1915EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_cares}], 1924EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_cares}],
@@ -2004,6 +2013,8 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore-con])
2004EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore]) 2013EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore])
2005EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eina]) 2014EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eina])
2006 2015
2016EFL_ADD_LIBS([ECORE_IPC], [-lm])
2017
2007### Checks for header files 2018### Checks for header files
2008 2019
2009AC_CHECK_HEADERS([winsock2.h]) 2020AC_CHECK_HEADERS([winsock2.h])
@@ -2392,6 +2403,8 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [ecore])
2392EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eet]) 2403EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eet])
2393EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eina]) 2404EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eina])
2394 2405
2406EFL_ADD_LIBS([ECORE_AUDIO], [-lm])
2407
2395EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_alsa}], [ALSA], [alsa]) 2408EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_alsa}], [ALSA], [alsa])
2396EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_pulseaudio}], [PULSE], [libpulse]) 2409EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_pulseaudio}], [PULSE], [libpulse])
2397EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_sndfile}], [SNDFILE], [sndfile]) 2410EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_sndfile}], [SNDFILE], [sndfile])
@@ -3185,6 +3198,7 @@ EFL_INTERNAL_DEPEND_PKG([EFREET], [eina])
3185EFL_LIB_END([Efreet]) 3198EFL_LIB_END([Efreet])
3186#### End of Efreet 3199#### End of Efreet
3187 3200
3201EFL_LIBS="${EFL_LIBS} ${requirements_libs_efl}"
3188 3202
3189 3203
3190AC_CONFIG_FILES([ 3204AC_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
8Requires.private: @requirements_pc_ecore@ 8Requires.private: @requirements_pc_ecore@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore 10Libs: -L${libdir} -lecore
11Libs.private: @requirements_libs_ecore@ -lm 11Libs.private: @requirements_libs_ecore@
12Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -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
8Version: @VERSION@ 8Version: @VERSION@
9Requires.private: @requirements_pc_eet@ 9Requires.private: @requirements_pc_eet@
10Libs: -L${libdir} -leet 10Libs: -L${libdir} -leet
11Libs.private: @requirements_libs_eet@ -lm 11Libs.private: @requirements_libs_eet@
12Cflags: -I${includedir}/eet-@VMAJ@ 12Cflags: -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
8Requires.private: @requirements_pc_eina@ 8Requires.private: @requirements_pc_eina@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -leina @EFL_PTHREAD_LIBS@ 10Libs: -L${libdir} -leina @EFL_PTHREAD_LIBS@
11Libs.private: @EFL_PTHREAD_LIBS@ @requirements_libs_eina@ -lm 11Libs.private: @EFL_PTHREAD_LIBS@ @requirements_libs_eina@
12Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina 12Cflags: -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
11Version: @VERSION@ 11Version: @VERSION@
12Requires.private: @requirements_pc_embryo@ 12Requires.private: @requirements_pc_embryo@
13Libs: -L${libdir} -lembryo 13Libs: -L${libdir} -lembryo
14Libs.private: @EFL_FNMATCH_LIBS@ -lm 14Libs.private: @requirements_libs_embryo@
15Cflags: -I${includedir}/embryo-@VMAJ@ 15Cflags: -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
7Description: Library that ports on the PS3 some specific Unix functions. 7Description: Library that ports on the PS3 some specific Unix functions.
8Version: @VERSION@ 8Version: @VERSION@
9Libs: -L${libdir} -lescape 9Libs: -L${libdir} -lescape
10Libs.private: -lm -lnet -lsysmodule -liberty 10Libs.private: @requirements_libs_escape@
11Cflags: -I${includedir}/escape-@VMAJ@ 11Cflags: -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 \
65@USE_EVIL_LIBS@ \ 65@USE_EVIL_LIBS@ \
66@USE_ESCAPE_LIBS@ \ 66@USE_ESCAPE_LIBS@ \
67@ECORE_LIBS@ \ 67@ECORE_LIBS@ \
68@EFL_COV_LIBS@ \ 68@EFL_COV_LIBS@
69-lm
70 69
71lib_ecore_libecore_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ 70lib_ecore_libecore_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
72 71
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 = \
31lib/ecore/libecore.la \ 31lib/ecore/libecore.la \
32lib/eet/libeet.la \ 32lib/eet/libeet.la \
33lib/eo/libeo.la \ 33lib/eo/libeo.la \
34lib/eina/libeina.la 34lib/eina/libeina.la \
35 35@ECORE_AUDIO_LIBS@ \
36lib_ecore_audio_libecore_audio_la_LIBADD += @ECORE_AUDIO_LIBS@ @EFL_COV_LIBS@ -lm 36@EFL_COV_LIBS@
37 37
38lib_ecore_audio_libecore_audio_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ 38lib_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 \
53lib/eina/libeina.la \ 53lib/eina/libeina.la \
54@USE_EVIL_LIBS@ 54@USE_EVIL_LIBS@
55 55
56lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@ -lm 56lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@
57 57
58lib_ecore_con_libecore_con_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ 58lib_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 = \
20-I$(top_srcdir)/src/lib/ecore_ipc \ 20-I$(top_srcdir)/src/lib/ecore_ipc \
21-DEFL_ECORE_IPC_BUILD \ 21-DEFL_ECORE_IPC_BUILD \
22@EFL_CFLAGS@ \ 22@EFL_CFLAGS@ \
23@EFL_COV_CFLAGS@ 23@EFL_COV_CFLAGS@ \
24@ECORE_IPC_CFLAGS@
24 25
25lib_ecore_ipc_libecore_ipc_la_LIBADD = \ 26lib_ecore_ipc_libecore_ipc_la_LIBADD = \
26lib/ecore_con/libecore_con.la \ 27lib/ecore_con/libecore_con.la \
27lib/ecore/libecore.la \ 28lib/ecore/libecore.la \
28lib/eo/libeo.la \ 29lib/eo/libeo.la \
29lib/eina/libeina.la 30lib/eina/libeina.la \
30 31@EFL_COV_LIBS@ \
31lib_ecore_ipc_libecore_ipc_la_LIBADD += @EFL_COV_LIBS@ -lm 32@ECORE_IPC_LIBS@
32 33
33lib_ecore_ipc_libecore_ipc_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ 34lib_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 = \
40lib/eina/libeina.la \ 40lib/eina/libeina.la \
41@USE_EVIL_LIBS@ \ 41@USE_EVIL_LIBS@ \
42@EET_LIBS@ \ 42@EET_LIBS@ \
43@EFL_COV_LIBS@ \ 43@EFL_COV_LIBS@
44-lm
45 44
46lib_eet_libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ 45lib_eet_libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
47 46
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 = \
216@VALGRIND_CFLAGS@ \ 216@VALGRIND_CFLAGS@ \
217@USE_EVIL_CFLAGS@ 217@USE_EVIL_CFLAGS@
218 218
219lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ @USE_EVIL_LIBS@ @DL_LIBS@ -lm 219lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ @USE_EVIL_LIBS@ @DL_LIBS@
220 220
221lib_eina_libeina_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ 221lib_eina_libeina_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
222 222
@@ -280,8 +280,7 @@ tests_eina_eina_suite_CPPFLAGS = \
280tests_eina_eina_suite_LDADD = \ 280tests_eina_eina_suite_LDADD = \
281lib/eina/libeina.la \ 281lib/eina/libeina.la \
282@CHECK_LIBS@ \ 282@CHECK_LIBS@ \
283@EINA_LIBS@ \ 283@EINA_LIBS@
284-lm
285 284
286tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx 285tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx
287 286
@@ -311,8 +310,7 @@ tests_eina_module_dummy_la_CPPFLAGS = \
311 310
312tests_eina_module_dummy_la_LIBADD = \ 311tests_eina_module_dummy_la_LIBADD = \
313lib/eina/libeina.la \ 312lib/eina/libeina.la \
314@EINA_LIBS@ \ 313@EINA_LIBS@
315-lm
316 314
317tests_eina_module_dummy_la_LDFLAGS = -no-undefined -module -avoid-version 315tests_eina_module_dummy_la_LDFLAGS = -no-undefined -module -avoid-version
318 316
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 = \
23-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 23-DPACKAGE_LIB_DIR=\"$(libdir)\" \
24-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 24-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
25-DEFL_EMBRYO_BUILD \ 25-DEFL_EMBRYO_BUILD \
26@EMBRYO_CFLAGS@ \
26@EFL_CFLAGS@ \ 27@EFL_CFLAGS@ \
27@USE_EVIL_CFLAGS@ 28@USE_EVIL_CFLAGS@
28 29
29lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la @USE_EVIL_LIBS@ -lm 30lib_embryo_libembryo_la_LIBADD = \
31lib/eina/libeina.la \
32@EMBRYO_LIBS@ \
33@USE_EVIL_LIBS@
30 34
31lib_embryo_libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ 35lib_embryo_libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
32 36
@@ -58,13 +62,13 @@ bin_embryo_embryo_cc_CPPFLAGS = \
58-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 62-DPACKAGE_LIB_DIR=\"$(libdir)\" \
59-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 63-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
60@EFL_CFLAGS@ \ 64@EFL_CFLAGS@ \
65@EMBRYO_CFLAGS@ \
61@USE_EVIL_CFLAGS@ 66@USE_EVIL_CFLAGS@
62 67
63bin_embryo_embryo_cc_LDADD = \ 68bin_embryo_embryo_cc_LDADD = \
64lib/embryo/libembryo.la \ 69lib/embryo/libembryo.la \
65lib/eina/libeina.la \ 70lib/eina/libeina.la \
66@USE_EVIL_LIBS@ \ 71@USE_EVIL_LIBS@
67-lm
68 72
69EXTRA_DIST += \ 73EXTRA_DIST += \
70bin/embryo/embryo_cc_sc5.scp \ 74bin/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 \
232lib/eet/libeet.la \ 232lib/eet/libeet.la \
233lib/eo/libeo.la \ 233lib/eo/libeo.la \
234@EVAS_LIBS@ \ 234@EVAS_LIBS@ \
235@EFL_COV_LIBS@ \ 235@EFL_COV_LIBS@
236-lm
237 236
238lib_evas_libevas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ 237lib_evas_libevas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
239 238
@@ -964,8 +963,7 @@ modules_evas_loaders_bmp_module_la_CPPFLAGS = \
964modules_evas_loaders_bmp_module_la_LIBADD = \ 963modules_evas_loaders_bmp_module_la_LIBADD = \
965lib/evas/libevas.la \ 964lib/evas/libevas.la \
966@EFL_LIBS@ \ 965@EFL_LIBS@ \
967@evas_image_loader_bmp_libs@ \ 966@evas_image_loader_bmp_libs@
968-lm
969modules_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version 967modules_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version
970modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static 968modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static
971endif 969endif
@@ -1582,7 +1580,7 @@ bin_evas_loaders_bmp_module_la_CPPFLAGS = \
1582-I$(top_srcdir)/src/bin/evas \ 1580-I$(top_srcdir)/src/bin/evas \
1583@EFL_CFLAGS@ \ 1581@EFL_CFLAGS@ \
1584@EVAS_CFLAGS@ 1582@EVAS_CFLAGS@
1585bin_evas_loaders_bmp_module_la_LIBADD = @EFL_LIBS@ -lm 1583bin_evas_loaders_bmp_module_la_LIBADD = @EFL_LIBS@
1586bin_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version 1584bin_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version
1587bin_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static 1585bin_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static
1588endif 1586endif