X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=4cbd85e9090545df093879d1578f4e891a8a0590;hb=674ca26271878afcccac36be83013d367eded890;hp=90f7104f4fb07c9549a4f55af93264a64852d885;hpb=c7445a69ae335ad6a034bf20f48ad49bc56f5b04;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 90f7104..4cbd85e 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -40,17 +40,14 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_clipboard_common_src_files) \ $(adaptor_clipboard_ubuntu_x11_src_files) \ $(devel_api_src_files) \ - $(bridge_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) \ @@ -59,15 +56,17 @@ 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) \ $(adaptor_trace_common_src_files) \ + $(adaptor_thread_common_src_files) \ $(adaptor_window_system_ubuntu_x11_src_files) \ $(devel_api_text_abstraction_src_files) \ $(static_libraries_glyphy_src_files) \ @@ -89,22 +88,22 @@ 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) \ - $(bridge_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) \ $(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) \ @@ -112,29 +111,28 @@ 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) \ - $(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) \ + $(adaptor_thread_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 @@ -153,23 +151,23 @@ 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) \ - $(bridge_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) \ $(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) \ @@ -177,28 +175,28 @@ 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) \ $(adaptor_window_system_tizen_src_files) \ + $(adaptor_window_system_tizen_wayland_src_files) \ $(adaptor_trace_common_src_files) \ + $(adaptor_thread_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 @@ -217,22 +215,22 @@ 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) \ - $(bridge_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) \ $(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,28 +238,28 @@ 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) \ $(adaptor_window_system_tizen_src_files) \ + $(adaptor_window_system_tizen_wayland_src_files) \ $(adaptor_trace_common_src_files) \ + $(adaptor_thread_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 @@ -279,22 +277,22 @@ 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) \ - $(bridge_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) \ $(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) \ @@ -302,28 +300,28 @@ 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) \ $(adaptor_window_system_tizen_src_files) \ + $(adaptor_window_system_tizen_wayland_src_files) \ $(adaptor_trace_common_src_files) \ + $(adaptor_thread_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 @@ -343,23 +341,23 @@ 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) \ + $(adaptor_clipboard_tizen_wayland_src_files) \ $(devel_api_src_files) \ - $(bridge_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) \ $(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) \ @@ -367,29 +365,28 @@ 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) \ $(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) \ + $(adaptor_thread_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 @@ -502,34 +499,26 @@ LIBDALI_ADAPTOR_LA_CXXFLAGS += $(CAPI_APPFW_APPLICATION_CFLAGS) \ $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS) \ $(CAPI_SYSTEM_INFO_CFLAGS) \ $(TTS_CFLAGS) \ - $(SENSOR_CFLAGS) - -LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \ - $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \ - $(CAPI_SYSTEM_INFO_LIBS) \ - $(TTS_LIBS) \ - $(SENSOR_LIBS) -if USE_APPFW_EFL_BASE -LIBDALI_ADAPTOR_LA_CXXFLAGS += $(ELEMENTARY_CFLAGS) - -LIBDALI_ADAPTOR_LA_LIBADD += $(ELEMENTARY_LIBS) - -else -LIBDALI_ADAPTOR_LA_CXXFLAGS += $(BUNDLE_CFLAGS) \ + $(SENSOR_CFLAGS) \ + $(BUNDLE_CFLAGS) \ $(CAPI_APPFW_COMMON_CFLAGS) \ $(CAPI_APPFW_CONTROL_CFLAGS) \ $(CAPI_APPFW_WIDGET_BASE_CFLAGS) \ $(ECORE_IMF_CFLAGS) \ - $(FRIBIDI_CFLAGS) \ - -DWIDGET_SUPPOERTED + $(FRIBIDI_CFLAGS) -LIBDALI_ADAPTOR_LA_LIBADD += $(BUNDLE_LIBS) \ +LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \ + $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \ + $(CAPI_SYSTEM_INFO_LIBS) \ + $(TTS_LIBS) \ + $(SENSOR_LIBS) \ + $(BUNDLE_LIBS) \ $(CAPI_APPFW_COMMON_LIBS) \ $(CAPI_APPFW_CONTROL_LIBS) \ $(CAPI_APPFW_WIDGET_BASE_LIBS) \ $(ECORE_IMF_LIBS) \ $(FRIBIDI_LIBS) -endif + else LIBDALI_ADAPTOR_LA_CXXFLAGS += $(ELEMENTARY_CFLAGS) @@ -616,19 +605,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)