X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=b549138e5376b29e1e7b39e8370f1abfdbcbcb8b;hb=3259f7e05d09669ec473725ac360652beb6ed0b3;hp=3aeb2df287b9c3f778acfd418317573630befa74;hpb=ae5ebea9bccaf7db4da5b0fd76b628dcf9f1fb46;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 3aeb2df..b549138 100644
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -30,13 +30,13 @@ pkgconfig_DATA = dali-adaptor.pc dali-adaptor-integration.pc
 if UBUNTU_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_ubuntu_src_files) \
                   $(adaptor_adaptor_common_src_files) \
                   $(adaptor_adaptor_ubuntu_src_files) \
                   $(adaptor_clipboard_common_src_files) \
                   $(adaptor_clipboard_ubuntu_x11_src_files) \
                   $(adaptor_framework_generic_src_files) \
                   $(devel_api_src_files) \
+                  $(bridge_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
                   $(adaptor_graphics_gles_src_files) \
@@ -87,14 +87,13 @@ endif
 if MOBILE_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_wayland_src_files) \
-                  $(adaptor_accessibility_tizen_mobile_src_files) \
                   $(adaptor_adaptor_common_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_clipboard_common_src_files) \
                   $(adaptor_clipboard_tizen_wayland_src_files) \
                   $(adaptor_framework_generic_src_files) \
                   $(devel_api_src_files) \
+                  $(bridge_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
                   $(adaptor_graphics_gles_src_files) \
@@ -153,14 +152,13 @@ endif
 if IVI_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_wayland_src_files) \
-                  $(adaptor_accessibility_tizen_ivi_src_files) \
                   $(adaptor_adaptor_common_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_clipboard_common_src_files) \
                   $(adaptor_clipboard_tizen_wayland_src_files) \
                   $(adaptor_framework_generic_src_files) \
                   $(devel_api_src_files) \
+                  $(bridge_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
                   $(adaptor_graphics_gles_src_files) \
@@ -220,14 +218,13 @@ endif
 if TV_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_wayland_src_files) \
-                  $(adaptor_accessibility_tizen_tv_src_files) \
                   $(adaptor_adaptor_common_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_clipboard_common_src_files) \
                   $(adaptor_clipboard_tizen_wayland_src_files) \
                   $(adaptor_framework_generic_src_files) \
                   $(devel_api_src_files) \
+                  $(bridge_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
                   $(adaptor_graphics_gles_src_files) \
@@ -285,14 +282,13 @@ endif
 if COMMON_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_wayland_src_files) \
-                  $(adaptor_accessibility_tizen_common_src_files) \
                   $(adaptor_adaptor_common_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_clipboard_common_src_files) \
                   $(adaptor_clipboard_tizen_wayland_src_files) \
                   $(adaptor_framework_generic_src_files) \
                   $(devel_api_src_files) \
+                  $(bridge_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
                   $(adaptor_graphics_gles_src_files) \
@@ -352,8 +348,6 @@ endif
 if WEARABLE_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_wayland_src_files) \
-                  $(adaptor_accessibility_tizen_wearable_src_files) \
                   $(adaptor_adaptor_common_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_adaptor_tizen_wearable_src_files) \
@@ -361,6 +355,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_clipboard_tizen_wayland_src_files) \
                   $(adaptor_framework_generic_src_files) \
                   $(devel_api_src_files) \
+                  $(bridge_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
                   $(adaptor_graphics_gles_src_files) \
@@ -460,6 +455,7 @@ LIBDALI_ADAPTOR_LA_CXXFLAGS = \
                       $(LIBDRM_CFLAGS) \
                       $(LIBEXIF_CFLAGS) \
                       $(LIBCURL_CFLAGS) \
+                      $(LIBCRYPTO_CFLAGS) \
                       $(TPKP_CURL_CFLAGS) \
                       $(UTILX_CFLAGS)
 
@@ -488,7 +484,9 @@ LIBDALI_ADAPTOR_LA_LIBADD = \
                       $(LIBDRM_LIBS) \
                       $(LIBEXIF_LIBS) \
                       $(LIBCURL_LIBS) \
+                      $(LIBCRYPTO_LIBS) \
                       $(HARFBUZZ_LIBS) \
+                      $(AUTOFILL_LIBS) \
                       $(TPKP_CURL_LIBS) \
                       $(UTILX_LIBS) \
                       -lgif \
@@ -601,6 +599,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)
 
@@ -675,6 +682,7 @@ linker_test_LDADD = \
   $(DALICORE_LIBS) \
   $(VCONF_LIBS) \
   $(HARFBUZZ_LIBS) \
+  $(AUTOFILL_LIBS) \
   -L${prefix}/lib
 
 linker_test_LDADD += libdali-adaptor-cxx11.la