Merge branch 'devel/master' into tizen

diff --combined build/tizen/adaptor/Makefile.am
index 9ab4793,24570db..4cbd85e
--- 1/build/tizen/adaptor/Makefile.am
--- 2/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@@ -499,34 -499,26 +499,26 @@@ LIBDALI_ADAPTOR_LA_CXXFLAGS += $(CAPI_A
                                 $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS) \
                                 $(CAPI_SYSTEM_INFO_CFLAGS) \
                                 $(TTS_CFLAGS) \
-                                $(SENSOR_CFLAGS)
- 
- LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \
-                              $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \
-                              $(CAPI_SYSTEM_INFO_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 += $(BUNDLE_CFLAGS) \
+                                $(SENSOR_CFLAGS) \
+                                $(BUNDLE_CFLAGS) \
                                 $(CAPI_APPFW_COMMON_CFLAGS) \
                                 $(CAPI_APPFW_CONTROL_CFLAGS) \
                                 $(CAPI_APPFW_WIDGET_BASE_CFLAGS) \
                                 $(ECORE_IMF_CFLAGS) \
-                                $(FRIBIDI_CFLAGS) \
-                                -DWIDGET_SUPPOERTED
+                                $(FRIBIDI_CFLAGS)
  
- LIBDALI_ADAPTOR_LA_LIBADD += $(BUNDLE_LIBS) \
+ LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \
+                              $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \
+                              $(CAPI_SYSTEM_INFO_LIBS) \
+                              $(TTS_LIBS) \
+                              $(SENSOR_LIBS) \
+                              $(BUNDLE_LIBS) \
                               $(CAPI_APPFW_COMMON_LIBS) \
                               $(CAPI_APPFW_CONTROL_LIBS) \
                               $(CAPI_APPFW_WIDGET_BASE_LIBS) \
                               $(ECORE_IMF_LIBS) \
                               $(FRIBIDI_LIBS)
- endif
+ 
  else
  LIBDALI_ADAPTOR_LA_CXXFLAGS += $(ELEMENTARY_CFLAGS)
  
@@@ -596,15 -588,6 +588,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)