Merge "Add support for new accessibility actions" into devel/master

[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 f61b4f8..d4504a9 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -181,12 +181,6 @@ dalifeedbackthemedir = ${dataReadOnlyDir}/themes/feedback-themes/
 dalifeedbacktheme_DATA = ${dali_plugin_theme_files}
 endif
 
-if TURBO_JPEG_IS_ON
-  tizen_platform_abstraction_src_files += $(tizen_turbo_jpeg_loader)
-else
-  tizen_platform_abstraction_src_files += $(tizen_jpeg_loader)
-endif
-
 lib_LTLIBRARIES = libdali-adaptor.la
 
 libdali_adaptor_la_SOURCES = \
@@ -279,6 +273,8 @@ libdali_adaptor_la_CXXFLAGS = \
                       $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS) \
                       $(ELDBUS_CFLAGS)
 
+libdali_adaptor_la_CFLAGS = $(libdali_adaptor_la_CXXFLAGS)
+
 libdali_adaptor_la_LIBADD = \
                       $(DALICORE_LIBS) \
                       $(OPENGLES20_LIBS) \
@@ -302,7 +298,8 @@ libdali_adaptor_la_LIBADD = \
                       $(CAPI_SYSTEM_INFO_LIBS) \
                       $(ELDBUS_LIBS) \
                       -lgif \
-                      -lboost_thread
+                      -lboost_thread \
+                      -lturbojpeg
 
 if WAYLAND
 libdali_adaptor_la_CXXFLAGS += $(WAYLAND_CFLAGS)
@@ -341,16 +338,10 @@ libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS)
 libdali_adaptor_la_LIBADD +=
 endif
 
-if TURBO_JPEG_IS_ON
-libdali_adaptor_la_LIBADD += -lturbojpeg
-CFLAGS += -D_TURBO_JPEG_LOADER
 if UBUNTU_PROFILE
 libdali_adaptor_la_LIBADD += -ljpeg
 CFLAGS += -fPIC
 endif
-else
-libdali_adaptor_la_LIBADD += -ljpeg
-endif
 
 tizenadaptorpublicapidir = $(devincludepath)/dali/public-api
 tizenadaptorpublicapi_HEADERS = $(public_api_header_files)
@@ -380,7 +371,7 @@ tizentextabstractiondevelapi_HEADERS = $(text_abstraction_header_files)
 if !UBUNTU_PROFILE
 
 if !WAYLAND
-tizenadaptorframeworkpublicapi_HEADERS += $(public_api_adaptor_tizen_x11_header_files)
+tizenadaptorframeworkdevelapi_HEADERS += $(devel_api_adaptor_tizen_x11_header_files)
 endif # NOT WAYLAND
 
 endif # NOT UBUNTU_PROFILE