X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=1e62e578e6529e26fba768a065a9921bf3f0b607;hb=refs%2Fchanges%2F90%2F175990%2F1;hp=f6d69779009049f0d9015b39aea847bc9e36d20f;hpb=d641c7cf034558901f3706d451bbb436a09bd3ae;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index f6d6977..1e62e57 100644
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -93,6 +93,7 @@ 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) \
@@ -102,6 +103,7 @@ 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) \
@@ -117,23 +119,12 @@ 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)
@@ -155,6 +146,7 @@ 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) \
@@ -165,6 +157,7 @@ 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) \
@@ -179,23 +172,12 @@ 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)
@@ -217,6 +199,7 @@ 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) \
@@ -226,6 +209,7 @@ 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) \
@@ -240,23 +224,12 @@ 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)
@@ -277,6 +250,7 @@ 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) \
@@ -286,6 +260,7 @@ 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) \
@@ -300,23 +275,12 @@ 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)
@@ -340,6 +304,7 @@ 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) \
@@ -349,6 +314,7 @@ 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) \
@@ -363,24 +329,13 @@ 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)
@@ -607,11 +562,7 @@ tizenadaptorintegrationapi_HEADERS = $(adaptor_integration_api_header_files)
 
 if WAYLAND
 tizenadaptorintegrationwaylandapidir = $(devincludepath)/dali/integration-api/adaptors
-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_wayland_api_header_files)
 tizenadaptorintegrationwaylandapi_HEADERS += $(adaptor_integration_ecore_wayland_api_header_files)
 else
 tizenadaptorintegrationx11apidir = $(devincludepath)/dali/integration-api/adaptors