X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=190aab1345faed653549f0a26831e8063c9fbea1;hb=d44e8530f0ffa9e68e51df5b9a3726076d361bb0;hp=79e3cac6fcf6d96b65e748febf4b3b0b2c1a6f33;hpb=b6da06c14afdd3bc85da34ec787957505af4858d;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 79e3cac..190aab1 100644
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -94,7 +94,6 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(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) \
@@ -104,7 +103,6 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_imaging_common_src_files) \
                   $(adaptor_imaging_tizen_src_files) \
                   $(adaptor_input_common_src_files) \
-                  $(adaptor_input_tizen_wayland_src_files) \
                   $(adaptor_legacy_common_src_files) \
                   $(adaptor_network_common_src_files) \
                   $(adaptor_public_api_src_files) \
@@ -120,12 +118,23 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_window_system_common_src_files) \
                   $(adaptor_window_system_tizen_mobile_src_files) \
                   $(adaptor_window_system_tizen_src_files) \
-                  $(adaptor_window_system_tizen_wayland_src_files) \
                   $(adaptor_trace_common_src_files) \
                   $(devel_api_text_abstraction_src_files) \
                   $(static_libraries_glyphy_src_files) \
                   $(static_libraries_libunibreak_src_files)
 
+if USE_ECORE_WAYLAND2
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland2_src_files) \
+                  $(adaptor_input_tizen_wayland2_src_files) \
+                  $(adaptor_window_system_tizen_wayland2_src_files)
+else
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland_src_files) \
+                  $(adaptor_input_tizen_wayland_src_files) \
+                  $(adaptor_window_system_tizen_wayland_src_files)
+endif
+
 if ENABLE_NETWORK_LOGGING
 LIBDALI_ADAPTOR_LA_SOURCES += \
                   $(adaptor_performance_logging_src_files)
@@ -148,7 +157,6 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(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) \
@@ -159,7 +167,6 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_imaging_common_src_files) \
                   $(adaptor_imaging_tizen_src_files) \
                   $(adaptor_input_common_src_files) \
-                  $(adaptor_input_tizen_wayland_src_files) \
                   $(adaptor_legacy_common_src_files) \
                   $(adaptor_network_common_src_files) \
                   $(adaptor_public_api_src_files) \
@@ -174,12 +181,23 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_web_engine_common_src_files) \
                   $(adaptor_window_system_common_src_files) \
                   $(adaptor_window_system_tizen_src_files) \
-                  $(adaptor_window_system_tizen_wayland_src_files) \
                   $(adaptor_trace_common_src_files) \
                   $(devel_api_text_abstraction_src_files) \
                   $(static_libraries_glyphy_src_files) \
                   $(static_libraries_libunibreak_src_files)
 
+if USE_ECORE_WAYLAND2
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland2_src_files) \
+                  $(adaptor_input_tizen_wayland2_src_files) \
+                  $(adaptor_window_system_tizen_wayland2_src_files)
+else
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland_src_files) \
+                  $(adaptor_input_tizen_wayland_src_files) \
+                  $(adaptor_window_system_tizen_wayland_src_files)
+endif
+
 if ENABLE_NETWORK_LOGGING
 LIBDALI_ADAPTOR_LA_SOURCES += \
                   $(adaptor_performance_logging_src_files)
@@ -202,7 +220,6 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(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) \
@@ -212,7 +229,6 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_imaging_common_src_files) \
                   $(adaptor_imaging_tizen_src_files) \
                   $(adaptor_input_common_src_files) \
-                  $(adaptor_input_tizen_wayland_src_files) \
                   $(adaptor_legacy_common_src_files) \
                   $(adaptor_network_common_src_files) \
                   $(adaptor_public_api_src_files) \
@@ -227,12 +243,23 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_web_engine_common_src_files) \
                   $(adaptor_window_system_common_src_files) \
                   $(adaptor_window_system_tizen_src_files) \
-                  $(adaptor_window_system_tizen_wayland_src_files) \
                   $(adaptor_trace_common_src_files) \
                   $(devel_api_text_abstraction_src_files) \
                   $(static_libraries_glyphy_src_files) \
                   $(static_libraries_libunibreak_src_files)
 
+if USE_ECORE_WAYLAND2
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland2_src_files) \
+                  $(adaptor_input_tizen_wayland2_src_files) \
+                  $(adaptor_window_system_tizen_wayland2_src_files)
+else
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland_src_files) \
+                  $(adaptor_input_tizen_wayland_src_files) \
+                  $(adaptor_window_system_tizen_wayland_src_files)
+endif
+
 if ENABLE_NETWORK_LOGGING
 LIBDALI_ADAPTOR_LA_SOURCES += \
                   $(adaptor_performance_logging_src_files)
@@ -254,7 +281,6 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(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) \
@@ -264,7 +290,6 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_imaging_common_src_files) \
                   $(adaptor_imaging_tizen_src_files) \
                   $(adaptor_input_common_src_files) \
-                  $(adaptor_input_tizen_wayland_src_files) \
                   $(adaptor_legacy_common_src_files) \
                   $(adaptor_network_common_src_files) \
                   $(adaptor_public_api_src_files) \
@@ -279,12 +304,23 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_web_engine_common_src_files) \
                   $(adaptor_window_system_common_src_files) \
                   $(adaptor_window_system_tizen_src_files) \
-                  $(adaptor_window_system_tizen_wayland_src_files) \
                   $(adaptor_trace_common_src_files) \
                   $(devel_api_text_abstraction_src_files) \
                   $(static_libraries_glyphy_src_files) \
                   $(static_libraries_libunibreak_src_files)
 
+if USE_ECORE_WAYLAND2
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland2_src_files) \
+                  $(adaptor_input_tizen_wayland2_src_files) \
+                  $(adaptor_window_system_tizen_wayland2_src_files)
+else
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland_src_files) \
+                  $(adaptor_input_tizen_wayland_src_files) \
+                  $(adaptor_window_system_tizen_wayland_src_files)
+endif
+
 if ENABLE_NETWORK_LOGGING
 LIBDALI_ADAPTOR_LA_SOURCES += \
                   $(adaptor_performance_logging_src_files)
@@ -309,7 +345,6 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_adaptor_tizen_wearable_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) \
@@ -319,7 +354,6 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_imaging_common_src_files) \
                   $(adaptor_imaging_tizen_src_files) \
                   $(adaptor_input_common_src_files) \
-                  $(adaptor_input_tizen_wayland_src_files) \
                   $(adaptor_legacy_common_src_files) \
                   $(adaptor_network_common_src_files) \
                   $(adaptor_public_api_src_files) \
@@ -334,13 +368,24 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_web_engine_common_src_files) \
                   $(adaptor_window_system_common_src_files) \
                   $(adaptor_window_system_tizen_src_files) \
-                  $(adaptor_window_system_tizen_wayland_src_files) \
                   $(adaptor_window_system_tizen_wearable_src_files) \
                   $(adaptor_trace_common_src_files) \
                   $(devel_api_text_abstraction_src_files) \
                   $(static_libraries_glyphy_src_files) \
                   $(static_libraries_libunibreak_src_files)
 
+if USE_ECORE_WAYLAND2
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland2_src_files) \
+                  $(adaptor_input_tizen_wayland2_src_files) \
+                  $(adaptor_window_system_tizen_wayland2_src_files)
+else
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland_src_files) \
+                  $(adaptor_input_tizen_wayland_src_files) \
+                  $(adaptor_window_system_tizen_wayland_src_files)
+endif
+
 if ENABLE_NETWORK_LOGGING
 LIBDALI_ADAPTOR_LA_SOURCES += \
                   $(adaptor_performance_logging_src_files)
@@ -567,7 +612,11 @@ tizenadaptorintegrationapi_HEADERS = $(adaptor_integration_api_header_files)
 
 if WAYLAND
 tizenadaptorintegrationwaylandapidir = $(devincludepath)/dali/integration-api/adaptors
-tizenadaptorintegrationwaylandapi_HEADERS = $(adaptor_integration_wayland_api_header_files)
+if USE_ECORE_WAYLAND2
+tizenadaptorintegrationwaylandapi_HEADERS = $(adaptor_integration_ecore_wl2_api_header_files)
+else
+tizenadaptorintegrationwaylandapi_HEADERS = $(adaptor_integration_ecore_wl_api_header_files)
+endif
 tizenadaptorintegrationwaylandapi_HEADERS += $(adaptor_integration_ecore_wayland_api_header_files)
 else
 tizenadaptorintegrationx11apidir = $(devincludepath)/dali/integration-api/adaptors