X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=80ad1c7b86d7d96904a92370acb3d45c3569cea4;hb=44ac6b074a4d7d2f9474331a364e4629c0bce11a;hp=190aab1345faed653549f0a26831e8063c9fbea1;hpb=d44e8530f0ffa9e68e51df5b9a3726076d361bb0;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 190aab1..80ad1c7 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -94,6 +94,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) \ @@ -103,6 +104,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) \ @@ -116,23 +118,19 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_video_common_src_files) \ $(adaptor_web_engine_common_src_files) \ $(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 +if 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) + $(adaptor_window_system_ecore_wl2_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) + $(adaptor_window_system_ecore_wl_src_files) endif if ENABLE_NETWORK_LOGGING @@ -157,6 +155,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) \ @@ -167,6 +166,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) \ @@ -181,21 +181,18 @@ 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 +if 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) + $(adaptor_window_system_ecore_wl2_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) + $(adaptor_window_system_ecore_wl_src_files) endif if ENABLE_NETWORK_LOGGING @@ -220,6 +217,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) \ @@ -229,6 +227,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) \ @@ -243,21 +242,18 @@ 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 +if 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) + $(adaptor_window_system_ecore_wl2_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) + $(adaptor_window_system_ecore_wl_src_files) endif if ENABLE_NETWORK_LOGGING @@ -281,6 +277,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) \ @@ -290,6 +287,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) \ @@ -304,21 +302,18 @@ 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 +if 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) + $(adaptor_window_system_ecore_wl2_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) + $(adaptor_window_system_ecore_wl_src_files) endif if ENABLE_NETWORK_LOGGING @@ -345,6 +340,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) \ @@ -354,6 +350,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) \ @@ -368,22 +365,18 @@ 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_wearable_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 +if 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) + $(adaptor_window_system_ecore_wl2_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) + $(adaptor_window_system_ecore_wl_src_files) endif if ENABLE_NETWORK_LOGGING @@ -610,19 +603,6 @@ tizenadaptordevelapidir= $(devincludepath)/dali/devel-api tizenadaptorintegrationapidir = $(devincludepath)/dali/integration-api/adaptors 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_ecore_wayland_api_header_files) -else -tizenadaptorintegrationx11apidir = $(devincludepath)/dali/integration-api/adaptors -tizenadaptorintegrationx11api_HEADERS = $(adaptor_integration_x11_api_header_files) -endif - tizenadaptorframeworkpublicapidir = $(tizenadaptorpublicapidir)/adaptor-framework tizenadaptorframeworkpublicapi_HEADERS = $(public_api_adaptor_framework_header_files)