forked from enlightenment/efl
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
This commit is contained in:
parent
8bbef8fe28
commit
cd3d6653af
26
configure.ac
26
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([
|
||||
|
|
|
@ -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@
|
||||
|
|
|
@ -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@
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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@
|
||||
|
|
|
@ -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@
|
||||
|
|
|
@ -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@
|
||||
|
||||
|
|
|
@ -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@
|
||||
|
|
|
@ -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@
|
||||
|
|
|
@ -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@
|
||||
|
|
|
@ -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@
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue