Merge branch 'devel/master' into tizen

Change-Id: I1e406dd468a6b55df1d7e8385dfe88e065f0c44f
Signed-off-by: dongsug.song <dongsug.song@samsung.com>

diff --combined build/tizen/adaptor/Makefile.am
index 052d4fa,47410c0..7051a56
--- 1/build/tizen/adaptor/Makefile.am
--- 2/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@@ -427,7 -427,6 +427,6 @@@ libdali_adaptor_la_LIBADD = 
                        $(HARFBUZZ_LIBS) \
                        $(TPKP_CURL_LIBS) \
                        $(UTILX_LIBS) \
-                       $(APPCORE_WATCH_LIBS) \
                        -lgif \
                        -lpthread \
                        -lturbojpeg \
@@@ -496,6 -495,10 +495,10 @@@ if WEARABLE_PROFIL
  libdali_adaptor_la_CXXFLAGS += \
                        $(HAPTIC_CFLAGS) \
                        $(EFL_ASSIST_CFLAGS)
+                       $(APPCORE_WATCH_CFLAGS)
+ 
+ libdali_adaptor_la_LIBADD += \
+                       $(APPCORE_WATCH_LIBS)
  endif
  
  if TV_PROFILE
@@@ -521,15 -524,6 +524,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)