X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=cac5a47e91ef942b4d75e2869ae06bee9d11bf2a;hb=92f60124b92e64ffb911a071e5493d3248ebf5ef;hp=f5171f16794ea7afcf324e6052a07e567e67cc8a;hpb=3feeffa0c34180dae652427ff38e9cdb5160f701;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index f5171f1..cac5a47 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -65,6 +65,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_resampler_src_files) \ $(adaptor_video_common_src_files) \ $(adaptor_window_system_common_src_files) \ + $(adaptor_trace_common_src_files) \ $(adaptor_window_system_ubuntu_x11_src_files) \ $(devel_api_text_abstraction_src_files) \ $(static_libraries_glyphy_src_files) \ @@ -75,12 +76,18 @@ LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) endif +if ENABLE_TRACE +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_trace_ubuntu_src_files) +endif + 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) \ @@ -109,9 +116,9 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(adaptor_resampler_src_files) \ $(adaptor_video_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) @@ -121,12 +128,18 @@ LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) endif +if ENABLE_TRACE +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_trace_tizen_src_files) +endif + 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) \ @@ -158,6 +171,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(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) @@ -167,12 +181,18 @@ LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) endif +if ENABLE_TRACE +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_trace_tizen_src_files) +endif + 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) \ @@ -203,6 +223,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(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) @@ -212,11 +233,17 @@ LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) endif +if ENABLE_TRACE +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_trace_tizen_src_files) +endif + 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) \ @@ -247,6 +274,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \ $(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) @@ -256,6 +284,11 @@ LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) endif +if ENABLE_TRACE +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_trace_tizen_src_files) +endif + endif @@ -263,6 +296,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) \ @@ -294,7 +328,7 @@ 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) @@ -304,6 +338,11 @@ LIBDALI_ADAPTOR_LA_SOURCES += \ $(adaptor_performance_logging_src_files) endif +if ENABLE_TRACE +LIBDALI_ADAPTOR_LA_SOURCES += \ + $(adaptor_trace_tizen_src_files) +endif + endif @@ -501,6 +540,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) @@ -509,15 +557,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)