From 0ab26152b7a39f9ec235c594fbe0e7d1a7be782a Mon Sep 17 00:00:00 2001
From: "minho.sun" <minho.sun@samsung.com>
Date: Wed, 30 Aug 2017 20:58:05 +0900
Subject: [PATCH] Do not build elementary when tizen version is over 3.0

Do not build elementary when tizen version is over 3.0

Change-Id: I816d4dbb8ad7e3e4209817d2fae7ff0179451f60
Signed-off-by: minho.sun <minho.sun@samsung.com>
---
 build/tizen/adaptor/Makefile.am  | 16 ++++++++++++----
 build/tizen/adaptor/configure.ac |  5 ++++-
 packaging/dali-adaptor.spec      |  3 ++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 02a047c..4226361 100644
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -407,15 +407,13 @@ libdali_adaptor_la_LIBADD = \
                       -ljpeg
 
 # EVAS used indicator
-libdali_adaptor_la_CXXFLAGS += $(ELEMENTARY_CFLAGS) \
-                               $(EVAS_CFLAGS) \
+libdali_adaptor_la_CXXFLAGS += $(EVAS_CFLAGS) \
                                $(ECORE_CFLAGS) \
                                $(ECORE_IPC_CFLAGS) \
                                $(ELDBUS_CFLAGS)
 
 
-libdali_adaptor_la_LIBADD += $(ELEMENTARY_LIBS) \
-                             $(ECORE_IPC_LIBS) \
+libdali_adaptor_la_LIBADD += $(ECORE_IPC_LIBS) \
                              $(ELDBUS_LIBS)
 
 if USE_APPFW
@@ -432,15 +430,25 @@ libdali_adaptor_la_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \
                              $(TTS_LIBS) \
                              $(SENSOR_LIBS)
 if USE_APPFW_EFL_BASE
+libdali_adaptor_la_CXXFLAGS += $(ELEMENTARY_CFLAGS)
+
+libdali_adaptor_la_LIBADD += $(ELEMENTARY_LIBS)
+
 else
 libdali_adaptor_la_CXXFLAGS += $(CAPI_APPFW_COMMON_CFLAGS) \
                                $(CAPI_APPFW_CONTROL_CFLAGS) \
+                               $(ECORE_IMF_CFLAGS) \
                                $(FRIBIDI_CFLAGS)
 
 libdali_adaptor_la_LIBADD += $(CAPI_APPFW_COMMON_LIBS) \
                              $(CAPI_APPFW_CONTROL_LIBS) \
+                             $(ECORE_IMF_LIBS) \
                              $(FRIBIDI_LIBS)
 endif
+else
+libdali_adaptor_la_CXXFLAGS += $(ELEMENTARY_CFLAGS)
+
+libdali_adaptor_la_LIBADD += $(ELEMENTARY_LIBS)
 endif
 
 if WAYLAND
diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac
index c0c71e9..2e5000c 100644
--- a/build/tizen/adaptor/configure.ac
+++ b/build/tizen/adaptor/configure.ac
@@ -46,6 +46,7 @@ PKG_CHECK_MODULES(LIBDRM, libdrm)
 PKG_CHECK_MODULES(LIBCURL, libcurl)
 PKG_CHECK_MODULES(HARFBUZZ, harfbuzz)
 PKG_CHECK_MODULES(FRIBIDI, fribidi)
+PKG_CHECK_MODULES(EVAS, evas)
 PKG_CHECK_MODULES(TTRACE,  ttrace, AC_DEFINE(ENABLE_TTRACE, 1, [ttrace available]),
                   [ AC_MSG_NOTICE([Tizen Trace not avaiable]) ]
                   )
@@ -55,7 +56,6 @@ PKG_CHECK_MODULES(TTRACE,  ttrace, AC_DEFINE(ENABLE_TTRACE, 1, [ttrace available
 PKG_CHECK_MODULES(ECORE, ecore)
 PKG_CHECK_MODULES(ECORE_IPC, ecore-ipc)
 PKG_CHECK_MODULES(ECORE_IMF, [ecore-imf >= 1.13], [ecore_imf_1_13=yes], [ecore_imf_1_13=no])
-PKG_CHECK_MODULES(ELEMENTARY, elementary)
 # Check for EldBus.h in ECore
 PKG_CHECK_MODULES(ELDBUS, eldbus, [ eldbus_available=yes ],  [ eldbus_available=no ] )
 
@@ -248,11 +248,14 @@ if test "x$enable_appfw" = "xyes"; then
 PKG_CHECK_MODULES(CAPI_SYSTEM_SYSTEM_SETTINGS, capi-system-system-settings)
 if test "x$enable_tizen_major_version" = "x3"; then
 PKG_CHECK_MODULES(CAPI_APPFW_APPLICATION, capi-appfw-application)
+PKG_CHECK_MODULES(ELEMENTARY, elementary)
 else
 PKG_CHECK_MODULES(CAPI_APPFW_APPLICATION, appcore-ui)
 PKG_CHECK_MODULES(CAPI_APPFW_COMMON, capi-appfw-app-common)
 PKG_CHECK_MODULES(CAPI_APPFW_CONTROL, capi-appfw-app-control)
 fi
+else
+PKG_CHECK_MODULES(ELEMENTARY, elementary)
 fi
 
 # Using EFL api's for  WAYLAND AND X11 to run on ecore mainloop
diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index c85c7d6..4b1ef3c 100644
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -104,14 +104,15 @@ BuildRequires:  pkgconfig(utilX)
 
 # for dali-adaptor
 BuildRequires:  pkgconfig(evas)
-BuildRequires:  pkgconfig(elementary)
 
 %if 0%{?tizen_version_major} == 3
 BuildRequires:  pkgconfig(capi-appfw-application)
+BuildRequires:  pkgconfig(elementary)
 %else
 BuildRequires:  pkgconfig(appcore-ui)
 BuildRequires:  pkgconfig(capi-appfw-app-common)
 BuildRequires:  pkgconfig(capi-appfw-app-control)
+BuildRequires:  pkgconfig(ecore-imf)
 %endif
 BuildRequires:  pkgconfig(capi-system-system-settings)
 
-- 
2.7.4