X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=caa27d9cc754e993264f1653c42889307d555137;hb=37e1384a4362a533647d0ecdadbdd5071d46d6d1;hp=6afda1d62974ec9f2524fa34839bf6d93f2f41f4;hpb=085adad0d73baa84bd4964ab9a2b4352fde00fa3;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 6afda1d..caa27d9 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -64,8 +64,10 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_text_ubuntu_src_files) \ $(adaptor_resampler_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) \ @@ -115,15 +117,24 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_text_common_src_files) \ $(adaptor_resampler_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 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) @@ -169,14 +180,24 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_text_common_src_files) \ $(adaptor_resampler_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 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) @@ -221,14 +242,24 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_text_common_src_files) \ $(adaptor_resampler_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 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) @@ -272,14 +303,24 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_text_common_src_files) \ $(adaptor_resampler_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 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) @@ -326,15 +367,24 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_text_common_src_files) \ $(adaptor_resampler_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_window_system_tizen_wearable_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 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) @@ -542,6 +592,15 @@ LIBDALI_ADAPTOR_LA_LIBADD += -ljpeg CFLAGS += -fPIC endif +if !UBUNTU_PROFILE +if WAYLAND +else +# X11 +LIBDALI_ADAPTOR_LA_CXXFLAGS += $(UTILX_CFLAGS) +LIBDALI_ADAPTOR_LA_LIBADD += $(UTILX_LIBS) +endif +endif + tizenadaptorpublicapidir = $(devincludepath)/dali/public-api tizenadaptorpublicapi_HEADERS = $(public_api_header_files) @@ -550,15 +609,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)