No need for build dependencies on elementary and edbus.
Neither is used by ico-uxf-homescreen. Adjusted the configure
script, Makefiles and include directives accordingly.
Change-Id: I0cd642dca3fbe8d228ac0fbf81cce655da7a7b84
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
# libraries for homescreen.
PKG_CHECK_MODULES([EDJE], [edje])
-PKG_CHECK_MODULES([ELEM], [elementary])
PKG_CHECK_MODULES([ECOREWAYLAND], [ecore-wayland])
PKG_CHECK_MODULES([ECOREX], [ecore-x])
PKG_CHECK_MODULES([WAYLANDCURSOR], [wayland-cursor])
PKG_CHECK_MODULES([MURPHYRESOURCE], [murphy-resource]);
PKG_CHECK_MODULES([LIBWEBSOCKETS], [libwebsockets]);
PKG_CHECK_MODULES([ECOREEVAS], [ecore-evas])
-PKG_CHECK_MODULES([EDBUS], [edbus])
# Set flags
-EFL_CFLAGS="$EINA_CFLAGS $EVAS_CFLAGS $ECORE_CFLAGS $EDJE_CFLAGS $ELEM_CFLAGS $ECOREWAYLAND_CFLAGS $EDBUS_CFLAGS"
-EFL_LIBS="$EINA_LIBS $EVAS_LIBS $ECORE_LIBS $EDJE_LIBS $ELEM_LIBS $ECOREWAYLAND_LIBS $ECOREX_LIBS $EDBUS_LIBS"
+EFL_CFLAGS="$EINA_CFLAGS $EVAS_CFLAGS $ECORE_CFLAGS $EDJE_CFLAGS $ECOREWAYLAND_CFLAGS"
+EFL_LIBS="$EINA_LIBS $EVAS_LIBS $ECORE_LIBS $EDJE_LIBS $ECOREWAYLAND_LIBS $ECOREX_LIBS"
AC_SUBST(EFL_CFLAGS)
AC_SUBST(EFL_LIBS)
#include <Ecore.h>
#include <Eina.h>
#include <dbus/dbus.h>
-#include <E_DBus.h>
#include <map>
#include <vector>
@MURPHYDOMAINCONTROLLER_CFLAGS@ \
@MURPHYECORE_CFLAGS@ \
@MURPHYRESOURCE_CFLAGS@ \
- @EDBUS_CFLAGS@ \
$(UWS_CFLAGS) \
-I../../include \
-I../common \
@MURPHYDOMAINCONTROLLER_LIBS@ \
@MURPHYECORE_LIBS@ \
@MURPHYRESOURCE_LIBS@ \
- @EDBUS_LIBS@ \
$(UWS_LIBS) \
$(GENIVI_LIBS) \
$(WESTONPLUGIN_LIBS)
BuildRequires: pkgconfig(evas)
BuildRequires: pkgconfig(eina)
BuildRequires: pkgconfig(edje)
-BuildRequires: pkgconfig(elementary)
-BuildRequires: pkgconfig(edbus)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(aul)
Requires: pkgconfig(evas)
Requires: pkgconfig(eina)
Requires: pkgconfig(edje)
-Requires: pkgconfig(elementary)
Requires: pkgconfig(ecore-wayland)
Requires: pkgconfig(ecore-x)
Requires: pkgconfig(glib-2.0)
../../lib/common/.libs/libico-common.a \
@CAPIAPPFWAPPLICATION_LIBS@ \
@PKGMGR_LIBS@ \
+ $(ECOREEVAS_LIBS) \
$(EFL_LIBS) \
$(OPT_LIBS) \
$(WL_LIBS) \
../../lib/common/.libs/libico-common.a \
../../lib/notification/.libs/libico-notification.a \
@CAPIAPPFWAPPLICATION_LIBS@ \
+ $(ECOREEVAS_LIBS) \
$(EFL_LIBS) \
$(OPT_LIBS) \
$(AUL_LIBS) \
#ifndef __CICO_COMMON_WINDOW_H__
#define __CICO_COMMON_WINDOW_H__
-#include <Elementary.h>
-#include <Ecore.h>
+#include <Ecore_Evas.h>
#include <Evas.h>
#include <list>
*/
//==========================================================================
+#include <Edje.h>
#include <ctime>
#include <cassert>
#include <memory>
#ifndef __CICO_COMPONENT_IMPLEMENTATION_H__
#define __CICO_COMPONENT_IMPLEMENTATION_H__
-#include <Elementary.h>
+#include <Evas.h>
#include <ctime>
#include <list>
#include <vector>
#include <Ecore.h>
#include <Ecore_Wayland.h>
#include <Evas.h>
-#include <Elementary.h>
+#include <Edje.h>
#include <ico_log.h>
#include "CicoStatusBar.h"
#ifndef __CICO_STATUSBAR_H__
#define __CICO_STATUSBAR_H__
+#include <Ecore.h>
#include <memory>
#include <list>
#include "CicoComponentImplementation.h"
../../lib/common/.libs/libico-common.a \
../../lib/notification/.libs/libico-notification.a \
@CAPIAPPFWAPPLICATION_LIBS@ \
+ $(ECOREEVAS_LIBS) \
$(EFL_LIBS) \
$(OPT_LIBS) \
$(AUL_LIBS) \
@MURPHYDOMAINCONTROLLER_CFLAGS@ \
@MURPHYECORE_CFLAGS@ \
@MURPHYRESOURCE_CFLAGS@ \
- @EDBUS_CFLAGS@ \
$(UWS_CFLAGS) \
-I../../include \
-I../../lib/system-controller \
@MURPHYDOMAINCONTROLLER_LIBS@ \
@MURPHYECORE_LIBS@ \
@MURPHYRESOURCE_LIBS@ \
- @EDBUS_LIBS@ \
$(UWS_LIBS) \
$(GENIVI_LIBS) \
$(WESTONPLUGIN_LIBS)