X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=build%2Ftizen%2Fdali-toolkit%2FMakefile.am;h=948b4cf6af0f710ae870d14da9436c579ad44db1;hp=b1a389f0f081b61c9ed7a0f601478180a1f8dbb2;hb=f758f35a6f525b556a101b0785f797e3ee3c4b1a;hpb=a3353d4f3763da656966e8e9a1c223c7e9585a13

diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am
index b1a389f..948b4cf 100644
--- a/build/tizen/dali-toolkit/Makefile.am
+++ b/build/tizen/dali-toolkit/Makefile.am
@@ -22,11 +22,7 @@ toolkit_src_dir    = ../../../dali-toolkit/internal
 public_api_src_dir = ../../../dali-toolkit/public-api
 devel_api_src_dir  = ../../../dali-toolkit/devel-api
 
-if MOBILE_PROFILE
-toolkit_styles_dir = ../../../dali-toolkit/styles/mobile
-else
-toolkit_styles_dir = ../../../dali-toolkit/styles
-endif
+toolkit_styles_dir = $(STYLE_DIR)
 
 include ../../../dali-toolkit/images/file.list
 include ../../../dali-toolkit/sounds/file.list
@@ -96,7 +92,6 @@ develapishadowviewdir =         $(develapicontrolsdir)/shadow-view
 develapisuperblurviewdir =      $(develapicontrolsdir)/super-blur-view
 develapifocusmanagerdir =       $(develapidir)/focus-manager
 develapiscriptingdir =          $(develapidir)/scripting
-develapibubbleeffectdir =       $(develapidir)/shader-effects/bubble-effect
 develapishadereffectsdir =      $(develapidir)/shader-effects
 develapitransitioneffectsdir =  $(develapidir)/transition-effects
 develapistylingdir =            $(develapidir)/styling
@@ -106,7 +101,6 @@ develapitextselectionpopupdir = $(develapicontrolsdir)/text-controls
 # devel headers
 develapibloomview_HEADERS =         $(devel_api_bloom_view_header_files)
 develapibubbleemitter_HEADERS =     $(devel_api_bubble_emitter_header_files)
-develapibubbleeffect_HEADERS =      $(devel_api_bubble_effect_header_files)
 develapibuilder_HEADERS =           $(devel_api_builder_header_files)
 develapieffectsview_HEADERS =       $(devel_api_effects_view_header_files)
 develapifocusmanager_HEADERS =      $(devel_api_focus_manager_header_files)
@@ -121,7 +115,7 @@ develapistyling_HEADERS =           $(devel_api_styling_header_files)
 develapisuperblurview_HEADERS =     $(devel_api_super_blur_view_header_files)
 develapitoolbar_HEADERS =           $(devel_api_tool_bar_header_files)
 develapitransitioneffects_HEADERS = $(devel_api_transition_effects_header_files)
-develapitextselectionpopup_HEADERS = $(devel_api_text_selection_popup_header_files)
+develapitextselectionpopup_HEADERS = $(devel_api_text_controls_header_files)
 
 # public api source
 publicapidir =                    $(topleveldir)/public-api
@@ -131,6 +125,8 @@ publicapialignmentdir =           $(publicapicontrolsdir)/alignment
 publicapibuttonsdir =             $(publicapicontrolsdir)/buttons
 publicapidefaultcontrolsdir =     $(publicapicontrolsdir)/default-controls
 publicapigaussianblurviewdir =    $(publicapicontrolsdir)/gaussian-blur-view
+publicapiimageviewdir =           $(publicapicontrolsdir)/image-view
+publicapimodel3dviewdir =         $(publicapicontrolsdir)/model3d-view
 publicapiscrollbardir =           $(publicapicontrolsdir)/scroll-bar
 publicapiscrollabledir =          $(publicapicontrolsdir)/scrollable
 publicapiscrollviewdir =          $(publicapicontrolsdir)/scrollable/scroll-view
@@ -148,7 +144,9 @@ publicapialignment_HEADERS =           $(public_api_alignment_header_files)
 publicapibuttons_HEADERS =             $(public_api_buttons_header_files)
 publicapidefaultcontrols_HEADERS =     $(public_api_default_controls_header_files)
 publicapigaussianblurview_HEADERS =    $(public_api_gaussian_blur_view_header_files)
+publicapiimageview_HEADERS =           $(public_api_image_view_header_files)
 publicapiitemview_HEADERS =            $(public_api_item_view_header_files)
+publicapimodel3dview_HEADERS =         $(public_api_model3d_view_header_files)
 publicapiscrollbar_HEADERS =           $(public_api_scroll_bar_header_files)
 publicapiscrollable_HEADERS =          $(public_api_scrollable_header_files)
 publicapiscrollview_HEADERS =          $(public_api_scroll_view_header_files)