Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-adaptor.git] / build / tizen / adaptor / Makefile.am

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index caa27d9..9ab4793 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -42,14 +42,12 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(devel_api_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
-                  $(adaptor_graphics_gles20_src_files) \
-                  $(adaptor_graphics_ubuntu_gl_src_files) \
+                  $(adaptor_graphics_gles_src_files) \
                   $(adaptor_graphics_ubuntu_src_files) \
                   $(adaptor_haptics_common_src_files) \
                   $(adaptor_imaging_common_src_files) \
                   $(adaptor_imaging_ubuntu_x11_src_files) \
                   $(adaptor_input_common_src_files) \
-                  $(adaptor_input_ubuntu_src_files) \
                   $(adaptor_input_ubuntu_x11_src_files) \
                   $(adaptor_legacy_common_src_files) \
                   $(adaptor_network_common_src_files) \
@@ -58,11 +56,12 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_sensor_ubuntu_src_files) \
                   $(adaptor_styling_common_src_files) \
                   $(adaptor_system_common_src_files) \
-                  $(adaptor_system_ubuntu_src_files) \
+                  $(adaptor_system_linux_src_files) \
                   $(adaptor_system_ubuntu_x11_src_files) \
                   $(adaptor_text_common_src_files) \
                   $(adaptor_text_ubuntu_src_files) \
                   $(adaptor_resampler_src_files) \
+                  $(adaptor_vector_animation_common_src_files) \
                   $(adaptor_video_common_src_files) \
                   $(adaptor_web_engine_common_src_files) \
                   $(adaptor_window_system_common_src_files) \
@@ -89,17 +88,16 @@ endif
 if MOBILE_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_src_files) \
+                  $(adaptor_accessibility_tizen_wayland_src_files) \
                   $(adaptor_accessibility_tizen_mobile_src_files) \
                   $(adaptor_adaptor_common_src_files) \
-                  $(adaptor_adaptor_tizen_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_clipboard_common_src_files) \
                   $(adaptor_clipboard_tizen_wayland_src_files) \
                   $(devel_api_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
-                  $(adaptor_graphics_gles20_src_files) \
+                  $(adaptor_graphics_gles_src_files) \
                   $(adaptor_graphics_tizen_src_files) \
                   $(adaptor_haptics_common_src_files) \
                   $(adaptor_imaging_common_src_files) \
@@ -113,9 +111,11 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_sensor_tizen_src_files) \
                   $(adaptor_styling_common_src_files) \
                   $(adaptor_system_common_src_files) \
-                  $(adaptor_system_tizen_mobile_src_files) \
+                  $(adaptor_system_linux_src_files) \
+                  $(adaptor_system_tizen_wayland_src_files) \
                   $(adaptor_text_common_src_files) \
                   $(adaptor_resampler_src_files) \
+                  $(adaptor_vector_animation_common_src_files) \
                   $(adaptor_video_common_src_files) \
                   $(adaptor_web_engine_common_src_files) \
                   $(adaptor_window_system_common_src_files) \
@@ -151,17 +151,16 @@ endif
 if IVI_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_src_files) \
+                  $(adaptor_accessibility_tizen_wayland_src_files) \
                   $(adaptor_accessibility_tizen_ivi_src_files) \
                   $(adaptor_adaptor_common_src_files) \
-                  $(adaptor_adaptor_tizen_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_clipboard_common_src_files) \
                   $(adaptor_clipboard_tizen_wayland_src_files) \
                   $(devel_api_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
-                  $(adaptor_graphics_gles20_src_files) \
+                  $(adaptor_graphics_gles_src_files) \
                   $(adaptor_graphics_tizen_src_files) \
                   $(adaptor_haptics_common_src_files) \
                   $(adaptor_haptics_tizen_src_files) \
@@ -176,9 +175,11 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_sensor_tizen_src_files) \
                   $(adaptor_styling_common_src_files) \
                   $(adaptor_system_common_src_files) \
-                  $(adaptor_system_tizen_ivi_src_files) \
+                  $(adaptor_system_linux_src_files) \
+                  $(adaptor_system_tizen_wayland_src_files) \
                   $(adaptor_text_common_src_files) \
                   $(adaptor_resampler_src_files) \
+                  $(adaptor_vector_animation_common_src_files) \
                   $(adaptor_video_common_src_files) \
                   $(adaptor_web_engine_common_src_files) \
                   $(adaptor_window_system_common_src_files) \
@@ -214,17 +215,16 @@ endif
 if TV_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_src_files) \
+                  $(adaptor_accessibility_tizen_wayland_src_files) \
                   $(adaptor_accessibility_tizen_tv_src_files) \
                   $(adaptor_adaptor_common_src_files) \
-                  $(adaptor_adaptor_tizen_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_clipboard_common_src_files) \
                   $(adaptor_clipboard_tizen_wayland_src_files) \
                   $(devel_api_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
-                  $(adaptor_graphics_gles20_src_files) \
+                  $(adaptor_graphics_gles_src_files) \
                   $(adaptor_graphics_tizen_src_files) \
                   $(adaptor_haptics_common_src_files) \
                   $(adaptor_imaging_common_src_files) \
@@ -238,9 +238,11 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_sensor_tizen_src_files) \
                   $(adaptor_styling_common_src_files) \
                   $(adaptor_system_common_src_files) \
-                  $(adaptor_system_tizen_tv_src_files) \
+                  $(adaptor_system_linux_src_files) \
+                  $(adaptor_system_tizen_wayland_src_files) \
                   $(adaptor_text_common_src_files) \
                   $(adaptor_resampler_src_files) \
+                  $(adaptor_vector_animation_common_src_files) \
                   $(adaptor_video_common_src_files) \
                   $(adaptor_web_engine_common_src_files) \
                   $(adaptor_window_system_common_src_files) \
@@ -275,17 +277,16 @@ endif
 if COMMON_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_src_files) \
+                  $(adaptor_accessibility_tizen_wayland_src_files) \
                   $(adaptor_accessibility_tizen_common_src_files) \
                   $(adaptor_adaptor_common_src_files) \
-                  $(adaptor_adaptor_tizen_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_clipboard_common_src_files) \
                   $(adaptor_clipboard_tizen_wayland_src_files) \
                   $(devel_api_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
-                  $(adaptor_graphics_gles20_src_files) \
+                  $(adaptor_graphics_gles_src_files) \
                   $(adaptor_graphics_tizen_src_files) \
                   $(adaptor_haptics_common_src_files) \
                   $(adaptor_imaging_common_src_files) \
@@ -299,9 +300,11 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_sensor_tizen_src_files) \
                   $(adaptor_styling_common_src_files) \
                   $(adaptor_system_common_src_files) \
-                  $(adaptor_system_generic_src_files) \
+                  $(adaptor_system_linux_src_files) \
+                  $(adaptor_system_tizen_wayland_src_files) \
                   $(adaptor_text_common_src_files) \
                   $(adaptor_resampler_src_files) \
+                  $(adaptor_vector_animation_common_src_files) \
                   $(adaptor_video_common_src_files) \
                   $(adaptor_web_engine_common_src_files) \
                   $(adaptor_window_system_common_src_files) \
@@ -338,10 +341,9 @@ endif
 if WEARABLE_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_src_files) \
+                  $(adaptor_accessibility_tizen_wayland_src_files) \
                   $(adaptor_accessibility_tizen_wearable_src_files) \
                   $(adaptor_adaptor_common_src_files) \
-                  $(adaptor_adaptor_tizen_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_adaptor_tizen_wearable_src_files) \
                   $(adaptor_clipboard_common_src_files) \
@@ -349,7 +351,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(devel_api_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
-                  $(adaptor_graphics_gles20_src_files) \
+                  $(adaptor_graphics_gles_src_files) \
                   $(adaptor_graphics_tizen_src_files) \
                   $(adaptor_haptics_common_src_files) \
                   $(adaptor_imaging_common_src_files) \
@@ -363,9 +365,11 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_sensor_tizen_src_files) \
                   $(adaptor_styling_common_src_files) \
                   $(adaptor_system_common_src_files) \
+                  $(adaptor_system_linux_src_files) \
                   $(adaptor_system_tizen_wearable_src_files) \
                   $(adaptor_text_common_src_files) \
                   $(adaptor_resampler_src_files) \
+                  $(adaptor_vector_animation_common_src_files) \
                   $(adaptor_video_common_src_files) \
                   $(adaptor_web_engine_common_src_files) \
                   $(adaptor_window_system_common_src_files) \