Merge branch 'devel/master' into tizen_4.0

Change-Id: I13039d30879b1a01b6fc0a39294c4cc9a1e64c32

diff --combined build/tizen/adaptor/Makefile.am
index bf01089,4226361..496a96f
--- 1/build/tizen/adaptor/Makefile.am
--- 2/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@@ -407,15 -407,13 +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 +430,25 @@@ libdali_adaptor_la_LIBADD += $(CAPI_APP
                               $(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
@@@ -506,15 -514,6 +514,15 @@@ libdali_adaptor_la_LIBADD += -ljpe
  CFLAGS += -fPIC
  endif
  
 +if !UBUNTU_PROFILE
 +if WAYLAND
 +else
 +# X11
 +libdali_adaptor_la_CXXFLAGS += $(UTILX_CFLAGS)
 +libdali_adaptor_la_LIBADD += $(UTILX_LIBS)
 +endif
 +endif
 +
  tizenadaptorpublicapidir = $(devincludepath)/dali/public-api
  tizenadaptorpublicapi_HEADERS = $(public_api_header_files)