X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=190aab1345faed653549f0a26831e8063c9fbea1;hb=d44e8530f0ffa9e68e51df5b9a3726076d361bb0;hp=f5171f16794ea7afcf324e6052a07e567e67cc8a;hpb=b5815a78193bd99fd2b2241bd9bba12119e09573;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index f5171f1..190aab1 100644
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -64,7 +64,9 @@ 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_window_system_ubuntu_x11_src_files) \
                   $(devel_api_text_abstraction_src_files) \
                   $(static_libraries_glyphy_src_files) \
@@ -75,18 +77,23 @@ 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) \
                   $(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) \
@@ -96,7 +103,6 @@ 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) \
@@ -108,31 +114,49 @@ 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) \
                   $(devel_api_text_abstraction_src_files) \
                   $(static_libraries_glyphy_src_files) \
                   $(static_libraries_libunibreak_src_files)
 
+if USE_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)
+else
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland_src_files) \
+                  $(adaptor_input_tizen_wayland_src_files) \
+                  $(adaptor_window_system_tizen_wayland_src_files)
+endif
+
 if ENABLE_NETWORK_LOGGING
 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) \
                   $(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) \
@@ -143,7 +167,6 @@ 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) \
@@ -155,30 +178,48 @@ 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) \
                   $(devel_api_text_abstraction_src_files) \
                   $(static_libraries_glyphy_src_files) \
                   $(static_libraries_libunibreak_src_files)
 
+if USE_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)
+else
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland_src_files) \
+                  $(adaptor_input_tizen_wayland_src_files) \
+                  $(adaptor_window_system_tizen_wayland_src_files)
+endif
+
 if ENABLE_NETWORK_LOGGING
 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) \
                   $(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) \
@@ -188,7 +229,6 @@ 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) \
@@ -200,29 +240,47 @@ 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) \
                   $(devel_api_text_abstraction_src_files) \
                   $(static_libraries_glyphy_src_files) \
                   $(static_libraries_libunibreak_src_files)
 
+if USE_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)
+else
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland_src_files) \
+                  $(adaptor_input_tizen_wayland_src_files) \
+                  $(adaptor_window_system_tizen_wayland_src_files)
+endif
+
 if ENABLE_NETWORK_LOGGING
 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) \
                   $(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) \
@@ -232,7 +290,6 @@ 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) \
@@ -244,18 +301,36 @@ 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) \
                   $(devel_api_text_abstraction_src_files) \
                   $(static_libraries_glyphy_src_files) \
                   $(static_libraries_libunibreak_src_files)
 
+if USE_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)
+else
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland_src_files) \
+                  $(adaptor_input_tizen_wayland_src_files) \
+                  $(adaptor_window_system_tizen_wayland_src_files)
+endif
+
 if ENABLE_NETWORK_LOGGING
 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,13 +338,13 @@ 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) \
                   $(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) \
@@ -279,7 +354,6 @@ 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) \
@@ -291,19 +365,37 @@ 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) \
                   $(devel_api_text_abstraction_src_files) \
                   $(static_libraries_glyphy_src_files) \
                   $(static_libraries_libunibreak_src_files)
 
+if USE_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)
+else
+LIBDALI_ADAPTOR_LA_SOURCES += \
+                  $(adaptor_clipboard_tizen_wayland_src_files) \
+                  $(adaptor_input_tizen_wayland_src_files) \
+                  $(adaptor_window_system_tizen_wayland_src_files)
+endif
+
 if ENABLE_NETWORK_LOGGING
 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 +593,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)
 
@@ -511,7 +612,11 @@ tizenadaptorintegrationapi_HEADERS = $(adaptor_integration_api_header_files)
 
 if WAYLAND
 tizenadaptorintegrationwaylandapidir = $(devincludepath)/dali/integration-api/adaptors
-tizenadaptorintegrationwaylandapi_HEADERS = $(adaptor_integration_wayland_api_header_files)
+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