Merge remote-tracking branch 'origin/tizen' into new_text

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

diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am
index 802a755..18ed54d 100644 (file)
--- a/build/tizen/dali-toolkit/Makefile.am
+++ b/build/tizen/dali-toolkit/Makefile.am
@@ -18,10 +18,15 @@
 
 toolkit_images_dir = ../../../dali-toolkit/images
 toolkit_sounds_dir = ../../../dali-toolkit/sounds
-toolkit_styles_dir = ../../../dali-toolkit/styles
 toolkit_src_dir    = ../../../dali-toolkit/internal
 public_api_src_dir = ../../../dali-toolkit/public-api
 
+if MOBILE_PROFILE
+toolkit_styles_dir = ../../../dali-toolkit/styles/mobile
+else
+toolkit_styles_dir = ../../../dali-toolkit/styles
+endif
+
 include ../../../dali-toolkit/images/file.list
 include ../../../dali-toolkit/sounds/file.list
 include ../../../dali-toolkit/styles/file.list
@@ -100,12 +105,6 @@ publicapisliderdir = $(publicapicontrolsdir)/slider
 publicapisuperblurviewdir = $(publicapicontrolsdir)/super-blur-view
 publicapitableviewdir = $(publicapicontrolsdir)/table-view
 publicapitextcontrolsdir = $(publicapidir)/controls/text-controls
-publicapitextdir = $(publicapidir)/text
-publicapitextdecoratordir = $(publicapidir)/text/decorator
-publicapitextlayoutsdir = $(publicapidir)/text/layouts
-publicapitextrenderingdir = $(publicapidir)/text/rendering
-publicapitextrenderingbasicdir = $(publicapidir)/text/rendering/basic
-publicapitextrenderingshadersdir = $(publicapidir)/text/rendering/shaders
 publicapitoolbardir = $(publicapicontrolsdir)/tool-bar
 publicapiviewdir = $(publicapicontrolsdir)/view
 publicapibuilderdir = $(publicapidir)/builder
@@ -115,6 +114,7 @@ publicapibubbleeffectdir = $(publicapidir)/shader-effects/bubble-effect
 publicapistylingdir = $(publicapidir)/styling
 publicapitransitioneffectsdir = $(publicapidir)/transition-effects
 publicapiscriptingdir = $(publicapidir)/scripting
+publicapirenderingbackenddir = $(publicapidir)/text
 
 publicapi_HEADERS = $(public_api_header_files)
 publicapicontrols_HEADERS = $(public_api_controls_header_files)
@@ -143,12 +143,6 @@ publicapislider_HEADERS = $(public_api_slider_header_files)
 publicapisuperblurview_HEADERS = $(public_api_super_blur_view_header_files)
 publicapitableview_HEADERS = $(public_api_table_view_header_files)
 publicapitextcontrols_HEADERS = $(public_api_text_controls_header_files)
-publicapitext_HEADERS = $(public_api_text_header_files)
-publicapitextdecorator_HEADERS = $(public_api_text_decorator_header_files)
-publicapitextlayouts_HEADERS = $(public_api_text_layouts_header_files)
-publicapitextrendering_HEADERS = $(public_api_text_rendering_header_files)
-publicapitextrenderingbasic_HEADERS = $(public_api_text_rendering_basic_header_files)
-publicapitextrenderingshaders_HEADERS = $(public_api_text_rendering_shaders_header_files)
 publicapitoolbar_HEADERS = $(public_api_tool_bar_header_files)
 publicapiview_HEADERS = $(public_api_view_header_files)
 publicapibuilder_HEADERS = $(public_api_builder_header_files)
@@ -158,4 +152,5 @@ publicapibubbleeffect_HEADERS = $(public_api_bubble_effect_header_files)
 publicapistyling_HEADERS = $(public_api_styling_header_files)
 publicapitransitioneffects_HEADERS = $(public_api_transition_effects_header_files)
 publicapiscripting_HEADERS = $(public_api_scripting_header_files)
+publicapirenderingbackend_HEADERS = $(public_api_rendering_backend_header_files)