From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 10 Jun 2019 05:32:47 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20190611.050103~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60ccaf90b946a69a496599f0d8975d4431784bad;hp=bf1aa7f84993421f82c44d52484ed85a3a228873;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

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
--- 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)