From 20653f38bffb6f745f635ec3ebf0391615b3b1f1 Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Thu, 24 Apr 2014 12:44:13 -0700 Subject: [PATCH] Removed unnecessary build dependencies. Change-Id: I286c71f7a3dc94b54c8518be2c5bb48ee511a0ee Signed-off-by: Ossama Othman --- configure.ac | 2 +- packaging/ico-uxf-weston-plugin.spec | 5 ----- src/ico_input_mgr.c | 1 - src/ico_window_animation.c | 2 -- tests/Makefile.am | 4 ++-- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 12984be..08bf5e9 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AC_CHECK_HEADERS([execinfo.h]) AC_CHECK_FUNCS([mkostemp strchrnul]) -PKG_CHECK_MODULES([PLUGIN], [weston >= 1.1.1 pixman-1 xkbcommon]) +PKG_CHECK_MODULES([PLUGIN], [weston >= 1.4 pixman-1]) if test "x$GCC" = "xyes"; then my_common_gcc_flags="-Wall -Wextra -Wno-unused-parameter \ diff --git a/packaging/ico-uxf-weston-plugin.spec b/packaging/ico-uxf-weston-plugin.spec index 066a2c3..7f13643 100644 --- a/packaging/ico-uxf-weston-plugin.spec +++ b/packaging/ico-uxf-weston-plugin.spec @@ -9,12 +9,7 @@ Source0: %{name}-%{version}.tar.bz2 BuildRequires: pkgconfig(weston) >= 1.4.0 BuildRequires: pkgconfig(pixman-1) -BuildRequires: pkgconfig(xkbcommon) >= 0.0.578 -BuildRequires: pkgconfig(eina) BuildRequires: pkgconfig(evas) -BuildRequires: pkgconfig(eina) -BuildRequires: pkgconfig(elementary) -BuildRequires: pkgconfig(ecore-wayland) BuildRequires: pkgconfig(aul) BuildRequires: pkgconfig(ecore) BuildRequires: mesa-devel diff --git a/src/ico_input_mgr.c b/src/ico_input_mgr.c index 500851a..9f6a930 100644 --- a/src/ico_input_mgr.c +++ b/src/ico_input_mgr.c @@ -44,7 +44,6 @@ #include #include -#include #include #include #include "ico_ivi_common_private.h" diff --git a/src/ico_window_animation.c b/src/ico_window_animation.c index 22bfee7..c3e0aa8 100644 --- a/src/ico_window_animation.c +++ b/src/ico_window_animation.c @@ -39,8 +39,6 @@ #include #include -#include -#include #include #include "ico_ivi_common_private.h" #include "ico_window_mgr_private.h" diff --git a/tests/Makefile.am b/tests/Makefile.am index c57892e..658a020 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/weston-plugin-test export abs_builddir -EFL_INCLUDE = `pkg-config --cflags ecore-evas ecore evas ecore-wayland elementary` +EFL_INCLUDE = `pkg-config --cflags ecore-evas ecore evas` GENIVI_INCLUDE = -I/usr/include/ilm -I/usr/include/layermanager GENIVI_LIBS = -lilmCommon -lilmControl -lilmClient @@ -21,7 +21,7 @@ AM_LDFLAGS = -module -avoid-version -rpath $(libdir) -lwayland-egl -lEGL -lGLESv test_common_src = test-common.c test-common.h test_protocol_lib = ../src/.libs/libico-uxf-weston-plugin.so -test_efl_libs = -lecore_evas -lecore -levas -lecore_wayland -lelementary +test_efl_libs = -lecore_evas -lecore -levas test_wayland_client = -lwayland-client test_homescreen_SOURCES = test-homescreen.c $(test_common_src) test-thumbnail.c -- 2.7.4