Merge branch 'master' into tizen

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

diff --git a/build/slp/dali-toolkit/Makefile.am b/build/slp/dali-toolkit/Makefile.am
index 1805f7e..79f3c62 100644 (file)
--- a/build/slp/dali-toolkit/Makefile.am
+++ b/build/slp/dali-toolkit/Makefile.am
@@ -18,10 +18,12 @@
 
 # Base files
 toolkit_base_images_dir = ../../../base/dali-toolkit/images
+toolkit_base_sounds_dir = ../../../base/dali-toolkit/sounds
 toolkit_base_src_dir    = ../../../base/dali-toolkit/internal
 public_api_base_src_dir = ../../../base/dali-toolkit/public-api
 
 include ../../../base/dali-toolkit/images/file.list
+include ../../../base/dali-toolkit/sounds/file.list
 include ../../../base/dali-toolkit/internal/file.list
 include ../../../base/dali-toolkit/public-api/file.list
 
@@ -44,6 +46,9 @@ daliimagedir = ${dataReadOnlyDir}/toolkit/images/
 daliimage_DATA = ${dali_toolkit_base_image_files} \
                  ${dali_toolkit_optional_image_files}
 
+dalisounddir = ${dataReadOnlyDir}/toolkit/sounds/
+dalisound_DATA = ${dali_toolkit_base_sound_files}
+
 # The Combined library
 lib_LTLIBRARIES = libdali-toolkit.la
 
@@ -57,6 +62,7 @@ libdali_toolkit_la_DEPENDENCIES =
 
 libdali_toolkit_la_CXXFLAGS = -DDALI_COMPILATION \
                       -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \
+                      -DDALI_SOUND_DIR="\"${dalisounddir}\"" \
                       -Werror -Wall \
                       -I../../../base \
                       -I../../../optional \
@@ -183,6 +189,7 @@ capidevelmagnifierdir = $(capideveldir)/controls/magnifier
 capidevelpopupdir = $(capideveldir)/controls/popup
 capidevelpageturnviewdir = $(capideveldir)/controls/page-turn-view
 capidevelscrollcomponentdir = $(capideveldir)/controls/scroll-component
+capidevelscrollbardir = $(capideveldir)/controls/scroll-bar
 capidevelscrollabledir = $(capideveldir)/controls/scrollable
 capidevelscrollviewdir = $(capideveldir)/controls/scrollable/scroll-view
 capidevelsliderdir = $(capideveldir)/controls/slider
@@ -222,6 +229,7 @@ capidevelpopup_HEADERS = $(capi_devel_popup_header_files)
 capidevelpageturnview_HEADERS = $(capi_devel_page_turn_view_header_files)
 capidevelscrollcomponent_HEADERS = $(capi_devel_scroll_component_header_files)
 capidevelscrollable_HEADERS = $(capi_devel_scrollable_header_files)
+capidevelscrollbar_HEADERS = $(capi_devel_scroll_bar_header_files)
 capidevelscrollview_HEADERS = $(capi_devel_scroll_view_header_files)
 capidevelslider_HEADERS = $(capi_devel_slider_header_files)
 capideveltableview_HEADERS = $(capi_devel_table_view_header_files)