Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-adaptor.git] / build / tizen / adaptor / Makefile.am

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 82c8783..4cbd85e 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -61,6 +61,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(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) \
@@ -114,6 +115,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(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) \
@@ -177,6 +179,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(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) \
@@ -239,6 +242,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(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) \
@@ -300,6 +304,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(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) \
@@ -364,6 +369,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(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) \
@@ -493,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)
 
@@ -590,6 +588,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)