aboutsummaryrefslogtreecommitdiffstats
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
parentefl: forgotten evas commit. (diff)
downloadefl-df1b3d30c4ca130fcecce67b2c0fcbbbcfa5a29c.tar.gz
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 3c41884931..386a24dcc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,6 +142,11 @@ platform_cflags_evil=""
platform_cflags_escape=""
platform_cflags_exotic=""
+requirements_pc_efl=""
+requirements_pc_deps_efl=""
+requirements_libs_efl=""
+requirements_cflags_efl=""
+
requirements_pc_crypto=""
requirements_pc_deps_crypto=""
requirements_libs_crypto=""
@@ -441,8 +446,8 @@ esac
EFL_ATTRIBUTE_VECTOR
EFL_ATTRIBUTE_ALWAYS_INLINE
-EFL_LIBS=""
-AC_SUBST([EFL_LIBS])
+EFL_LIBS="${EFL_LIBS}"
+EFL_CFLAGS="${EFL_CFLAGS}"
## CPU architecture specific assembly
@@ -826,6 +831,9 @@ EINA_CONFIG([ENABLE_LOG], [test "x${enable_log}" = "xyes"])
EFL_CHECK_THREADS
+EFL_ADD_LIBS([EINA], [${EFL_PTHREAD_LIBS}])
+EFL_ADD_CFLAGS([EINA], [${EFL_PTHREAD_CFLAGS}])
+
EINA_CONFIG([HAVE_PTHREAD_BARRIER], [test "x${efl_have_pthread_barrier}" = "xyes"])
EINA_CONFIG([HAVE_PTHREAD_AFFINITY], [test "x${efl_have_setaffinity}" = "xyes"])
EINA_CONFIG([HAVE_DEBUG_THREADS], [test "$want_debug_threads" = "yes"])
@@ -3197,9 +3205,6 @@ EFL_INTERNAL_DEPEND_PKG([EFREET], [eina])
EFL_LIB_END([Efreet])
#### End of Efreet
-EFL_LIBS="${EFL_LIBS} ${requirements_libs_efl}"
-
-
AC_CONFIG_FILES([
Makefile
data/Makefile
@@ -3465,7 +3470,7 @@ echo " Ecore_Evas...................: $have_ecore_evas"
echo " Extn (Plug/socket Extn)....: $have_ecore_evas_extn"
#fi
echo
-echo "Tests..................: ${with_tests}"
+echo "Tests..................: ${build_tests}"
echo "Examples...............: make examples"
echo " installation.......: make install-examples"