Merge branch 'devel/master' into tizen

Change-Id: If7a95358b390021a4706feb68cc24b0172d916ac

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index ef77c19..01a0d06 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -592,6 +592,15 @@ LIBDALI_ADAPTOR_LA_LIBADD += -ljpeg
 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)