summaryrefslogtreecommitdiff
path: root/configure.ac
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 /configure.ac
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 'configure.ac')
-rw-r--r--configure.ac17
1 files changed, 11 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 3c41884..386a24d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,6 +142,11 @@ platform_cflags_evil=""
142platform_cflags_escape="" 142platform_cflags_escape=""
143platform_cflags_exotic="" 143platform_cflags_exotic=""
144 144
145requirements_pc_efl=""
146requirements_pc_deps_efl=""
147requirements_libs_efl=""
148requirements_cflags_efl=""
149
145requirements_pc_crypto="" 150requirements_pc_crypto=""
146requirements_pc_deps_crypto="" 151requirements_pc_deps_crypto=""
147requirements_libs_crypto="" 152requirements_libs_crypto=""
@@ -441,8 +446,8 @@ esac
441EFL_ATTRIBUTE_VECTOR 446EFL_ATTRIBUTE_VECTOR
442EFL_ATTRIBUTE_ALWAYS_INLINE 447EFL_ATTRIBUTE_ALWAYS_INLINE
443 448
444EFL_LIBS="" 449EFL_LIBS="${EFL_LIBS}"
445AC_SUBST([EFL_LIBS]) 450EFL_CFLAGS="${EFL_CFLAGS}"
446 451
447## CPU architecture specific assembly 452## CPU architecture specific assembly
448 453
@@ -826,6 +831,9 @@ EINA_CONFIG([ENABLE_LOG], [test "x${enable_log}" = "xyes"])
826 831
827EFL_CHECK_THREADS 832EFL_CHECK_THREADS
828 833
834EFL_ADD_LIBS([EINA], [${EFL_PTHREAD_LIBS}])
835EFL_ADD_CFLAGS([EINA], [${EFL_PTHREAD_CFLAGS}])
836
829EINA_CONFIG([HAVE_PTHREAD_BARRIER], [test "x${efl_have_pthread_barrier}" = "xyes"]) 837EINA_CONFIG([HAVE_PTHREAD_BARRIER], [test "x${efl_have_pthread_barrier}" = "xyes"])
830EINA_CONFIG([HAVE_PTHREAD_AFFINITY], [test "x${efl_have_setaffinity}" = "xyes"]) 838EINA_CONFIG([HAVE_PTHREAD_AFFINITY], [test "x${efl_have_setaffinity}" = "xyes"])
831EINA_CONFIG([HAVE_DEBUG_THREADS], [test "$want_debug_threads" = "yes"]) 839EINA_CONFIG([HAVE_DEBUG_THREADS], [test "$want_debug_threads" = "yes"])
@@ -3197,9 +3205,6 @@ EFL_INTERNAL_DEPEND_PKG([EFREET], [eina])
3197EFL_LIB_END([Efreet]) 3205EFL_LIB_END([Efreet])
3198#### End of Efreet 3206#### End of Efreet
3199 3207
3200EFL_LIBS="${EFL_LIBS} ${requirements_libs_efl}"
3201
3202
3203AC_CONFIG_FILES([ 3208AC_CONFIG_FILES([
3204Makefile 3209Makefile
3205data/Makefile 3210data/Makefile
@@ -3465,7 +3470,7 @@ echo " Ecore_Evas...................: $have_ecore_evas"
3465 echo " Extn (Plug/socket Extn)....: $have_ecore_evas_extn" 3470 echo " Extn (Plug/socket Extn)....: $have_ecore_evas_extn"
3466#fi 3471#fi
3467echo 3472echo
3468echo "Tests..................: ${with_tests}" 3473echo "Tests..................: ${build_tests}"
3469 3474
3470echo "Examples...............: make examples" 3475echo "Examples...............: make examples"
3471echo " installation.......: make install-examples" 3476echo " installation.......: make install-examples"