X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=build%2Fslp%2Fdali-toolkit%2FMakefile.am;h=dfb749441554350bd7d0f2b513487adc7b593df3;hp=729ce526f20f15b9b84f628138ce6409217c6ad3;hb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;hpb=e58fa784d19a558e35f458ecf6d262a2344beb4f

diff --git a/build/slp/dali-toolkit/Makefile.am b/build/slp/dali-toolkit/Makefile.am
index 729ce52..dfb7494 100644
--- a/build/slp/dali-toolkit/Makefile.am
+++ b/build/slp/dali-toolkit/Makefile.am
@@ -1,14 +1,14 @@
 #
 # Copyright (c) 2014 Samsung Electronics Co., Ltd.
 #
-# Licensed under the Flora License, Version 1.0 (the License);
+# Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://floralicense.org/license/
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
@@ -18,10 +18,14 @@
 
 # Base files
 toolkit_base_images_dir = ../../../base/dali-toolkit/images
+toolkit_base_sounds_dir = ../../../base/dali-toolkit/sounds
+toolkit_base_styles_dir = ../../../base/dali-toolkit/styles
 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/styles/file.list
 include ../../../base/dali-toolkit/internal/file.list
 include ../../../base/dali-toolkit/public-api/file.list
 
@@ -44,6 +48,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
 
@@ -53,10 +60,16 @@ libdali_toolkit_la_SOURCES = \
                      $(toolkit_optional_src_files) \
                      $(public_api_optional_src_files)
 
+dalistyledir = ${dataReadOnlyDir}/toolkit/styles/
+dalistyle_DATA = ${dali_toolkit_style_files}
+
 libdali_toolkit_la_DEPENDENCIES =
 
 libdali_toolkit_la_CXXFLAGS = -DDALI_COMPILATION \
                       -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \
+                      -DDALI_SOUND_DIR="\"${dalisounddir}\"" \
+                      -DDALI_STYLE_DIR="\"${dalistyledir}\"" \
+                      -DDALI_DATA_READ_ONLY_DIR="\"${dataReadOnlyDir}\"" \
                       -Werror -Wall \
                       -I../../../base \
                       -I../../../optional \
@@ -96,6 +109,9 @@ publicapibasetextinputdir = $(publicapibasedir)/controls/text-input
 publicapibasefactorydir = $(publicapibasedir)/factory
 publicapibasefocusmanagerdir = $(publicapibasedir)/focus-manager
 publicapibasemarkupprocessordir = $(publicapibasedir)/markup-processor
+publicapibaseshadereffectsdir = $(publicapibasedir)/shader-effects
+publicapibasestylingdir = $(publicapibasedir)/styling
+publicapibasebuilderdir = $(publicapibasedir)/builder
 
 publicapibase_HEADERS = $(public_api_base_header_files)
 publicapibasecontrols_HEADERS = $(public_api_base_controls_header_files)
@@ -114,6 +130,9 @@ publicapibasetextinput_HEADERS = $(public_api_base_text_input_header_files)
 publicapibasefactory_HEADERS = $(public_api_base_factory_header_files)
 publicapibasefocusmanager_HEADERS = $(public_api_base_focus_manager_header_files)
 publicapibasemarkupprocessor_HEADERS = $(public_api_base_markup_processor_header_files)
+publicapibaseshadereffects_HEADERS = $(public_api_base_shader_effects_header_files)
+publicapibasestyling_HEADERS = $(public_api_base_styling_header_files)
+publicapibasebuilder_HEADERS = $(public_api_base_builder_header_files)
 
 # Install Optional headers
 
@@ -139,7 +158,6 @@ publicapioptionalviewdir = $(publicapioptionaldir)/controls/view
 publicapioptionalnavigationframedir = $(publicapioptionaldir)/controls/navigation-frame
 publicapioptionalshadereffectsdir = $(publicapioptionaldir)/shader-effects
 publicapioptionalbubbleeffectdir = $(publicapioptionaldir)/shader-effects/bubble-effect
-publicapioptionalbuilderdir = $(publicapioptionaldir)/builder
 publicapioptionaltransitioneffectsdir = $(publicapioptionaldir)/transition-effects
 
 publicapioptional_HEADERS = $(public_api_optional_header_files)
@@ -161,7 +179,6 @@ publicapioptionalview_HEADERS = $(public_api_optional_view_header_files)
 publicapioptionalnavigationframe_HEADERS = $(public_api_optional_navigation_frame_header_files)
 publicapioptionalshadereffects_HEADERS = $(public_api_optional_shader_effects_header_files)
 publicapioptionalbubbleeffect_HEADERS = $(public_api_optional_bubble_effect_header_files)
-publicapioptionalbuilder_HEADERS = $(public_api_optional_builder_header_files)
 publicapioptionaltransitioneffects_HEADERS = $(public_api_optional_transition_effects_header_files)
 
 # Install CAPI headers
@@ -181,6 +198,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
@@ -203,6 +221,7 @@ capidevelstyledtextutilitiesdir = $(capideveldir)/styled-text-utilities
 capidevelbuilderdir = $(capideveldir)/builder
 capidevelutilitiesdir = $(capideveldir)/utilities
 capideveltransitioneffectsdir = $(capideveldir)/transition-effects
+capidevelstylingdir = $(capideveldir)/styling
 
 capidevel_HEADERS = $(capi_devel_header_files)
 capidevelcontrols_HEADERS = $(capi_devel_controls_header_files)
@@ -220,6 +239,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)
@@ -241,3 +261,5 @@ capidevelstyledtextutilities_HEADERS = $(capi_devel_styled_text_utilities_header
 capidevelbuilder_HEADERS = $(capi_devel_builder_header_files)
 capidevelutilities_HEADERS = $(capi_devel_utilities_header_files)
 capideveltransitioneffects_HEADERS = $(capi_devel_transition_effects_header_files)
+capidevelstyling_HEADERS = $(capi_devel_styling_header_files)
+