aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilherme Iscaro <iscaro@profusion.mobi>2017-01-13 18:24:12 -0200
committerGuilherme Iscaro <iscaro@profusion.mobi>2017-03-15 17:27:53 -0300
commit7101d89c539a77d810eebda2d30b78c4d84c2f9b (patch)
treee6c3d8b8eee3340f6e05a3ddd81ae8908012ab61
parenteina_file: fixed T2244 (diff)
downloadefl-7101d89c539a77d810eebda2d30b78c4d84c2f9b.tar.gz
Edje: Remove EIO dependency.
The lib itself does not use EIO, only edje_watch. In order to avoid linking against an unnecessary library remove EIO from edje dep and only use it to link against edje_watch.
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile_Edje.am4
-rw-r--r--src/lib/edje/edje_private.h4
3 files changed, 2 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 00a6687ff5..2f398c7ca3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4770,7 +4770,6 @@ EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-imf-evas])
EFL_INTERNAL_DEPEND_PKG([EDJE], [embryo])
EFL_INTERNAL_DEPEND_PKG([EDJE], [emile])
EFL_INTERNAL_DEPEND_PKG([EDJE], [efreet])
-EFL_INTERNAL_DEPEND_PKG([EDJE], [eio])
if test "x${want_physics}" = "xyes" ; then
AC_DEFINE([HAVE_EPHYSICS], [1], [EPhysics Support])
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index a4f5073ed1..3859285290 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -209,8 +209,8 @@ bin_edje_edje_pick_LDADD = $(USE_EDJE_BIN_LIBS)
bin_edje_edje_pick_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c
-bin_edje_edje_watch_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_watch_LDADD = $(USE_EDJE_BIN_LIBS)
+bin_edje_edje_watch_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS) -I$(top_srcdir)/src/lib/eio
+bin_edje_edje_watch_LDADD = $(USE_EDJE_BIN_LIBS) $(top_builddir)/src/lib/eio/libeio.la
bin_edje_edje_watch_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
# EPP (Edje's CPP)
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index a849f3034f..551c337b6b 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -56,10 +56,6 @@
#include <Embryo.h>
#include <Efreet.h>
-#ifdef HAVE_EIO
-# include <Eio.h>
-#endif
-
#ifdef HAVE_EPHYSICS
# include <EPhysics.h>
#endif