jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=42e049fe865fce9a003f00ace172cdedb3f20bef
commit 42e049fe865fce9a003f00ace172cdedb3f20bef
Author: Shinwoo Kim <cinoo....@samsung.com>
Date: Fri May 16 11:26:53 2014 +0900
Win32: Add configuration to cross-compile
Signed-off-by: Jean-Philippe Andre <jp.an...@samsung.com>
---
configure.ac | 1 +
src/Makefile_Ecore.am | 2 +-
src/Makefile_Ecore_Con.am | 2 +-
src/Makefile_Ecore_Ipc.am | 2 +-
src/Makefile_Eet.am | 2 +-
src/Makefile_Efreet.am | 6 +++---
6 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index bea0922..1c915f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1077,6 +1077,7 @@ AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test
"x${have_elm}" = "xyes"])
### Checks for linker characteristics
### Checks for library functions
+EFL_CHECK_FUNCS([EO], [dladdr])
### Check availability
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index d861e5f..9860844 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -109,7 +109,7 @@ lib_ecore_libecore_la_CPPFLAGS =
-I$(top_builddir)/src/lib/efl \
-DPACKAGE_DATA_DIR=\"$(datadir)/ecore\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
@ECORE_CFLAGS@
-lib_ecore_libecore_la_LIBADD = @ECORE_LIBS@
+lib_ecore_libecore_la_LIBADD = @ECORE_LIBS@ @EVIL_LIBS@
lib_ecore_libecore_la_DEPENDENCIES = @ECORE_INTERNAL_LIBS@
lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 06ea520..9a5c2e8 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -34,6 +34,6 @@ endif
endif
lib_ecore_con_libecore_con_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl
@ECORE_CON_CFLAGS@
-lib_ecore_con_libecore_con_la_LIBADD = @ECORE_CON_LIBS@
+lib_ecore_con_libecore_con_la_LIBADD = @ECORE_CON_LIBS@ @EVIL_LIBS@
lib_ecore_con_libecore_con_la_DEPENDENCIES = @ECORE_CON_INTERNAL_LIBS@
lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am
index 1d41e05..4740b76 100644
--- a/src/Makefile_Ecore_Ipc.am
+++ b/src/Makefile_Ecore_Ipc.am
@@ -12,6 +12,6 @@ lib/ecore_ipc/ecore_ipc.c \
lib/ecore_ipc/ecore_ipc_private.h
lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl
@ECORE_IPC_CFLAGS@
-lib_ecore_ipc_libecore_ipc_la_LIBADD = @ECORE_IPC_LIBS@
+lib_ecore_ipc_libecore_ipc_la_LIBADD = @ECORE_IPC_LIBS@ @EVIL_LIBS@
lib_ecore_ipc_libecore_ipc_la_DEPENDENCIES = @ECORE_IPC_INTERNAL_LIBS@
lib_ecore_ipc_libecore_ipc_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index a6055f1..c5da421 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -31,7 +31,7 @@ lib_eet_libeet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
@EET_CFLAGS@
-lib_eet_libeet_la_LIBADD = @EET_LIBS@
+lib_eet_libeet_la_LIBADD = @EET_LIBS@ @EVIL_LIBS@
lib_eet_libeet_la_DEPENDENCIES = @EET_INTERNAL_LIBS@
lib_eet_libeet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index 3225316..6bd62f3 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -46,21 +46,21 @@ lib/efreet/efreet_xml.h \
lib/efreet/efreet_cache_private.h
lib_efreet_libefreet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl
$(EFREET_COMMON_CPPFLAGS)
-lib_efreet_libefreet_la_LIBADD = @EFREET_LIBS@
+lib_efreet_libefreet_la_LIBADD = @EFREET_LIBS@ @EVIL_LIBS@
lib_efreet_libefreet_la_DEPENDENCIES = @EFREET_INTERNAL_LIBS@
lib_efreet_libefreet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
# libefreet_mime.la
lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c
lib_efreet_libefreet_mime_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl
$(EFREET_COMMON_CPPFLAGS)
-lib_efreet_libefreet_mime_la_LIBADD = @USE_EFREET_LIBS@
+lib_efreet_libefreet_mime_la_LIBADD = @USE_EFREET_LIBS@ @EVIL_LIBS@
lib_efreet_libefreet_mime_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
lib_efreet_libefreet_mime_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
# libefreet_trash.la
lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c
lib_efreet_libefreet_trash_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl
$(EFREET_COMMON_CPPFLAGS)
-lib_efreet_libefreet_trash_la_LIBADD = @USE_EFREET_LIBS@
+lib_efreet_libefreet_trash_la_LIBADD = @USE_EFREET_LIBS@ @EVIL_LIBS@
lib_efreet_libefreet_trash_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
--
