X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=80ad1c7b86d7d96904a92370acb3d45c3569cea4;hb=e305af2c9e60e6d70ed7e87a8cf4a03ee3dee4a8;hp=1e62e578e6529e26fba768a065a9921bf3f0b607;hpb=e36a906a5f8ac3f53211884739658eacc85c422a;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 1e62e57..80ad1c7 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -88,6 +88,7 @@ endif if MOBILE_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_src_files) \ + $(adaptor_accessibility_tizen_src_files) \ $(adaptor_accessibility_tizen_mobile_src_files) \ $(adaptor_adaptor_common_src_files) \ $(adaptor_adaptor_tizen_src_files) \ @@ -117,7 +118,6 @@ 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) \ @@ -125,6 +125,14 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(static_libraries_glyphy_src_files) \ $(static_libraries_libunibreak_src_files) +if ECORE_WAYLAND2 +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl2_src_files) +else +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl_src_files) +endif + if ENABLE_NETWORK_LOGGING LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) @@ -141,6 +149,7 @@ endif if IVI_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_src_files) \ + $(adaptor_accessibility_tizen_src_files) \ $(adaptor_accessibility_tizen_ivi_src_files) \ $(adaptor_adaptor_common_src_files) \ $(adaptor_adaptor_tizen_src_files) \ @@ -178,6 +187,14 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(static_libraries_glyphy_src_files) \ $(static_libraries_libunibreak_src_files) +if ECORE_WAYLAND2 +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl2_src_files) +else +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl_src_files) +endif + if ENABLE_NETWORK_LOGGING LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) @@ -194,6 +211,7 @@ endif if TV_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_src_files) \ + $(adaptor_accessibility_tizen_src_files) \ $(adaptor_accessibility_tizen_tv_src_files) \ $(adaptor_adaptor_common_src_files) \ $(adaptor_adaptor_tizen_src_files) \ @@ -230,6 +248,14 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(static_libraries_glyphy_src_files) \ $(static_libraries_libunibreak_src_files) +if ECORE_WAYLAND2 +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl2_src_files) +else +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl_src_files) +endif + if ENABLE_NETWORK_LOGGING LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) @@ -245,6 +271,7 @@ endif if COMMON_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_src_files) \ + $(adaptor_accessibility_tizen_src_files) \ $(adaptor_accessibility_tizen_common_src_files) \ $(adaptor_adaptor_common_src_files) \ $(adaptor_adaptor_tizen_src_files) \ @@ -281,6 +308,14 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(static_libraries_glyphy_src_files) \ $(static_libraries_libunibreak_src_files) +if ECORE_WAYLAND2 +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl2_src_files) +else +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl_src_files) +endif + if ENABLE_NETWORK_LOGGING LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) @@ -298,6 +333,7 @@ endif if WEARABLE_PROFILE LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_accessibility_common_src_files) \ + $(adaptor_accessibility_tizen_src_files) \ $(adaptor_accessibility_tizen_wearable_src_files) \ $(adaptor_adaptor_common_src_files) \ $(adaptor_adaptor_tizen_src_files) \ @@ -330,12 +366,19 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(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 ECORE_WAYLAND2 +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl2_src_files) +else +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_window_system_ecore_wl_src_files) +endif + if ENABLE_NETWORK_LOGGING LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) @@ -560,15 +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 -tizenadaptorintegrationwaylandapi_HEADERS = $(adaptor_integration_wayland_api_header_files) -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)