Removed unnecessary build dependencies.

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>

diff --git a/configure.ac b/configure.ac
index 0cb8190..1827c6f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ PKG_CHECK_MODULES([APPSVC], [appsvc])
 
 # 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])
@@ -57,11 +56,10 @@ PKG_CHECK_MODULES([MURPHYECORE], [murphy-ecore]);
 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)
 

diff --git a/lib/system-controller/CicoSCPolicyManager.h b/lib/system-controller/CicoSCPolicyManager.h
index 591f7b6..9350ce4 100644 (file)
--- a/lib/system-controller/CicoSCPolicyManager.h
+++ b/lib/system-controller/CicoSCPolicyManager.h
@@ -20,7 +20,6 @@
 #include <Ecore.h>
 #include <Eina.h>
 #include <dbus/dbus.h>
-#include <E_DBus.h>
 
 #include <map>
 #include <vector>

diff --git a/lib/system-controller/Makefile.am b/lib/system-controller/Makefile.am
index 80f91d4..df99372 100644 (file)
--- a/lib/system-controller/Makefile.am
+++ b/lib/system-controller/Makefile.am
@@ -51,7 +51,6 @@ libico_system_controller_la_CPPFLAGS =        \
        @MURPHYDOMAINCONTROLLER_CFLAGS@         \
        @MURPHYECORE_CFLAGS@                            \
        @MURPHYRESOURCE_CFLAGS@                         \
-       @EDBUS_CFLAGS@                                          \
        $(UWS_CFLAGS)                                           \
        -I../../include                                         \
        -I../common                                                     \
@@ -73,7 +72,6 @@ libico_system_controller_la_LIBADD =  \
        @MURPHYDOMAINCONTROLLER_LIBS@           \
        @MURPHYECORE_LIBS@                                      \
        @MURPHYRESOURCE_LIBS@                           \
-       @EDBUS_LIBS@                                            \
        $(UWS_LIBS)                                                     \
        $(GENIVI_LIBS)                                          \
        $(WESTONPLUGIN_LIBS)

diff --git a/packaging/ico-uxf-homescreen.spec b/packaging/ico-uxf-homescreen.spec
index bb61275..c2ab30a 100644 (file)
--- a/packaging/ico-uxf-homescreen.spec
+++ b/packaging/ico-uxf-homescreen.spec
@@ -16,8 +16,6 @@ BuildRequires: pkgconfig(eina)
 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)
@@ -57,7 +55,6 @@ Requires: pkgconfig(eina)
 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)

diff --git a/src/homescreen/Makefile.am b/src/homescreen/Makefile.am
index be4cf9d..d482572 100644 (file)
--- a/src/homescreen/Makefile.am
+++ b/src/homescreen/Makefile.am
@@ -63,6 +63,7 @@ HomeScreen_LDADD =                                    \
        ../../lib/common/.libs/libico-common.a                  \
        @CAPIAPPFWAPPLICATION_LIBS@     \
        @PKGMGR_LIBS@                                   \
+    $(ECOREEVAS_LIBS)                                  \
     $(EFL_LIBS)                                        \
     $(OPT_LIBS)                                        \
     $(WL_LIBS)                                                 \

diff --git a/src/onscreen/Makefile.am b/src/onscreen/Makefile.am
index 4404d5d..32eaa68 100644 (file)
--- a/src/onscreen/Makefile.am
+++ b/src/onscreen/Makefile.am
@@ -38,6 +38,7 @@ OnScreen_LDADD =                                      \
        ../../lib/common/.libs/libico-common.a                  \
        ../../lib/notification/.libs/libico-notification.a \
        @CAPIAPPFWAPPLICATION_LIBS@     \
+    $(ECOREEVAS_LIBS)                                  \
     $(EFL_LIBS)                                        \
     $(OPT_LIBS)                                        \
     $(AUL_LIBS)                                        \

diff --git a/src/statusbar/CicoCommonWindow.h b/src/statusbar/CicoCommonWindow.h
index bbc3afa..4c7084d 100644 (file)
--- a/src/statusbar/CicoCommonWindow.h
+++ b/src/statusbar/CicoCommonWindow.h
@@ -17,8 +17,7 @@
 #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>
 

diff --git a/src/statusbar/CicoComponentImplementation.cpp b/src/statusbar/CicoComponentImplementation.cpp
index 1547c5e..574504c 100644 (file)
--- a/src/statusbar/CicoComponentImplementation.cpp
+++ b/src/statusbar/CicoComponentImplementation.cpp
@@ -16,6 +16,7 @@
  */
 //==========================================================================
 
+#include <Edje.h>
 #include <ctime>
 #include <cassert>
 #include <memory>

diff --git a/src/statusbar/CicoComponentImplementation.h b/src/statusbar/CicoComponentImplementation.h
index d11f778..284ddaf 100644 (file)
--- a/src/statusbar/CicoComponentImplementation.h
+++ b/src/statusbar/CicoComponentImplementation.h
@@ -17,7 +17,7 @@
 #ifndef __CICO_COMPONENT_IMPLEMENTATION_H__
 #define __CICO_COMPONENT_IMPLEMENTATION_H__
 
-#include <Elementary.h>
+#include <Evas.h>
 #include <ctime>
 #include <list>
 #include <vector>

diff --git a/src/statusbar/CicoStatusBar.cpp b/src/statusbar/CicoStatusBar.cpp
index d527edc..e13276b 100644 (file)
--- a/src/statusbar/CicoStatusBar.cpp
+++ b/src/statusbar/CicoStatusBar.cpp
@@ -11,7 +11,7 @@
 #include <Ecore.h>
 #include <Ecore_Wayland.h>
 #include <Evas.h>
-#include <Elementary.h>
+#include <Edje.h>
 #include <ico_log.h>
 #include "CicoStatusBar.h"
 

diff --git a/src/statusbar/CicoStatusBar.h b/src/statusbar/CicoStatusBar.h
index 9dfa088..1c2bdae 100644 (file)
--- a/src/statusbar/CicoStatusBar.h
+++ b/src/statusbar/CicoStatusBar.h
@@ -17,6 +17,7 @@
 #ifndef __CICO_STATUSBAR_H__
 #define __CICO_STATUSBAR_H__
 
+#include <Ecore.h>
 #include <memory>
 #include <list>
 #include "CicoComponentImplementation.h"

diff --git a/src/statusbar/Makefile.am b/src/statusbar/Makefile.am
index 2ac802e..e41e969 100644 (file)
--- a/src/statusbar/Makefile.am
+++ b/src/statusbar/Makefile.am
@@ -42,6 +42,7 @@ StatusBar_LDADD = \
        ../../lib/common/.libs/libico-common.a \
        ../../lib/notification/.libs/libico-notification.a \
        @CAPIAPPFWAPPLICATION_LIBS@     \
+       $(ECOREEVAS_LIBS)       \
        $(EFL_LIBS)             \
        $(OPT_LIBS)             \
        $(AUL_LIBS)             \

diff --git a/src/syscond/Makefile.am b/src/syscond/Makefile.am
index 16701e7..9eb3a39 100644 (file)
--- a/src/syscond/Makefile.am
+++ b/src/syscond/Makefile.am
@@ -26,7 +26,6 @@ IcoSysconDaemon_CPPFLAGS =    \
        @MURPHYDOMAINCONTROLLER_CFLAGS@         \
        @MURPHYECORE_CFLAGS@                            \
        @MURPHYRESOURCE_CFLAGS@                         \
-       @EDBUS_CFLAGS@                                          \
        $(UWS_CFLAGS)                                           \
        -I../../include                                         \
     -I../../lib/system-controller              \
@@ -50,7 +49,6 @@ IcoSysconDaemon_LDADD = \
        @MURPHYDOMAINCONTROLLER_LIBS@   \
        @MURPHYECORE_LIBS@                              \
        @MURPHYRESOURCE_LIBS@                   \
-       @EDBUS_LIBS@                                    \
        $(UWS_LIBS)                                             \
        $(GENIVI_LIBS)                                  \
        $(WESTONPLUGIN_LIBS)