Split dali-toolkit into Base & Optional

Signed-off-by: Paul Wisbey <p.wisbey@samsung.com>

diff --git a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
index ab71b72..da51107 100644 (file)
--- a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
@@ -54,7 +54,8 @@ ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
 INCLUDE_DIRECTORIES(
     ${${CAPI_LIB}_INCLUDE_DIRS}
     ../dali-toolkit/dali-toolkit-test-utils
 INCLUDE_DIRECTORIES(
     ${${CAPI_LIB}_INCLUDE_DIRS}
     ../dali-toolkit/dali-toolkit-test-utils

-    ../../..
+    ../../../base
+    ../../../optional

 )
 
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
 )
 
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})

diff --git a/dali-toolkit/images/00_popup_bg.png b/base/dali-toolkit/images/00_popup_bg.png
similarity index 100%
rename from dali-toolkit/images/00_popup_bg.png
rename to base/dali-toolkit/images/00_popup_bg.png

diff --git a/dali-toolkit/images/00_popup_button_bg.png b/base/dali-toolkit/images/00_popup_button_bg.png
similarity index 100%
rename from dali-toolkit/images/00_popup_button_bg.png
rename to base/dali-toolkit/images/00_popup_button_bg.png

diff --git a/dali-toolkit/images/B16-8_TTS_focus.png b/base/dali-toolkit/images/B16-8_TTS_focus.png
similarity index 100%
rename from dali-toolkit/images/B16-8_TTS_focus.png
rename to base/dali-toolkit/images/B16-8_TTS_focus.png

diff --git a/dali-toolkit/images/copy_paste_icon_clipboard.png b/base/dali-toolkit/images/copy_paste_icon_clipboard.png
similarity index 100%
rename from dali-toolkit/images/copy_paste_icon_clipboard.png
rename to base/dali-toolkit/images/copy_paste_icon_clipboard.png

diff --git a/dali-toolkit/images/copy_paste_icon_copy.png b/base/dali-toolkit/images/copy_paste_icon_copy.png
similarity index 100%
rename from dali-toolkit/images/copy_paste_icon_copy.png
rename to base/dali-toolkit/images/copy_paste_icon_copy.png

diff --git a/dali-toolkit/images/copy_paste_icon_cut.png b/base/dali-toolkit/images/copy_paste_icon_cut.png
similarity index 100%
rename from dali-toolkit/images/copy_paste_icon_cut.png
rename to base/dali-toolkit/images/copy_paste_icon_cut.png

diff --git a/dali-toolkit/images/copy_paste_icon_paste.png b/base/dali-toolkit/images/copy_paste_icon_paste.png
similarity index 100%
rename from dali-toolkit/images/copy_paste_icon_paste.png
rename to base/dali-toolkit/images/copy_paste_icon_paste.png

diff --git a/dali-toolkit/images/copy_paste_icon_select.png b/base/dali-toolkit/images/copy_paste_icon_select.png
similarity index 100%
rename from dali-toolkit/images/copy_paste_icon_select.png
rename to base/dali-toolkit/images/copy_paste_icon_select.png

diff --git a/dali-toolkit/images/copy_paste_icon_select_all.png b/base/dali-toolkit/images/copy_paste_icon_select_all.png
similarity index 100%
rename from dali-toolkit/images/copy_paste_icon_select_all.png
rename to base/dali-toolkit/images/copy_paste_icon_select_all.png

diff --git a/dali-toolkit/images/copypanelLine.png b/base/dali-toolkit/images/copypanelLine.png
similarity index 100%
rename from dali-toolkit/images/copypanelLine.png
rename to base/dali-toolkit/images/copypanelLine.png

diff --git a/dali-toolkit/images/cursor.png b/base/dali-toolkit/images/cursor.png
similarity index 100%
rename from dali-toolkit/images/cursor.png
rename to base/dali-toolkit/images/cursor.png

diff --git a/dali-toolkit/images/cutCopyPastePopup_bg.png b/base/dali-toolkit/images/cutCopyPastePopup_bg.png
similarity index 100%
rename from dali-toolkit/images/cutCopyPastePopup_bg.png
rename to base/dali-toolkit/images/cutCopyPastePopup_bg.png

diff --git a/base/dali-toolkit/images/file.list b/base/dali-toolkit/images/file.list
new file mode 100644 (file)
index 0000000..2eec674
--- /dev/null
+++ b/base/dali-toolkit/images/file.list
@@ -0,0 +1,4 @@
+# Files to install here
+
+dali_toolkit_base_image_files =\
+    $(toolkit_base_images_dir)/*.png

diff --git a/dali-toolkit/images/insertpoint-icon.png b/base/dali-toolkit/images/insertpoint-icon.png
similarity index 100%
rename from dali-toolkit/images/insertpoint-icon.png
rename to base/dali-toolkit/images/insertpoint-icon.png

diff --git a/dali-toolkit/images/keyboard_focus.png b/base/dali-toolkit/images/keyboard_focus.png
similarity index 100%
rename from dali-toolkit/images/keyboard_focus.png
rename to base/dali-toolkit/images/keyboard_focus.png

diff --git a/dali-toolkit/images/overshoot_ripple.png b/base/dali-toolkit/images/overshoot_ripple.png
similarity index 100%
rename from dali-toolkit/images/overshoot_ripple.png
rename to base/dali-toolkit/images/overshoot_ripple.png

diff --git a/dali-toolkit/images/popup_bg.png b/base/dali-toolkit/images/popup_bg.png
similarity index 100%
rename from dali-toolkit/images/popup_bg.png
rename to base/dali-toolkit/images/popup_bg.png

diff --git a/dali-toolkit/images/scroll_overshoot.png b/base/dali-toolkit/images/scroll_overshoot.png
similarity index 100%
rename from dali-toolkit/images/scroll_overshoot.png
rename to base/dali-toolkit/images/scroll_overshoot.png

diff --git a/dali-toolkit/images/text-input-selection-handle-left-press.png b/base/dali-toolkit/images/text-input-selection-handle-left-press.png
similarity index 100%
rename from dali-toolkit/images/text-input-selection-handle-left-press.png
rename to base/dali-toolkit/images/text-input-selection-handle-left-press.png

diff --git a/dali-toolkit/images/text-input-selection-handle-left.png b/base/dali-toolkit/images/text-input-selection-handle-left.png
similarity index 100%
rename from dali-toolkit/images/text-input-selection-handle-left.png
rename to base/dali-toolkit/images/text-input-selection-handle-left.png

diff --git a/dali-toolkit/images/text-input-selection-handle-right-press.png b/base/dali-toolkit/images/text-input-selection-handle-right-press.png
similarity index 100%
rename from dali-toolkit/images/text-input-selection-handle-right-press.png
rename to base/dali-toolkit/images/text-input-selection-handle-right-press.png

diff --git a/dali-toolkit/images/text-input-selection-handle-right.png b/base/dali-toolkit/images/text-input-selection-handle-right.png
similarity index 100%
rename from dali-toolkit/images/text-input-selection-handle-right.png
rename to base/dali-toolkit/images/text-input-selection-handle-right.png

diff --git a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp b/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/alignment/alignment-impl.cpp
rename to base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp

diff --git a/dali-toolkit/internal/controls/alignment/alignment-impl.h b/base/dali-toolkit/internal/controls/alignment/alignment-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/alignment/alignment-impl.h
rename to base/dali-toolkit/internal/controls/alignment/alignment-impl.h

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/buttons/button-impl.cpp
rename to base/dali-toolkit/internal/controls/buttons/button-impl.cpp

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.h b/base/dali-toolkit/internal/controls/buttons/button-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/buttons/button-impl.h
rename to base/dali-toolkit/internal/controls/buttons/button-impl.h

diff --git a/dali-toolkit/internal/controls/buttons/button-painter-impl.h b/base/dali-toolkit/internal/controls/buttons/button-painter-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/buttons/button-painter-impl.h
rename to base/dali-toolkit/internal/controls/buttons/button-painter-impl.h

diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp b/base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp
rename to base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp

diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h b/base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h
rename to base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h

diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
rename to base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp

diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/buttons/check-box-button-impl.h
rename to base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h

diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-painter-impl.h b/base/dali-toolkit/internal/controls/buttons/check-box-button-painter-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/buttons/check-box-button-painter-impl.h
rename to base/dali-toolkit/internal/controls/buttons/check-box-button-painter-impl.h

diff --git a/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp b/base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp
rename to base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp

diff --git a/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h b/base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h
rename to base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h

diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/buttons/push-button-impl.cpp
rename to base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp

diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.h b/base/dali-toolkit/internal/controls/buttons/push-button-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/buttons/push-button-impl.h
rename to base/dali-toolkit/internal/controls/buttons/push-button-impl.h

diff --git a/dali-toolkit/internal/controls/buttons/push-button-painter-impl.h b/base/dali-toolkit/internal/controls/buttons/push-button-painter-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/buttons/push-button-painter-impl.h
rename to base/dali-toolkit/internal/controls/buttons/push-button-painter-impl.h

diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/popup/popup-impl.cpp
rename to base/dali-toolkit/internal/controls/popup/popup-impl.cpp

diff --git a/dali-toolkit/internal/controls/popup/popup-impl.h b/base/dali-toolkit/internal/controls/popup/popup-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/popup/popup-impl.h
rename to base/dali-toolkit/internal/controls/popup/popup-impl.h

diff --git a/dali-toolkit/internal/controls/popup/popup-style-impl.cpp b/base/dali-toolkit/internal/controls/popup/popup-style-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/popup/popup-style-impl.cpp
rename to base/dali-toolkit/internal/controls/popup/popup-style-impl.cpp

diff --git a/dali-toolkit/internal/controls/popup/popup-style-impl.h b/base/dali-toolkit/internal/controls/popup/popup-style-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/popup/popup-style-impl.h
rename to base/dali-toolkit/internal/controls/popup/popup-style-impl.h

diff --git a/dali-toolkit/internal/controls/relayout-controller-impl.cpp b/base/dali-toolkit/internal/controls/relayout-controller-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/relayout-controller-impl.cpp
rename to base/dali-toolkit/internal/controls/relayout-controller-impl.cpp

diff --git a/dali-toolkit/internal/controls/relayout-controller-impl.h b/base/dali-toolkit/internal/controls/relayout-controller-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/relayout-controller-impl.h
rename to base/dali-toolkit/internal/controls/relayout-controller-impl.h

diff --git a/dali-toolkit/internal/controls/relayout-controller.cpp b/base/dali-toolkit/internal/controls/relayout-controller.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/relayout-controller.cpp
rename to base/dali-toolkit/internal/controls/relayout-controller.cpp

diff --git a/dali-toolkit/internal/controls/relayout-controller.h b/base/dali-toolkit/internal/controls/relayout-controller.h
similarity index 100%
rename from dali-toolkit/internal/controls/relayout-controller.h
rename to base/dali-toolkit/internal/controls/relayout-controller.h

diff --git a/dali-toolkit/internal/controls/relayout-helper.cpp b/base/dali-toolkit/internal/controls/relayout-helper.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/relayout-helper.cpp
rename to base/dali-toolkit/internal/controls/relayout-helper.cpp

diff --git a/dali-toolkit/internal/controls/relayout-helper.h b/base/dali-toolkit/internal/controls/relayout-helper.h
similarity index 100%
rename from dali-toolkit/internal/controls/relayout-helper.h
rename to base/dali-toolkit/internal/controls/relayout-helper.h

diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
rename to base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp

diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
rename to base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h

diff --git a/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp b/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp
rename to base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp

diff --git a/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h b/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h
rename to base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h

diff --git a/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp b/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp
rename to base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp

diff --git a/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h b/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h
similarity index 100%
rename from dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h
rename to base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h

diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-custom-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-custom-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-custom-effect-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-custom-effect-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-custom-effect-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-custom-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-custom-effect-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-custom-effect-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-twist-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-twist-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-twist-effect-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-twist-effect-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-twist-effect-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-twist-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-twist-effect-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-twist-effect-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h

diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
rename to base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.h b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/scrollable/scrollable-impl.h
rename to base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h

diff --git a/dali-toolkit/internal/controls/style-change-processor.cpp b/base/dali-toolkit/internal/controls/style-change-processor.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/style-change-processor.cpp
rename to base/dali-toolkit/internal/controls/style-change-processor.cpp

diff --git a/dali-toolkit/internal/controls/style-change-processor.h b/base/dali-toolkit/internal/controls/style-change-processor.h
similarity index 100%
rename from dali-toolkit/internal/controls/style-change-processor.h
rename to base/dali-toolkit/internal/controls/style-change-processor.h

diff --git a/dali-toolkit/internal/controls/table-view/array-2d.h b/base/dali-toolkit/internal/controls/table-view/array-2d.h
similarity index 100%
rename from dali-toolkit/internal/controls/table-view/array-2d.h
rename to base/dali-toolkit/internal/controls/table-view/array-2d.h

diff --git a/dali-toolkit/internal/controls/table-view/table-view-impl.cpp b/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
similarity index 99%
rename from dali-toolkit/internal/controls/table-view/table-view-impl.cpp
rename to base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
index d702ced..9afaeed 100644 (file)
--- a/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
@@ -15,7 +15,7 @@
 //
 
 // CLASS HEADER
 //
 
 // CLASS HEADER

-#include "dali-toolkit/internal/controls/table-view/table-view-impl.h"
+#include <dali-toolkit/internal/controls/table-view/table-view-impl.h>

 #include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
 
 // EXTERNAL INCLUDES

diff --git a/dali-toolkit/internal/controls/table-view/table-view-impl.h b/base/dali-toolkit/internal/controls/table-view/table-view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/table-view/table-view-impl.h
rename to base/dali-toolkit/internal/controls/table-view/table-view-impl.h

diff --git a/dali-toolkit/internal/controls/text-input/text-input-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-input/text-input-impl.cpp
rename to base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp

diff --git a/dali-toolkit/internal/controls/text-input/text-input-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
similarity index 99%
rename from dali-toolkit/internal/controls/text-input/text-input-impl.h
rename to base/dali-toolkit/internal/controls/text-input/text-input-impl.h
index e3a7608..44378ac 100644 (file)
--- a/dali-toolkit/internal/controls/text-input/text-input-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
@@ -21,7 +21,6 @@
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-input/text-input.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-input/text-input.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>

-#include <dali-toolkit/public-api/controls/tool-bar/tool-bar.h>

 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-popup-impl.h>
 
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-popup-impl.h>
 

diff --git a/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
rename to base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp

diff --git a/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-input/text-input-popup-impl.h
rename to base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h

diff --git a/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp b/base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
rename to base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp

diff --git a/dali-toolkit/internal/controls/text-view/relayout-utilities.h b/base/dali-toolkit/internal/controls/text-view/relayout-utilities.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/relayout-utilities.h
rename to base/dali-toolkit/internal/controls/text-view/relayout-utilities.h

diff --git a/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp b/base/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp
rename to base/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp

diff --git a/dali-toolkit/internal/controls/text-view/split-by-char-policies.h b/base/dali-toolkit/internal/controls/text-view/split-by-char-policies.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/split-by-char-policies.h
rename to base/dali-toolkit/internal/controls/text-view/split-by-char-policies.h

diff --git a/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp b/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp
rename to base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp

diff --git a/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h b/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h
rename to base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h

diff --git a/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp b/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp
rename to base/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp

diff --git a/dali-toolkit/internal/controls/text-view/split-by-word-policies.h b/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/split-by-word-policies.h
rename to base/dali-toolkit/internal/controls/text-view/split-by-word-policies.h

diff --git a/dali-toolkit/internal/controls/text-view/text-actor-cache.cpp b/base/dali-toolkit/internal/controls/text-view/text-actor-cache.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-actor-cache.cpp
rename to base/dali-toolkit/internal/controls/text-view/text-actor-cache.cpp

diff --git a/dali-toolkit/internal/controls/text-view/text-actor-cache.h b/base/dali-toolkit/internal/controls/text-view/text-actor-cache.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-actor-cache.h
rename to base/dali-toolkit/internal/controls/text-view/text-actor-cache.h

diff --git a/dali-toolkit/internal/controls/text-view/text-processor.cpp b/base/dali-toolkit/internal/controls/text-view/text-processor.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-processor.cpp
rename to base/dali-toolkit/internal/controls/text-view/text-processor.cpp

diff --git a/dali-toolkit/internal/controls/text-view/text-processor.h b/base/dali-toolkit/internal/controls/text-view/text-processor.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-processor.h
rename to base/dali-toolkit/internal/controls/text-view/text-processor.h

diff --git a/dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp
rename to base/dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp

diff --git a/dali-toolkit/internal/controls/text-view/text-view-impl.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-impl.cpp
rename to base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/text-view/text-view-impl.h b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-impl.h
rename to base/dali-toolkit/internal/controls/text-view/text-view-impl.h

diff --git a/dali-toolkit/internal/controls/text-view/text-view-line-processor.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-line-processor.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-line-processor.cpp
rename to base/dali-toolkit/internal/controls/text-view/text-view-line-processor.cpp

diff --git a/dali-toolkit/internal/controls/text-view/text-view-line-processor.h b/base/dali-toolkit/internal/controls/text-view/text-view-line-processor.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-line-processor.h
rename to base/dali-toolkit/internal/controls/text-view/text-view-line-processor.h

diff --git a/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
rename to base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp

diff --git a/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h b/base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h
rename to base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h

diff --git a/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp
rename to base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp

diff --git a/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h b/base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h
rename to base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h

diff --git a/dali-toolkit/internal/controls/text-view/text-view-processor-types.h b/base/dali-toolkit/internal/controls/text-view/text-view-processor-types.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-processor-types.h
rename to base/dali-toolkit/internal/controls/text-view/text-view-processor-types.h

diff --git a/dali-toolkit/internal/controls/text-view/text-view-processor.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-processor.cpp
rename to base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp

diff --git a/dali-toolkit/internal/controls/text-view/text-view-processor.h b/base/dali-toolkit/internal/controls/text-view/text-view-processor.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-processor.h
rename to base/dali-toolkit/internal/controls/text-view/text-view-processor.h

diff --git a/dali-toolkit/internal/controls/text-view/text-view-word-group-processor.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-word-group-processor.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-word-group-processor.cpp
rename to base/dali-toolkit/internal/controls/text-view/text-view-word-group-processor.cpp

diff --git a/dali-toolkit/internal/controls/text-view/text-view-word-group-processor.h b/base/dali-toolkit/internal/controls/text-view/text-view-word-group-processor.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-word-group-processor.h
rename to base/dali-toolkit/internal/controls/text-view/text-view-word-group-processor.h

diff --git a/dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp
rename to base/dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp

diff --git a/dali-toolkit/internal/controls/text-view/text-view-word-processor.h b/base/dali-toolkit/internal/controls/text-view/text-view-word-processor.h
similarity index 100%
rename from dali-toolkit/internal/controls/text-view/text-view-word-processor.h
rename to base/dali-toolkit/internal/controls/text-view/text-view-word-processor.h

diff --git a/dali-toolkit/internal/factory/localized-control-factory-impl.cpp b/base/dali-toolkit/internal/factory/localized-control-factory-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/factory/localized-control-factory-impl.cpp
rename to base/dali-toolkit/internal/factory/localized-control-factory-impl.cpp

diff --git a/dali-toolkit/internal/factory/localized-control-factory-impl.h b/base/dali-toolkit/internal/factory/localized-control-factory-impl.h
similarity index 100%
rename from dali-toolkit/internal/factory/localized-control-factory-impl.h
rename to base/dali-toolkit/internal/factory/localized-control-factory-impl.h

diff --git a/base/dali-toolkit/internal/file.list b/base/dali-toolkit/internal/file.list
new file mode 100644 (file)
index 0000000..3f1a9f2
--- /dev/null
+++ b/base/dali-toolkit/internal/file.list
@@ -0,0 +1,57 @@
+# Add local source files here
+
+toolkit_base_src_files = \
+   $(toolkit_base_src_dir)/controls/relayout-controller.cpp \
+   $(toolkit_base_src_dir)/controls/relayout-controller-impl.cpp \
+   $(toolkit_base_src_dir)/controls/relayout-helper.cpp \
+   $(toolkit_base_src_dir)/controls/style-change-processor.cpp \
+   $(toolkit_base_src_dir)/controls/alignment/alignment-impl.cpp \
+   $(toolkit_base_src_dir)/controls/buttons/button-impl.cpp \
+   $(toolkit_base_src_dir)/controls/buttons/check-box-button-default-painter-impl.cpp \
+   $(toolkit_base_src_dir)/controls/buttons/check-box-button-impl.cpp \
+   $(toolkit_base_src_dir)/controls/buttons/push-button-default-painter-impl.cpp \
+   $(toolkit_base_src_dir)/controls/buttons/push-button-impl.cpp \
+   $(toolkit_base_src_dir)/controls/popup/popup-impl.cpp \
+   $(toolkit_base_src_dir)/controls/popup/popup-style-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scroll-bar/scroll-bar-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scroll-component/scroll-bar-internal-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scroll-component/scroll-bar-internal.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/item-view/item-view-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scrollable-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-connector-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-base-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-custom-effect-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-twist-effect-impl.cpp \
+   $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp \
+   $(toolkit_base_src_dir)/controls/table-view/table-view-impl.cpp \
+   $(toolkit_base_src_dir)/controls/text-input/text-input-impl.cpp \
+   $(toolkit_base_src_dir)/controls/text-input/text-input-popup-impl.cpp \
+   $(toolkit_base_src_dir)/controls/text-view/relayout-utilities.cpp   \
+   $(toolkit_base_src_dir)/controls/text-view/split-by-new-line-char-policies.cpp   \
+   $(toolkit_base_src_dir)/controls/text-view/split-by-word-policies.cpp   \
+   $(toolkit_base_src_dir)/controls/text-view/split-by-char-policies.cpp   \
+   $(toolkit_base_src_dir)/controls/text-view/text-actor-cache.cpp   \
+   $(toolkit_base_src_dir)/controls/text-view/text-processor.cpp   \
+   $(toolkit_base_src_dir)/controls/text-view/text-view-impl.cpp   \
+   $(toolkit_base_src_dir)/controls/text-view/text-view-character-processor.cpp  \
+   $(toolkit_base_src_dir)/controls/text-view/text-view-line-processor.cpp  \
+   $(toolkit_base_src_dir)/controls/text-view/text-view-processor.cpp  \
+   $(toolkit_base_src_dir)/controls/text-view/text-view-processor-dbg.cpp  \
+   $(toolkit_base_src_dir)/controls/text-view/text-view-processor-helper-functions.cpp  \
+   $(toolkit_base_src_dir)/controls/text-view/text-view-word-processor.cpp  \
+   $(toolkit_base_src_dir)/controls/text-view/text-view-word-group-processor.cpp  \
+   $(toolkit_base_src_dir)/factory/localized-control-factory-impl.cpp \
+   $(toolkit_base_src_dir)/focus-manager/focus-manager-impl.cpp \
+   $(toolkit_base_src_dir)/focus-manager/keyboard-focus-manager-impl.cpp \
+   $(toolkit_base_src_dir)/focus-manager/keyinput-focus-manager-impl.cpp

diff --git a/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
rename to base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp

diff --git a/dali-toolkit/internal/focus-manager/focus-manager-impl.h b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h
similarity index 100%
rename from dali-toolkit/internal/focus-manager/focus-manager-impl.h
rename to base/dali-toolkit/internal/focus-manager/focus-manager-impl.h

diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
rename to base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp

diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
similarity index 100%
rename from dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
rename to base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h

diff --git a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
rename to base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp

diff --git a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h
similarity index 100%
rename from dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h
rename to base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h

diff --git a/dali-toolkit/public-api/controls/alignment/alignment.cpp b/base/dali-toolkit/public-api/controls/alignment/alignment.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/alignment/alignment.cpp
rename to base/dali-toolkit/public-api/controls/alignment/alignment.cpp

diff --git a/dali-toolkit/public-api/controls/buttons/button.cpp b/base/dali-toolkit/public-api/controls/buttons/button.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/buttons/button.cpp
rename to base/dali-toolkit/public-api/controls/buttons/button.cpp

diff --git a/dali-toolkit/public-api/controls/buttons/check-box-button.cpp b/base/dali-toolkit/public-api/controls/buttons/check-box-button.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/buttons/check-box-button.cpp
rename to base/dali-toolkit/public-api/controls/buttons/check-box-button.cpp

diff --git a/dali-toolkit/public-api/controls/buttons/check-box-button.h b/base/dali-toolkit/public-api/controls/buttons/check-box-button.h
similarity index 100%
rename from dali-toolkit/public-api/controls/buttons/check-box-button.h
rename to base/dali-toolkit/public-api/controls/buttons/check-box-button.h

diff --git a/dali-toolkit/public-api/controls/buttons/push-button.cpp b/base/dali-toolkit/public-api/controls/buttons/push-button.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/buttons/push-button.cpp
rename to base/dali-toolkit/public-api/controls/buttons/push-button.cpp

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/base/dali-toolkit/public-api/controls/control-impl.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/control-impl.cpp
rename to base/dali-toolkit/public-api/controls/control-impl.cpp

diff --git a/dali-toolkit/public-api/controls/control.cpp b/base/dali-toolkit/public-api/controls/control.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/control.cpp
rename to base/dali-toolkit/public-api/controls/control.cpp

diff --git a/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp b/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp
rename to base/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp

diff --git a/dali-toolkit/public-api/controls/default-controls/check-button-factory.h b/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.h
similarity index 100%
rename from dali-toolkit/public-api/controls/default-controls/check-button-factory.h
rename to base/dali-toolkit/public-api/controls/default-controls/check-button-factory.h

diff --git a/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp b/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp
rename to base/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp

diff --git a/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp b/base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp
rename to base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp

diff --git a/dali-toolkit/public-api/controls/popup/popup.cpp b/base/dali-toolkit/public-api/controls/popup/popup.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/popup/popup.cpp
rename to base/dali-toolkit/public-api/controls/popup/popup.cpp

diff --git a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp b/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp
rename to base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp

diff --git a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
rename to base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/album-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/album-layout.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/item-view/album-layout.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/item-view/album-layout.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/album-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/album-layout.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/item-view/album-layout.h
rename to base/dali-toolkit/public-api/controls/scrollable/item-view/album-layout.h

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h
rename to base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h
rename to base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h
rename to base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h
rename to base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-component.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-component.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-component.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-component.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-component.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-component.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-component.h
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-component.h

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/scrollable.cpp b/base/dali-toolkit/public-api/controls/scrollable/scrollable.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/scrollable/scrollable.cpp
rename to base/dali-toolkit/public-api/controls/scrollable/scrollable.cpp

diff --git a/dali-toolkit/public-api/controls/table-view/table-view.cpp b/base/dali-toolkit/public-api/controls/table-view/table-view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/table-view/table-view.cpp
rename to base/dali-toolkit/public-api/controls/table-view/table-view.cpp

diff --git a/dali-toolkit/public-api/controls/table-view/table-view.h b/base/dali-toolkit/public-api/controls/table-view/table-view.h
similarity index 100%
rename from dali-toolkit/public-api/controls/table-view/table-view.h
rename to base/dali-toolkit/public-api/controls/table-view/table-view.h

diff --git a/dali-toolkit/public-api/controls/text-input/text-input.cpp b/base/dali-toolkit/public-api/controls/text-input/text-input.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/text-input/text-input.cpp
rename to base/dali-toolkit/public-api/controls/text-input/text-input.cpp

diff --git a/dali-toolkit/public-api/controls/text-view/text-view.cpp b/base/dali-toolkit/public-api/controls/text-view/text-view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/text-view/text-view.cpp
rename to base/dali-toolkit/public-api/controls/text-view/text-view.cpp

diff --git a/dali-toolkit/public-api/enums.cpp b/base/dali-toolkit/public-api/enums.cpp
similarity index 100%
rename from dali-toolkit/public-api/enums.cpp
rename to base/dali-toolkit/public-api/enums.cpp

diff --git a/dali-toolkit/public-api/factory/localized-control-factory.cpp b/base/dali-toolkit/public-api/factory/localized-control-factory.cpp
similarity index 100%
rename from dali-toolkit/public-api/factory/localized-control-factory.cpp
rename to base/dali-toolkit/public-api/factory/localized-control-factory.cpp

diff --git a/base/dali-toolkit/public-api/file.list b/base/dali-toolkit/public-api/file.list
new file mode 100755 (executable)
index 0000000..5dd1163
--- /dev/null
+++ b/base/dali-toolkit/public-api/file.list
@@ -0,0 +1,103 @@
+# Add local source files here
+
+public_api_base_src_files = \
+  $(public_api_base_src_dir)/enums.cpp \
+  $(public_api_base_src_dir)/controls/control.cpp \
+  $(public_api_base_src_dir)/controls/control-impl.cpp \
+  $(public_api_base_src_dir)/controls/alignment/alignment.cpp \
+  $(public_api_base_src_dir)/controls/buttons/button.cpp \
+  $(public_api_base_src_dir)/controls/buttons/check-box-button.cpp \
+  $(public_api_base_src_dir)/controls/buttons/push-button.cpp \
+  $(public_api_base_src_dir)/controls/default-controls/solid-color-actor.cpp \
+  $(public_api_base_src_dir)/controls/default-controls/check-button-factory.cpp \
+  $(public_api_base_src_dir)/controls/default-controls/push-button-factory.cpp \
+  $(public_api_base_src_dir)/controls/popup/popup.cpp \
+  $(public_api_base_src_dir)/controls/scroll-bar/scroll-bar.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/item-factory.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/item-layout.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/item-view.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/depth-layout.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/grid-layout.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/navigation-layout.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/roll-layout.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/spiral-layout.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/album-layout.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scrollable.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-connector.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-component-impl.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-component.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-custom-effect.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-slide-effect.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-twist-effect.cpp \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp \
+  $(public_api_base_src_dir)/controls/table-view/table-view.cpp \
+  $(public_api_base_src_dir)/controls/text-input/text-input.cpp \
+  $(public_api_base_src_dir)/controls/text-view/text-view.cpp \
+  $(public_api_base_src_dir)/factory/localized-control-factory.cpp \
+  $(public_api_base_src_dir)/focus-manager/focus-manager.cpp \
+  $(public_api_base_src_dir)/focus-manager/keyboard-focus-manager.cpp \
+  $(public_api_base_src_dir)/focus-manager/keyinput-focus-manager.cpp \
+  $(public_api_base_src_dir)/markup-processor/markup-processor.cpp \
+  $(public_api_base_src_dir)/shader-effects/image-region-effect.cpp
+
+# Add public header files here
+
+public_api_base_header_files =
+
+public_api_base_controls_header_files =
+
+public_api_base_alignment_header_files =
+
+public_api_base_buttons_header_files = \
+  $(public_api_base_src_dir)/controls/buttons/check-box-button.h
+
+public_api_base_default_controls_header_files = \
+  $(public_api_base_src_dir)/controls/default-controls/check-button-factory.h
+
+public_api_base_item_view_header_files = \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/depth-layout.h \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/roll-layout.h \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/spiral-layout.h \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/navigation-layout.h \
+  $(public_api_base_src_dir)/controls/scrollable/item-view/album-layout.h
+
+public_api_base_popup_header_files =
+
+public_api_base_scrollable_header_files = \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-component-impl.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-component.h
+
+public_api_base_scroll_bar_header_files = \
+  $(public_api_base_src_dir)/controls/scroll-bar/scroll-bar.h
+
+public_api_base_scroll_view_header_files = \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h \
+  $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.h
+
+public_api_base_table_view_header_files = \
+  $(public_api_base_src_dir)/controls/table-view/table-view.h
+
+public_api_base_text_input_header_files =
+
+public_api_base_text_view_header_files =
+
+public_api_base_factory_header_files =
+
+public_api_base_focus_manager_header_files = \
+  $(public_api_base_src_dir)/focus-manager/keyinput-focus-manager.h
+
+public_api_base_markup_processor_header_files =
+

diff --git a/dali-toolkit/public-api/focus-manager/focus-manager.cpp b/base/dali-toolkit/public-api/focus-manager/focus-manager.cpp
similarity index 100%
rename from dali-toolkit/public-api/focus-manager/focus-manager.cpp
rename to base/dali-toolkit/public-api/focus-manager/focus-manager.cpp

diff --git a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp b/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp
similarity index 100%
rename from dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp
rename to base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp

diff --git a/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp
similarity index 100%
rename from dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp
rename to base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp

diff --git a/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h
similarity index 100%
rename from dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h
rename to base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h

diff --git a/dali-toolkit/public-api/markup-processor/markup-processor.cpp b/base/dali-toolkit/public-api/markup-processor/markup-processor.cpp
similarity index 100%
rename from dali-toolkit/public-api/markup-processor/markup-processor.cpp
rename to base/dali-toolkit/public-api/markup-processor/markup-processor.cpp

diff --git a/dali-toolkit/public-api/shader-effects/image-region-effect.cpp b/base/dali-toolkit/public-api/shader-effects/image-region-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/image-region-effect.cpp
rename to base/dali-toolkit/public-api/shader-effects/image-region-effect.cpp

diff --git a/build/slp/Makefile.am b/build/slp/Makefile.am
index d730e17..bab8c68 100644 (file)
--- a/build/slp/Makefile.am
+++ b/build/slp/Makefile.am
@@ -14,7 +14,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-SUBDIRS = dali-toolkit
+SUBDIRS = dali-toolkit-base \
+          dali-toolkit

 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dali-toolkit.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dali-toolkit.pc

diff --git a/build/slp/configure.ac b/build/slp/configure.ac
index 81b9f5f..1d684d4 100644 (file)
--- a/build/slp/configure.ac
+++ b/build/slp/configure.ac
@@ -80,6 +80,7 @@ AC_SUBST(devincludepath)
 AC_CONFIG_FILES([
  Makefile
  dali-toolkit/Makefile
 AC_CONFIG_FILES([
  Makefile
  dali-toolkit/Makefile

+ dali-toolkit-base/Makefile

  dali-toolkit.pc
 ])
 
  dali-toolkit.pc
 ])
 

diff --git a/build/slp/dali-toolkit-base/Makefile.am b/build/slp/dali-toolkit-base/Makefile.am
new file mode 100644 (file)
index 0000000..f644a6e
--- /dev/null
+++ b/build/slp/dali-toolkit-base/Makefile.am
@@ -0,0 +1,59 @@
+#
+# Copyright (c) 2014 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Flora License, Version 1.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/
+#
+# Unless required by applicable law or agreed to in writing, software
+# 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.
+#
+
+# Build the Dali Toolkit Base library
+
+# Base files
+toolkit_base_images_dir = ../../../base/dali-toolkit/images
+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/internal/file.list
+include ../../../base/dali-toolkit/public-api/file.list
+
+#resources_dir = ../../../resources
+#daliimagedir = ${dataReadOnlyDir}/toolkit/images/
+#daliimage_DATA = ${dali_toolkit_base_image_files}
+
+# The Base library
+lib_LTLIBRARIES = libdali-toolkit-base.la
+
+libdali_toolkit_base_la_SOURCES = \
+                     $(toolkit_base_src_files) \
+                     $(public_api_base_src_files)
+
+libdali_toolkit_base_la_DEPENDENCIES =
+
+libdali_toolkit_base_la_CXXFLAGS = -DDALI_COMPILATION \
+                      -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \
+                      -Werror -Wall \
+                      -I../../../base \
+                      -I../../../capi \
+                      $(DALI_TOOLKIT_CFLAGS) \
+                      $(DALICORE_CFLAGS) \
+                      $(DALI_CFLAGS) \
+                      $(DLOG_CFLAGS) \
+                      $(FRIBIDI_CFLAGS) \
+                      $(HTMLCXX_CFLAGS)
+
+libdali_toolkit_base_la_LIBADD = \
+                      $(DALICORE_LIBS) \
+                      $(DALI_LIBS) \
+                      $(DLOG_LIBS) \
+                      $(FRIBIDI_LIBS) \
+                      $(HTMLCXX_LIBS)
+

diff --git a/build/slp/dali-toolkit/Makefile.am b/build/slp/dali-toolkit/Makefile.am
index f4a1002..729ce52 100644 (file)
--- a/build/slp/dali-toolkit/Makefile.am
+++ b/build/slp/dali-toolkit/Makefile.am
@@ -14,34 +14,52 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-# Build the Dali Toolkit library
+# Build the Dali Toolkit library (Combined Base and Optional)

 
 

-toolkit_images_dir = ../../../dali-toolkit/images
-toolkit_src_dir = ../../../dali-toolkit/internal
-public_api_src_dir = ../../../dali-toolkit/public-api
+# Base files
+toolkit_base_images_dir = ../../../base/dali-toolkit/images
+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/internal/file.list
+include ../../../base/dali-toolkit/public-api/file.list
+
+# Optional files
+toolkit_optional_images_dir = ../../../optional/dali-toolkit/images
+toolkit_optional_src_dir    = ../../../optional/dali-toolkit/internal
+public_api_optional_src_dir = ../../../optional/dali-toolkit/public-api
+
+include ../../../optional/dali-toolkit/images/file.list
+include ../../../optional/dali-toolkit/internal/file.list
+include ../../../optional/dali-toolkit/public-api/file.list
+
+# CAPI

 capi_devel_src_dir = ../../../capi/dali-toolkit/public-api
 
 capi_devel_src_dir = ../../../capi/dali-toolkit/public-api
 

-include ../../../dali-toolkit/images/file.list
-include ../../../dali-toolkit/internal/file.list
-include ../../../dali-toolkit/public-api/file.list

 include ../../../capi/dali-toolkit/public-api/file.list
 
 include ../../../capi/dali-toolkit/public-api/file.list
 

+resources_dir = ../../../resources
+daliimagedir = ${dataReadOnlyDir}/toolkit/images/
+daliimage_DATA = ${dali_toolkit_base_image_files} \
+                 ${dali_toolkit_optional_image_files}
+
+# The Combined library

 lib_LTLIBRARIES = libdali-toolkit.la
 
 libdali_toolkit_la_SOURCES = \
 lib_LTLIBRARIES = libdali-toolkit.la
 
 libdali_toolkit_la_SOURCES = \

-                     $(toolkit_src_files) \
-                     $(public_api_src_files)
-
-resources_dir = ../../../resources
-daliimagedir = ${dataReadOnlyDir}/toolkit/images/
-daliimage_DATA = ${dali_toolkit_image_files}
+                     $(toolkit_base_src_files) \
+                     $(public_api_base_src_files) \
+                     $(toolkit_optional_src_files) \
+                     $(public_api_optional_src_files)

 
 libdali_toolkit_la_DEPENDENCIES =
 
 libdali_toolkit_la_CXXFLAGS = -DDALI_COMPILATION \
                       -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \
                       -Werror -Wall \
 
 libdali_toolkit_la_DEPENDENCIES =
 
 libdali_toolkit_la_CXXFLAGS = -DDALI_COMPILATION \
                       -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \
                       -Werror -Wall \

-                      -I../../.. \
+                      -I../../../base \
+                      -I../../../optional \

                       -I../../../capi \
                       $(DALI_TOOLKIT_CFLAGS) \
                       $(DALICORE_CFLAGS) \
                       -I../../../capi \
                       $(DALI_TOOLKIT_CFLAGS) \
                       $(DALICORE_CFLAGS) \


@@ -57,88 +75,96 @@ libdali_toolkit_la_LIBADD = \
                       $(FRIBIDI_LIBS) \
                       $(HTMLCXX_LIBS)
 
                       $(FRIBIDI_LIBS) \
                       $(HTMLCXX_LIBS)
 

-# Install headers
-topleveldir = $(devincludepath)/dali-toolkit
-toplevel_HEADERS = ../../../dali-toolkit/dali-toolkit.h
-
-publicapidir = $(devincludepath)/dali-toolkit/public-api
-publicapicontrolsdir = $(publicapidir)/controls
-publicapialignmentdir = $(publicapidir)/controls/alignment
-publicapibloomviewdir = $(publicapidir)/controls/bloom-view
-publicapibuttonsdir = $(publicapidir)/controls/buttons
-publicapiclusterdir = $(publicapidir)/controls/cluster
-publicapidefaultcontrolsdir = $(publicapidir)/controls/default-controls
-publicapieffectsviewdir = $(publicapidir)/controls/effects-view
-publicapigaussianblurviewdir = $(publicapidir)/controls/gaussian-blur-view
-publicapiimageviewdir = $(publicapidir)/controls/image-view
-publicapiitemviewdir = $(publicapidir)/controls/scrollable/item-view
-publicapimagnifierdir = $(publicapidir)/controls/magnifier
-publicapipopupdir = $(publicapidir)/controls/popup
-publicapipageturnviewdir = $(publicapidir)/controls/page-turn-view
-publicapiscrollbardir = $(publicapidir)/controls/scroll-bar
-publicapiscrollcomponentdir = $(publicapidir)/controls/scroll-component
-publicapiscrollabledir = $(publicapidir)/controls/scrollable
-publicapiscrollviewdir = $(publicapidir)/controls/scrollable/scroll-view
-publicapisliderdir = $(publicapidir)/controls/slider
-publicapitableviewdir = $(publicapidir)/controls/table-view
-publicapitextviewdir = $(publicapidir)/controls/text-view
-publicapitextinputdir = $(publicapidir)/controls/text-input
-publicapitoolbardir = $(publicapidir)/controls/tool-bar
-publicapiselectorsdir = $(publicapidir)/controls/selectors
-publicapishadowviewdir = $(publicapidir)/controls/shadow-view
-publicapibubbleemitterdir = $(publicapidir)/controls/bubble-effect
-publicapisuperblurviewdir = $(publicapidir)/controls/super-blur-view
-publicapiviewdir = $(publicapidir)/controls/view
-publicapinavigationframedir = $(publicapidir)/controls/navigation-frame
-publicapifactorydir = $(publicapidir)/factory
-publicapifocusmanagerdir = $(publicapidir)/focus-manager
-publicapimarkupprocessordir = $(publicapidir)/markup-processor
-publicapishadereffectsdir = $(publicapidir)/shader-effects
-publicapibubbleeffectdir = $(publicapidir)/shader-effects/bubble-effect
-publicapistyledtextutilitiesdir = $(publicapidir)/styled-text-utilities
-publicapibuilderdir = $(publicapidir)/builder
-publicapiutilitiesdir = $(publicapidir)/utilities
-publicapitransitioneffectsdir = $(publicapidir)/transition-effects
-
-publicapi_HEADERS = $(public_api_header_files)
-publicapicontrols_HEADERS = $(public_api_controls_header_files)
-publicapialignment_HEADERS = $(public_api_alignment_header_files)
-publicapibloomview_HEADERS = $(public_api_bloom_view_header_files)
-publicapibuttons_HEADERS = $(public_api_buttons_header_files)
-publicapicluster_HEADERS = $(public_api_cluster_header_files)
-publicapidefaultcontrols_HEADERS = $(public_api_default_controls_header_files)
-publicapieffectsview_HEADERS = $(public_api_effects_view_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)
-publicapimagnifier_HEADERS = $(public_api_magnifier_header_files)
-publicapipopup_HEADERS = $(public_api_popup_header_files)
-publicapipageturnview_HEADERS = $(public_api_page_turn_view_header_files)
-publicapiscrollbar_HEADERS = $(public_api_scroll_bar_header_files)
-publicapiscrollcomponent_HEADERS = $(public_api_scroll_component_header_files)
-publicapiscrollable_HEADERS = $(public_api_scrollable_header_files)
-publicapiscrollview_HEADERS = $(public_api_scroll_view_header_files)
-publicapislider_HEADERS = $(public_api_slider_header_files)
-publicapitableview_HEADERS = $(public_api_table_view_header_files)
-publicapitextview_HEADERS = $(public_api_text_view_header_files)
-publicapitextinput_HEADERS = $(public_api_text_input_header_files)
-publicapitoolbar_HEADERS = $(public_api_tool_bar_header_files)
-publicapiselectors_HEADERS = $(public_api_selectors_header_files)
-publicapishadowview_HEADERS = $(public_api_shadow_view_header_files)
-publicapibubbleemitter_HEADERS = $(public_api_bubble_emitter_header_files)
-publicapisuperblurview_HEADERS = $(public_api_super_blur_view_header_files)
-publicapiview_HEADERS = $(public_api_view_header_files)
-publicapinavigationframe_HEADERS = $(public_api_navigation_frame_header_files)
-publicapifactory_HEADERS = $(public_api_factory_header_files)
-publicapifocusmanager_HEADERS = $(public_api_focus_manager_header_files)
-publicapimarkupprocessor_HEADERS = $(public_api_markup_processor_header_files)
-publicapishadereffects_HEADERS = $(public_api_shader_effects_header_files)
-publicapibubbleeffect_HEADERS = $(public_api_bubble_effect_header_files)
-publicapistyledtextutilities_HEADERS = $(public_api_styled_text_utilities_header_files)
-publicapibuilder_HEADERS = $(public_api_builder_header_files)
-publicapiutilities_HEADERS = $(public_api_utilities_header_files)
-publicapitransitioneffects_HEADERS = $(public_api_transition_effects_header_files)
+# Install Base headers
+
+toplevelbasedir = $(devincludepath)/dali-toolkit
+
+publicapibasedir = $(toplevelbasedir)/public-api
+publicapibasecontrolsdir = $(publicapibasedir)/controls
+publicapibasealignmentdir = $(publicapibasedir)/controls/alignment
+publicapibasebuttonsdir = $(publicapibasedir)/controls/buttons
+publicapibasedefaultcontrolsdir = $(publicapibasedir)/controls/default-controls
+publicapibaseitemviewdir = $(publicapibasedir)/controls/scrollable/item-view
+publicapibasepopupdir = $(publicapibasedir)/controls/popup
+publicapibasescrollbardir = $(publicapibasedir)/controls/scroll-bar
+publicapibasescrollcomponentdir = $(publicapibasedir)/controls/scroll-component
+publicapibasescrollabledir = $(publicapibasedir)/controls/scrollable
+publicapibasescrollviewdir = $(publicapibasedir)/controls/scrollable/scroll-view
+publicapibasetableviewdir = $(publicapibasedir)/controls/table-view
+publicapibasetextviewdir = $(publicapibasedir)/controls/text-view
+publicapibasetextinputdir = $(publicapibasedir)/controls/text-input
+publicapibasefactorydir = $(publicapibasedir)/factory
+publicapibasefocusmanagerdir = $(publicapibasedir)/focus-manager
+publicapibasemarkupprocessordir = $(publicapibasedir)/markup-processor
+
+publicapibase_HEADERS = $(public_api_base_header_files)
+publicapibasecontrols_HEADERS = $(public_api_base_controls_header_files)
+publicapibasealignment_HEADERS = $(public_api_base_alignment_header_files)
+publicapibasebuttons_HEADERS = $(public_api_base_buttons_header_files)
+publicapibasedefaultcontrols_HEADERS = $(public_api_base_default_controls_header_files)
+publicapibaseitemview_HEADERS = $(public_api_base_item_view_header_files)
+publicapibasepopup_HEADERS = $(public_api_base_popup_header_files)
+publicapibasescrollbar_HEADERS = $(public_api_base_scroll_bar_header_files)
+publicapibasescrollcomponent_HEADERS = $(public_api_base_scroll_component_header_files)
+publicapibasescrollable_HEADERS = $(public_api_base_scrollable_header_files)
+publicapibasescrollview_HEADERS = $(public_api_base_scroll_view_header_files)
+publicapibasetableview_HEADERS = $(public_api_base_table_view_header_files)
+publicapibasetextview_HEADERS = $(public_api_base_text_view_header_files)
+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)
+
+# Install Optional headers
+
+topleveloptionaldir = $(devincludepath)/dali-toolkit
+topleveloptional_HEADERS = ../../../optional/dali-toolkit/dali-toolkit.h
+
+publicapioptionaldir = $(topleveloptionaldir)/public-api
+publicapioptionalcontrolsdir = $(publicapioptionaldir)/controls
+publicapioptionalbloomviewdir = $(publicapioptionaldir)/controls/bloom-view
+publicapioptionalclusterdir = $(publicapioptionaldir)/controls/cluster
+publicapioptionaleffectsviewdir = $(publicapioptionaldir)/controls/effects-view
+publicapioptionalgaussianblurviewdir = $(publicapioptionaldir)/controls/gaussian-blur-view
+publicapioptionalimageviewdir = $(publicapioptionaldir)/controls/image-view
+publicapioptionalmagnifierdir = $(publicapioptionaldir)/controls/magnifier
+publicapioptionalpageturnviewdir = $(publicapioptionaldir)/controls/page-turn-view
+publicapioptionalsliderdir = $(publicapioptionaldir)/controls/slider
+publicapioptionaltoolbardir = $(publicapioptionaldir)/controls/tool-bar
+publicapioptionalselectorsdir = $(publicapioptionaldir)/controls/selectors
+publicapioptionalshadowviewdir = $(publicapioptionaldir)/controls/shadow-view
+publicapioptionalbubbleemitterdir = $(publicapioptionaldir)/controls/bubble-effect
+publicapioptionalsuperblurviewdir = $(publicapioptionaldir)/controls/super-blur-view
+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)
+publicapioptionalcontrols_HEADERS = $(public_api_optional_controls_header_files)
+publicapioptionalbloomview_HEADERS = $(public_api_optional_bloom_view_header_files)
+publicapioptionalcluster_HEADERS = $(public_api_optional_cluster_header_files)
+publicapioptionaleffectsview_HEADERS = $(public_api_optional_effects_view_header_files)
+publicapioptionalgaussianblurview_HEADERS = $(public_api_optional_gaussian_blur_view_header_files)
+publicapioptionalimageview_HEADERS = $(public_api_optional_image_view_header_files)
+publicapioptionalmagnifier_HEADERS = $(public_api_optional_magnifier_header_files)
+publicapioptionalpageturnview_HEADERS = $(public_api_optional_page_turn_view_header_files)
+publicapioptionalslider_HEADERS = $(public_api_optional_slider_header_files)
+publicapioptionaltoolbar_HEADERS = $(public_api_optional_tool_bar_header_files)
+publicapioptionalselectors_HEADERS = $(public_api_optional_selectors_header_files)
+publicapioptionalshadowview_HEADERS = $(public_api_optional_shadow_view_header_files)
+publicapioptionalbubbleemitter_HEADERS = $(public_api_optional_bubble_emitter_header_files)
+publicapioptionalsuperblurview_HEADERS = $(public_api_optional_super_blur_view_header_files)
+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

 
 capideveldir = $(devincludepath)/dali-toolkit/public-api
 capidevelcontrolsdir = $(capideveldir)/controls
 
 capideveldir = $(devincludepath)/dali-toolkit/public-api
 capidevelcontrolsdir = $(capideveldir)/controls

diff --git a/dali-toolkit/images/file.list b/dali-toolkit/images/file.list
deleted file mode 100644 (file)
index dbc5012..0000000
--- a/dali-toolkit/images/file.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# Files to install here
-
-dali_toolkit_image_files =\
-    $(toolkit_images_dir)/*.png

diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list
deleted file mode 100644 (file)
index 221e1b6..0000000
--- a/dali-toolkit/internal/file.list
+++ /dev/null
@@ -1,100 +0,0 @@
-# Add local source files here
-
-toolkit_src_files = \
-   $(toolkit_src_dir)/builder/builder-impl.cpp \
-   $(toolkit_src_dir)/builder/builder-animations.cpp \
-   $(toolkit_src_dir)/builder/builder-set-property.cpp \
-   $(toolkit_src_dir)/builder/builder-signals.cpp \
-   $(toolkit_src_dir)/builder/builder-actor.cpp \
-   $(toolkit_src_dir)/builder/builder-control.cpp \
-   $(toolkit_src_dir)/builder/json-parser-state.cpp \
-   $(toolkit_src_dir)/builder/json-parser-impl.cpp \
-   $(toolkit_src_dir)/builder/tree-node-manipulator.cpp \
-   $(toolkit_src_dir)/builder/replacement.cpp \
-   $(toolkit_src_dir)/controls/relayout-controller.cpp \
-   $(toolkit_src_dir)/controls/relayout-controller-impl.cpp \
-   $(toolkit_src_dir)/controls/relayout-helper.cpp \
-   $(toolkit_src_dir)/controls/style-change-processor.cpp \
-   $(toolkit_src_dir)/controls/alignment/alignment-impl.cpp \
-   $(toolkit_src_dir)/controls/bloom-view/bloom-view-impl.cpp \
-   $(toolkit_src_dir)/controls/buttons/button-impl.cpp \
-   $(toolkit_src_dir)/controls/buttons/check-box-button-default-painter-impl.cpp \
-   $(toolkit_src_dir)/controls/buttons/check-box-button-impl.cpp \
-   $(toolkit_src_dir)/controls/buttons/push-button-default-painter-impl.cpp \
-   $(toolkit_src_dir)/controls/buttons/push-button-impl.cpp \
-   $(toolkit_src_dir)/controls/cluster/cluster-impl.cpp \
-   $(toolkit_src_dir)/controls/cluster/cluster-style-impl.cpp \
-   $(toolkit_src_dir)/controls/effects-view/effects-view-impl.cpp \
-   $(toolkit_src_dir)/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp \
-   $(toolkit_src_dir)/controls/image-view/image-view-impl.cpp \
-   $(toolkit_src_dir)/controls/image-view/masked-image-view-impl.cpp \
-   $(toolkit_src_dir)/controls/page-turn-view/page-turn-view-impl.cpp \
-   $(toolkit_src_dir)/controls/page-turn-view/page-turn-portrait-view-impl.cpp \
-   $(toolkit_src_dir)/controls/page-turn-view/page-turn-landscape-view-impl.cpp \
-   $(toolkit_src_dir)/controls/popup/popup-impl.cpp \
-   $(toolkit_src_dir)/controls/popup/popup-style-impl.cpp \
-   $(toolkit_src_dir)/controls/scroll-bar/scroll-bar-impl.cpp \
-   $(toolkit_src_dir)/controls/scroll-component/scroll-bar-internal-impl.cpp \
-   $(toolkit_src_dir)/controls/scroll-component/scroll-bar-internal.cpp \
-   $(toolkit_src_dir)/controls/scrollable/item-view/item-view-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scrollable-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-connector-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-base-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-custom-effect-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-twist-effect-impl.cpp \
-   $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp \
-   $(toolkit_src_dir)/controls/selectors/rotating-selector-impl.cpp \
-   $(toolkit_src_dir)/controls/shadow-view/shadow-view-impl.cpp \
-   $(toolkit_src_dir)/controls/slider/slider-impl.cpp \
-   $(toolkit_src_dir)/controls/super-blur-view/super-blur-view-impl.cpp \
-   $(toolkit_src_dir)/controls/bubble-effect/bubble-emitter-impl.cpp \
-   $(toolkit_src_dir)/controls/table-view/table-view-impl.cpp \
-   $(toolkit_src_dir)/controls/text-input/text-input-impl.cpp \
-   $(toolkit_src_dir)/controls/text-input/text-input-popup-impl.cpp \
-   $(toolkit_src_dir)/controls/text-view/relayout-utilities.cpp   \
-   $(toolkit_src_dir)/controls/text-view/split-by-new-line-char-policies.cpp   \
-   $(toolkit_src_dir)/controls/text-view/split-by-word-policies.cpp   \
-   $(toolkit_src_dir)/controls/text-view/split-by-char-policies.cpp   \
-   $(toolkit_src_dir)/controls/text-view/text-actor-cache.cpp   \
-   $(toolkit_src_dir)/controls/text-view/text-processor.cpp   \
-   $(toolkit_src_dir)/controls/text-view/text-view-impl.cpp   \
-   $(toolkit_src_dir)/controls/text-view/text-view-character-processor.cpp  \
-   $(toolkit_src_dir)/controls/text-view/text-view-line-processor.cpp  \
-   $(toolkit_src_dir)/controls/text-view/text-view-processor.cpp  \
-   $(toolkit_src_dir)/controls/text-view/text-view-processor-dbg.cpp  \
-   $(toolkit_src_dir)/controls/text-view/text-view-processor-helper-functions.cpp  \
-   $(toolkit_src_dir)/controls/text-view/text-view-word-processor.cpp  \
-   $(toolkit_src_dir)/controls/text-view/text-view-word-group-processor.cpp  \
-   $(toolkit_src_dir)/controls/tool-bar/tool-bar-impl.cpp \
-   $(toolkit_src_dir)/controls/view/view-impl.cpp \
-   $(toolkit_src_dir)/controls/navigation-frame/navigation-control-impl.cpp \
-   $(toolkit_src_dir)/controls/navigation-frame/navigation-bar.cpp \
-   $(toolkit_src_dir)/controls/navigation-frame/navigation-tool-bar.cpp \
-   $(toolkit_src_dir)/controls/navigation-frame/navigation-title-bar.cpp \
-   $(toolkit_src_dir)/controls/navigation-frame/page-impl.cpp \
-   $(toolkit_src_dir)/factory/localized-control-factory-impl.cpp \
-   $(toolkit_src_dir)/filters/blur-two-pass-filter.cpp \
-   $(toolkit_src_dir)/filters/emboss-filter.cpp \
-   $(toolkit_src_dir)/filters/image-filter.cpp \
-   $(toolkit_src_dir)/filters/spread-filter.cpp \
-   $(toolkit_src_dir)/focus-manager/focus-manager-impl.cpp \
-   $(toolkit_src_dir)/focus-manager/keyboard-focus-manager-impl.cpp \
-   $(toolkit_src_dir)/focus-manager/keyinput-focus-manager-impl.cpp \
-   $(toolkit_src_dir)/shader-effects/water-effect-impl.cpp \
-   $(toolkit_src_dir)/shader-effects/page-turn-effect-impl.cpp \
-   $(toolkit_src_dir)/transition-effects/cube-transition-effect-impl.cpp \
-   $(toolkit_src_dir)/transition-effects/cube-transition-wave-effect-impl.cpp \
-   $(toolkit_src_dir)/transition-effects/cube-transition-cross-effect-impl.cpp \
-   $(toolkit_src_dir)/transition-effects/cube-transition-fold-effect-impl.cpp \
-   $(toolkit_src_dir)/controls/magnifier/magnifier-impl.cpp

diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list
deleted file mode 100755 (executable)
index 638fdf2..0000000
--- a/dali-toolkit/public-api/file.list
+++ /dev/null
@@ -1,238 +0,0 @@
-# Add local source files here
-
-public_api_src_files = \
-  $(public_api_src_dir)/enums.cpp \
-  $(public_api_src_dir)/controls/control.cpp \
-  $(public_api_src_dir)/controls/control-impl.cpp \
-  $(public_api_src_dir)/controls/alignment/alignment.cpp \
-  $(public_api_src_dir)/controls/bloom-view/bloom-view.cpp \
-  $(public_api_src_dir)/controls/buttons/button.cpp \
-  $(public_api_src_dir)/controls/buttons/check-box-button.cpp \
-  $(public_api_src_dir)/controls/buttons/push-button.cpp \
-  $(public_api_src_dir)/controls/cluster/cluster.cpp \
-  $(public_api_src_dir)/controls/cluster/cluster-style.cpp \
-  $(public_api_src_dir)/controls/default-controls/solid-color-actor.cpp \
-  $(public_api_src_dir)/controls/default-controls/check-button-factory.cpp \
-  $(public_api_src_dir)/controls/default-controls/push-button-factory.cpp \
-  $(public_api_src_dir)/controls/effects-view/effects-view.cpp \
-  $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \
-  $(public_api_src_dir)/controls/image-view/image-view.cpp \
-  $(public_api_src_dir)/controls/image-view/masked-image-view.cpp \
-  $(public_api_src_dir)/controls/magnifier/magnifier.cpp \
-  $(public_api_src_dir)/controls/page-turn-view/page-turn-view.cpp \
-  $(public_api_src_dir)/controls/page-turn-view/page-factory.cpp \
-  $(public_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.cpp \
-  $(public_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.cpp \
-  $(public_api_src_dir)/controls/popup/popup.cpp \
-  $(public_api_src_dir)/controls/scroll-bar/scroll-bar.cpp \
-  $(public_api_src_dir)/controls/scrollable/item-view/item-factory.cpp \
-  $(public_api_src_dir)/controls/scrollable/item-view/item-layout.cpp \
-  $(public_api_src_dir)/controls/scrollable/item-view/item-view.cpp \
-  $(public_api_src_dir)/controls/scrollable/item-view/depth-layout.cpp \
-  $(public_api_src_dir)/controls/scrollable/item-view/grid-layout.cpp \
-  $(public_api_src_dir)/controls/scrollable/item-view/navigation-layout.cpp \
-  $(public_api_src_dir)/controls/scrollable/item-view/roll-layout.cpp \
-  $(public_api_src_dir)/controls/scrollable/item-view/spiral-layout.cpp \
-  $(public_api_src_dir)/controls/scrollable/item-view/album-layout.cpp \
-  $(public_api_src_dir)/controls/scrollable/scrollable.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-connector.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-component-impl.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-component.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-custom-effect.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-slide-effect.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-twist-effect.cpp \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp \
-  $(public_api_src_dir)/controls/selectors/rotating-selector.cpp \
-  $(public_api_src_dir)/controls/shadow-view/shadow-view.cpp \
-  $(public_api_src_dir)/controls/slider/slider.cpp \
-  $(public_api_src_dir)/controls/super-blur-view/super-blur-view.cpp \
-  $(public_api_src_dir)/controls/table-view/table-view.cpp \
-  $(public_api_src_dir)/controls/text-input/text-input.cpp \
-  $(public_api_src_dir)/controls/text-view/text-view.cpp \
-  $(public_api_src_dir)/controls/tool-bar/tool-bar.cpp \
-  $(public_api_src_dir)/controls/view/view.cpp \
-  $(public_api_src_dir)/controls/navigation-frame/navigation-control.cpp \
-  $(public_api_src_dir)/controls/navigation-frame/page.cpp \
-  $(public_api_src_dir)/controls/bubble-effect/bubble-emitter.cpp \
-  $(public_api_src_dir)/factory/localized-control-factory.cpp \
-  $(public_api_src_dir)/focus-manager/focus-manager.cpp \
-  $(public_api_src_dir)/focus-manager/keyboard-focus-manager.cpp \
-  $(public_api_src_dir)/focus-manager/keyinput-focus-manager.cpp \
-  $(public_api_src_dir)/markup-processor/markup-processor.cpp \
-  $(public_api_src_dir)/shader-effects/alpha-discard-effect.cpp \
-  $(public_api_src_dir)/shader-effects/bendy-effect.cpp \
-  $(public_api_src_dir)/shader-effects/blind-effect.cpp \
-  $(public_api_src_dir)/shader-effects/carousel-effect.cpp \
-  $(public_api_src_dir)/shader-effects/displacement-effect.cpp \
-  $(public_api_src_dir)/shader-effects/dissolve-effect.cpp \
-  $(public_api_src_dir)/shader-effects/dissolve-local-effect.cpp \
-  $(public_api_src_dir)/shader-effects/distance-field-effect.cpp \
-  $(public_api_src_dir)/shader-effects/image-region-effect.cpp \
-  $(public_api_src_dir)/shader-effects/iris-effect.cpp \
-  $(public_api_src_dir)/shader-effects/mask-effect.cpp \
-  $(public_api_src_dir)/shader-effects/mirror-effect.cpp \
-  $(public_api_src_dir)/shader-effects/motion-blur-effect.cpp \
-  $(public_api_src_dir)/shader-effects/motion-stretch-effect.cpp \
-  $(public_api_src_dir)/shader-effects/nine-patch-mask-effect.cpp \
-  $(public_api_src_dir)/shader-effects/overlay-effect.cpp \
-  $(public_api_src_dir)/shader-effects/page-turn-effect.cpp \
-  $(public_api_src_dir)/shader-effects/page-turn-book-spine-effect.cpp \
-  $(public_api_src_dir)/shader-effects/ripple-effect.cpp \
-  $(public_api_src_dir)/shader-effects/ripple2d-effect.cpp \
-  $(public_api_src_dir)/shader-effects/shear-effect.cpp \
-  $(public_api_src_dir)/shader-effects/soft-button-effect.cpp \
-  $(public_api_src_dir)/shader-effects/spot-effect.cpp \
-  $(public_api_src_dir)/shader-effects/square-dissolve-effect.cpp \
-  $(public_api_src_dir)/shader-effects/swirl-effect.cpp \
-  $(public_api_src_dir)/shader-effects/water-effect.cpp \
-  $(public_api_src_dir)/shader-effects/bubble-effect/bubble-effect.cpp \
-  $(public_api_src_dir)/shader-effects/bubble-effect/color-adjuster.cpp \
-  $(public_api_src_dir)/builder/builder.cpp \
-  $(public_api_src_dir)/builder/json-parser.cpp \
-  $(public_api_src_dir)/builder/tree-node.cpp \
-  $(public_api_src_dir)/transition-effects/cube-transition-effect.cpp \
-  $(public_api_src_dir)/transition-effects/cube-transition-wave-effect.cpp \
-  $(public_api_src_dir)/transition-effects/cube-transition-cross-effect.cpp \
-  $(public_api_src_dir)/transition-effects/cube-transition-fold-effect.cpp
-
-# Add public header files here
-
-public_api_header_files =
-
-public_api_controls_header_files =
-
-public_api_alignment_header_files =
-
-public_api_bloom_view_header_files = \
-  $(public_api_src_dir)/controls/bloom-view/bloom-view.h
-
-public_api_buttons_header_files = \
-  $(public_api_src_dir)/controls/buttons/check-box-button.h
-
-public_api_cluster_header_files = \
-  $(public_api_src_dir)/controls/cluster/cluster.h
-
-public_api_default_controls_header_files = \
-  $(public_api_src_dir)/controls/default-controls/check-button-factory.h
-
-public_api_effects_view_header_files = \
-  $(public_api_src_dir)/controls/effects-view/effects-view.h
-
-public_api_gaussian_blur_view_header_files = \
-  $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.h
-
-public_api_image_view_header_files = \
-  $(public_api_src_dir)/controls/image-view/image-view.h
-
-public_api_item_view_header_files = \
-  $(public_api_src_dir)/controls/scrollable/item-view/depth-layout.h \
-  $(public_api_src_dir)/controls/scrollable/item-view/roll-layout.h \
-  $(public_api_src_dir)/controls/scrollable/item-view/spiral-layout.h \
-  $(public_api_src_dir)/controls/scrollable/item-view/navigation-layout.h \
-  $(public_api_src_dir)/controls/scrollable/item-view/album-layout.h
-
-public_api_magnifier_header_files = \
-  $(public_api_src_dir)/controls/magnifier/magnifier.h
-
-public_api_page_turn_view_header_files = \
-  $(public_api_src_dir)/controls/page-turn-view/page-turn-view.h \
-  $(public_api_src_dir)/controls/page-turn-view/page-factory.h \
-  $(public_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.h \
-  $(public_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.h
-
-public_api_popup_header_files =
-
-public_api_scrollable_header_files = \
-  $(public_api_src_dir)/controls/scrollable/scroll-component-impl.h \
-  $(public_api_src_dir)/controls/scrollable/scroll-component.h
-
-public_api_scroll_bar_header_files = \
-  $(public_api_src_dir)/controls/scroll-bar/scroll-bar.h
-
-public_api_scroll_view_header_files = \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.h \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.h \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.h \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h \
-  $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.h
-
-public_api_slider_header_files = \
-  $(public_api_src_dir)/controls/slider/slider.h
-
-public_api_selectors_header_files = \
-  $(public_api_src_dir)/controls/selectors/rotating-selector.h
-
-public_api_shadow_view_header_files = \
-  $(public_api_src_dir)/controls/shadow-view/shadow-view.h
-
-public_api_super_blur_view_header_files =
-
-public_api_table_view_header_files = \
-  $(public_api_src_dir)/controls/table-view/table-view.h
-
-public_api_text_input_header_files =
-
-public_api_text_view_header_files =
-
-public_api_tool_bar_header_files = \
-  $(public_api_src_dir)/controls/tool-bar/tool-bar.h
-
-public_api_view_header_files = \
-  $(public_api_src_dir)/controls/view/view.h
-
-public_api_navigation_frame_header_files = \
-  $(public_api_src_dir)/controls/navigation-frame/navigation-control.h \
-  $(public_api_src_dir)/controls/navigation-frame/page.h \
-  $(public_api_src_dir)/controls/navigation-frame/navigation-bar-style.h
-
-public_api_factory_header_files =
-
-public_api_focus_manager_header_files = \
-  $(public_api_src_dir)/focus-manager/keyinput-focus-manager.h
-
-public_api_markup_processor_header_files =
-
-public_api_shader_effects_header_files =               \
-  $(public_api_src_dir)/shader-effects/alpha-discard-effect.h \
-  $(public_api_src_dir)/shader-effects/bendy-effect.h \
-  $(public_api_src_dir)/shader-effects/blind-effect.h \
-  $(public_api_src_dir)/shader-effects/carousel-effect.h \
-  $(public_api_src_dir)/shader-effects/displacement-effect.h \
-  $(public_api_src_dir)/shader-effects/dissolve-local-effect.h \
-  $(public_api_src_dir)/shader-effects/distance-field-effect.h \
-  $(public_api_src_dir)/shader-effects/mirror-effect.h \
-  $(public_api_src_dir)/shader-effects/motion-blur-effect.h \
-  $(public_api_src_dir)/shader-effects/motion-stretch-effect.h \
-  $(public_api_src_dir)/shader-effects/overlay-effect.h \
-  $(public_api_src_dir)/shader-effects/shear-effect.h \
-  $(public_api_src_dir)/shader-effects/soft-button-effect.h \
-  $(public_api_src_dir)/shader-effects/spot-effect.h \
-  $(public_api_src_dir)/shader-effects/square-dissolve-effect.h \
-  $(public_api_src_dir)/shader-effects/water-effect.h
-
-public_api_bubble_effect_header_files =  \
-  $(public_api_src_dir)/shader-effects/bubble-effect/bubble-effect.h \
-  $(public_api_src_dir)/shader-effects/bubble-effect/color-adjuster.h
-
-public_api_bubble_emitter_header_files =
-
-public_api_builder_header_files = \
-  $(public_api_src_dir)/builder/builder.h \
-  $(public_api_src_dir)/builder/json-parser.h \
-  $(public_api_src_dir)/builder/tree-node.h
-
-public_api_transition_effects_header_files = \
-  $(public_api_src_dir)/transition-effects/cube-transition-effect.h \
-  $(public_api_src_dir)/transition-effects/cube-transition-wave-effect.h \
-  $(public_api_src_dir)/transition-effects/cube-transition-cross-effect.h \
-  $(public_api_src_dir)/transition-effects/cube-transition-fold-effect.h

diff --git a/dali-toolkit/dali-toolkit.h b/optional/dali-toolkit/dali-toolkit.h
similarity index 100%
rename from dali-toolkit/dali-toolkit.h
rename to optional/dali-toolkit/dali-toolkit.h

diff --git a/dali-toolkit/images/00_popup_bottom_bg.png b/optional/dali-toolkit/images/00_popup_bottom_bg.png
similarity index 100%
rename from dali-toolkit/images/00_popup_bottom_bg.png
rename to optional/dali-toolkit/images/00_popup_bottom_bg.png

diff --git a/dali-toolkit/images/00_popup_bubble_bg.png b/optional/dali-toolkit/images/00_popup_bubble_bg.png
similarity index 100%
rename from dali-toolkit/images/00_popup_bubble_bg.png
rename to optional/dali-toolkit/images/00_popup_bubble_bg.png

diff --git a/dali-toolkit/images/00_popup_bubble_tail_bottom.png b/optional/dali-toolkit/images/00_popup_bubble_tail_bottom.png
similarity index 100%
rename from dali-toolkit/images/00_popup_bubble_tail_bottom.png
rename to optional/dali-toolkit/images/00_popup_bubble_tail_bottom.png

diff --git a/dali-toolkit/images/00_popup_button_pressed.png b/optional/dali-toolkit/images/00_popup_button_pressed.png
similarity index 100%
rename from dali-toolkit/images/00_popup_button_pressed.png
rename to optional/dali-toolkit/images/00_popup_button_pressed.png

diff --git a/optional/dali-toolkit/images/file.list b/optional/dali-toolkit/images/file.list
new file mode 100644 (file)
index 0000000..44104c8
--- /dev/null
+++ b/optional/dali-toolkit/images/file.list
@@ -0,0 +1,4 @@
+# Files to install here
+
+dali_toolkit_optional_image_files =\
+    $(toolkit_optional_images_dir)/*.png

diff --git a/dali-toolkit/images/magnifier-image-frame.png b/optional/dali-toolkit/images/magnifier-image-frame.png
similarity index 100%
rename from dali-toolkit/images/magnifier-image-frame.png
rename to optional/dali-toolkit/images/magnifier-image-frame.png

diff --git a/dali-toolkit/images/magnifier.png b/optional/dali-toolkit/images/magnifier.png
similarity index 100%
rename from dali-toolkit/images/magnifier.png
rename to optional/dali-toolkit/images/magnifier.png

diff --git a/dali-toolkit/images/popup_scroll.png b/optional/dali-toolkit/images/popup_scroll.png
similarity index 100%
rename from dali-toolkit/images/popup_scroll.png
rename to optional/dali-toolkit/images/popup_scroll.png

diff --git a/dali-toolkit/images/popup_tail_down.png b/optional/dali-toolkit/images/popup_tail_down.png
similarity index 100%
rename from dali-toolkit/images/popup_tail_down.png
rename to optional/dali-toolkit/images/popup_tail_down.png

diff --git a/dali-toolkit/images/popup_tail_left.png b/optional/dali-toolkit/images/popup_tail_left.png
similarity index 100%
rename from dali-toolkit/images/popup_tail_left.png
rename to optional/dali-toolkit/images/popup_tail_left.png

diff --git a/dali-toolkit/images/popup_tail_right.png b/optional/dali-toolkit/images/popup_tail_right.png
similarity index 100%
rename from dali-toolkit/images/popup_tail_right.png
rename to optional/dali-toolkit/images/popup_tail_right.png

diff --git a/dali-toolkit/images/popup_tail_up.png b/optional/dali-toolkit/images/popup_tail_up.png
similarity index 100%
rename from dali-toolkit/images/popup_tail_up.png
rename to optional/dali-toolkit/images/popup_tail_up.png

diff --git a/dali-toolkit/images/slider-popup-arrow.png b/optional/dali-toolkit/images/slider-popup-arrow.png
similarity index 100%
rename from dali-toolkit/images/slider-popup-arrow.png
rename to optional/dali-toolkit/images/slider-popup-arrow.png

diff --git a/dali-toolkit/images/slider-popup.png b/optional/dali-toolkit/images/slider-popup.png
similarity index 100%
rename from dali-toolkit/images/slider-popup.png
rename to optional/dali-toolkit/images/slider-popup.png

diff --git a/dali-toolkit/images/slider-skin-handle.png b/optional/dali-toolkit/images/slider-skin-handle.png
similarity index 100%
rename from dali-toolkit/images/slider-skin-handle.png
rename to optional/dali-toolkit/images/slider-skin-handle.png

diff --git a/dali-toolkit/images/slider-skin-progress.png b/optional/dali-toolkit/images/slider-skin-progress.png
similarity index 100%
rename from dali-toolkit/images/slider-skin-progress.png
rename to optional/dali-toolkit/images/slider-skin-progress.png

diff --git a/dali-toolkit/images/slider-skin.png b/optional/dali-toolkit/images/slider-skin.png
similarity index 100%
rename from dali-toolkit/images/slider-skin.png
rename to optional/dali-toolkit/images/slider-skin.png

diff --git a/dali-toolkit/internal/builder/builder-actor.cpp b/optional/dali-toolkit/internal/builder/builder-actor.cpp
similarity index 100%
rename from dali-toolkit/internal/builder/builder-actor.cpp
rename to optional/dali-toolkit/internal/builder/builder-actor.cpp

diff --git a/dali-toolkit/internal/builder/builder-animations.cpp b/optional/dali-toolkit/internal/builder/builder-animations.cpp
similarity index 100%
rename from dali-toolkit/internal/builder/builder-animations.cpp
rename to optional/dali-toolkit/internal/builder/builder-animations.cpp

diff --git a/dali-toolkit/internal/builder/builder-control.cpp b/optional/dali-toolkit/internal/builder/builder-control.cpp
similarity index 100%
rename from dali-toolkit/internal/builder/builder-control.cpp
rename to optional/dali-toolkit/internal/builder/builder-control.cpp

diff --git a/dali-toolkit/internal/builder/builder-declarations.h b/optional/dali-toolkit/internal/builder/builder-declarations.h
similarity index 100%
rename from dali-toolkit/internal/builder/builder-declarations.h
rename to optional/dali-toolkit/internal/builder/builder-declarations.h

diff --git a/dali-toolkit/internal/builder/builder-filesystem.h b/optional/dali-toolkit/internal/builder/builder-filesystem.h
similarity index 100%
rename from dali-toolkit/internal/builder/builder-filesystem.h
rename to optional/dali-toolkit/internal/builder/builder-filesystem.h

diff --git a/dali-toolkit/internal/builder/builder-get-is.inl.h b/optional/dali-toolkit/internal/builder/builder-get-is.inl.h
similarity index 100%
rename from dali-toolkit/internal/builder/builder-get-is.inl.h
rename to optional/dali-toolkit/internal/builder/builder-get-is.inl.h

diff --git a/dali-toolkit/internal/builder/builder-impl.cpp b/optional/dali-toolkit/internal/builder/builder-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/builder/builder-impl.cpp
rename to optional/dali-toolkit/internal/builder/builder-impl.cpp

diff --git a/dali-toolkit/internal/builder/builder-impl.h b/optional/dali-toolkit/internal/builder/builder-impl.h
similarity index 100%
rename from dali-toolkit/internal/builder/builder-impl.h
rename to optional/dali-toolkit/internal/builder/builder-impl.h

diff --git a/dali-toolkit/internal/builder/builder-set-property.cpp b/optional/dali-toolkit/internal/builder/builder-set-property.cpp
similarity index 100%
rename from dali-toolkit/internal/builder/builder-set-property.cpp
rename to optional/dali-toolkit/internal/builder/builder-set-property.cpp

diff --git a/dali-toolkit/internal/builder/builder-signals.cpp b/optional/dali-toolkit/internal/builder/builder-signals.cpp
similarity index 100%
rename from dali-toolkit/internal/builder/builder-signals.cpp
rename to optional/dali-toolkit/internal/builder/builder-signals.cpp

diff --git a/dali-toolkit/internal/builder/json-parser-impl.cpp b/optional/dali-toolkit/internal/builder/json-parser-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/builder/json-parser-impl.cpp
rename to optional/dali-toolkit/internal/builder/json-parser-impl.cpp

diff --git a/dali-toolkit/internal/builder/json-parser-impl.h b/optional/dali-toolkit/internal/builder/json-parser-impl.h
similarity index 100%
rename from dali-toolkit/internal/builder/json-parser-impl.h
rename to optional/dali-toolkit/internal/builder/json-parser-impl.h

diff --git a/dali-toolkit/internal/builder/json-parser-state.cpp b/optional/dali-toolkit/internal/builder/json-parser-state.cpp
similarity index 100%
rename from dali-toolkit/internal/builder/json-parser-state.cpp
rename to optional/dali-toolkit/internal/builder/json-parser-state.cpp

diff --git a/dali-toolkit/internal/builder/json-parser-state.h b/optional/dali-toolkit/internal/builder/json-parser-state.h
similarity index 100%
rename from dali-toolkit/internal/builder/json-parser-state.h
rename to optional/dali-toolkit/internal/builder/json-parser-state.h

diff --git a/dali-toolkit/internal/builder/optional-value.h b/optional/dali-toolkit/internal/builder/optional-value.h
similarity index 100%
rename from dali-toolkit/internal/builder/optional-value.h
rename to optional/dali-toolkit/internal/builder/optional-value.h

diff --git a/dali-toolkit/internal/builder/replacement.cpp b/optional/dali-toolkit/internal/builder/replacement.cpp
similarity index 100%
rename from dali-toolkit/internal/builder/replacement.cpp
rename to optional/dali-toolkit/internal/builder/replacement.cpp

diff --git a/dali-toolkit/internal/builder/replacement.h b/optional/dali-toolkit/internal/builder/replacement.h
similarity index 100%
rename from dali-toolkit/internal/builder/replacement.h
rename to optional/dali-toolkit/internal/builder/replacement.h

diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.cpp b/optional/dali-toolkit/internal/builder/tree-node-manipulator.cpp
similarity index 100%
rename from dali-toolkit/internal/builder/tree-node-manipulator.cpp
rename to optional/dali-toolkit/internal/builder/tree-node-manipulator.cpp

diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.h b/optional/dali-toolkit/internal/builder/tree-node-manipulator.h
similarity index 100%
rename from dali-toolkit/internal/builder/tree-node-manipulator.h
rename to optional/dali-toolkit/internal/builder/tree-node-manipulator.h

diff --git a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp b/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
rename to optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h b/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
rename to optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
rename to optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h b/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
rename to optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h

diff --git a/dali-toolkit/internal/controls/cluster/cluster-impl.cpp b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/cluster/cluster-impl.cpp
rename to optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp

diff --git a/dali-toolkit/internal/controls/cluster/cluster-impl.h b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/cluster/cluster-impl.h
rename to optional/dali-toolkit/internal/controls/cluster/cluster-impl.h

diff --git a/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp b/optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp
rename to optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp

diff --git a/dali-toolkit/internal/controls/cluster/cluster-style-impl.h b/optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/cluster/cluster-style-impl.h
rename to optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.h

diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp b/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
rename to optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h b/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/effects-view/effects-view-impl.h
rename to optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.h

diff --git a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp b/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
rename to optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h b/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h
rename to optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/image-view/image-view-impl.cpp
rename to optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.h b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/image-view/image-view-impl.h
rename to optional/dali-toolkit/internal/controls/image-view/image-view-impl.h

diff --git a/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp
rename to optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
rename to optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h

diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
rename to optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp

diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.h b/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/magnifier/magnifier-impl.h
rename to optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.h

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-bar.cpp b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/navigation-frame/navigation-bar.cpp
rename to optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.cpp

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h
similarity index 100%
rename from dali-toolkit/internal/controls/navigation-frame/navigation-bar.h
rename to optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
rename to optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
rename to optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp
rename to optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h
similarity index 100%
rename from dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h
rename to optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp
rename to optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h
similarity index 100%
rename from dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h
rename to optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h

diff --git a/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp b/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/navigation-frame/page-impl.cpp
rename to optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp

diff --git a/dali-toolkit/internal/controls/navigation-frame/page-impl.h b/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/navigation-frame/page-impl.h
rename to optional/dali-toolkit/internal/controls/navigation-frame/page-impl.h

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp
rename to optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
rename to optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp
rename to optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h
rename to optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
rename to optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
rename to optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h

diff --git a/dali-toolkit/internal/controls/selectors/rotating-selector-impl.cpp b/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/selectors/rotating-selector-impl.cpp
rename to optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.cpp

diff --git a/dali-toolkit/internal/controls/selectors/rotating-selector-impl.h b/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/selectors/rotating-selector-impl.h
rename to optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.h

diff --git a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp b/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
rename to optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h b/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h
rename to optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h

diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/optional/dali-toolkit/internal/controls/slider/slider-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/slider/slider-impl.cpp
rename to optional/dali-toolkit/internal/controls/slider/slider-impl.cpp

diff --git a/dali-toolkit/internal/controls/slider/slider-impl.h b/optional/dali-toolkit/internal/controls/slider/slider-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/slider/slider-impl.h
rename to optional/dali-toolkit/internal/controls/slider/slider-impl.h

diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
rename to optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h b/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
rename to optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h

diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
rename to optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp

diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
rename to optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h

diff --git a/dali-toolkit/internal/controls/view/view-impl.cpp b/optional/dali-toolkit/internal/controls/view/view-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/view/view-impl.cpp
rename to optional/dali-toolkit/internal/controls/view/view-impl.cpp

diff --git a/dali-toolkit/internal/controls/view/view-impl.h b/optional/dali-toolkit/internal/controls/view/view-impl.h
similarity index 100%
rename from dali-toolkit/internal/controls/view/view-impl.h
rename to optional/dali-toolkit/internal/controls/view/view-impl.h

diff --git a/optional/dali-toolkit/internal/file.list b/optional/dali-toolkit/internal/file.list
new file mode 100644 (file)
index 0000000..7e03624
--- /dev/null
+++ b/optional/dali-toolkit/internal/file.list
@@ -0,0 +1,46 @@
+# Add local source files here
+
+toolkit_optional_src_files = \
+   $(toolkit_optional_src_dir)/builder/builder-impl.cpp \
+   $(toolkit_optional_src_dir)/builder/builder-animations.cpp \
+   $(toolkit_optional_src_dir)/builder/builder-set-property.cpp \
+   $(toolkit_optional_src_dir)/builder/builder-signals.cpp \
+   $(toolkit_optional_src_dir)/builder/builder-actor.cpp \
+   $(toolkit_optional_src_dir)/builder/builder-control.cpp \
+   $(toolkit_optional_src_dir)/builder/json-parser-state.cpp \
+   $(toolkit_optional_src_dir)/builder/json-parser-impl.cpp \
+   $(toolkit_optional_src_dir)/builder/tree-node-manipulator.cpp \
+   $(toolkit_optional_src_dir)/builder/replacement.cpp \
+   $(toolkit_optional_src_dir)/controls/bloom-view/bloom-view-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/cluster/cluster-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/cluster/cluster-style-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/effects-view/effects-view-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/image-view/image-view-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/image-view/masked-image-view-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/page-turn-view/page-turn-view-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/page-turn-view/page-turn-portrait-view-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/page-turn-view/page-turn-landscape-view-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/selectors/rotating-selector-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/shadow-view/shadow-view-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/slider/slider-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/super-blur-view/super-blur-view-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/bubble-effect/bubble-emitter-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/tool-bar/tool-bar-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/view/view-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-control-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-bar.cpp \
+   $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-tool-bar.cpp \
+   $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-title-bar.cpp \
+   $(toolkit_optional_src_dir)/controls/navigation-frame/page-impl.cpp \
+   $(toolkit_optional_src_dir)/filters/blur-two-pass-filter.cpp \
+   $(toolkit_optional_src_dir)/filters/emboss-filter.cpp \
+   $(toolkit_optional_src_dir)/filters/image-filter.cpp \
+   $(toolkit_optional_src_dir)/filters/spread-filter.cpp \
+   $(toolkit_optional_src_dir)/shader-effects/water-effect-impl.cpp \
+   $(toolkit_optional_src_dir)/shader-effects/page-turn-effect-impl.cpp \
+   $(toolkit_optional_src_dir)/transition-effects/cube-transition-effect-impl.cpp \
+   $(toolkit_optional_src_dir)/transition-effects/cube-transition-wave-effect-impl.cpp \
+   $(toolkit_optional_src_dir)/transition-effects/cube-transition-cross-effect-impl.cpp \
+   $(toolkit_optional_src_dir)/transition-effects/cube-transition-fold-effect-impl.cpp \
+   $(toolkit_optional_src_dir)/controls/magnifier/magnifier-impl.cpp

diff --git a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp b/optional/dali-toolkit/internal/filters/blur-two-pass-filter.cpp
similarity index 100%
rename from dali-toolkit/internal/filters/blur-two-pass-filter.cpp
rename to optional/dali-toolkit/internal/filters/blur-two-pass-filter.cpp

diff --git a/dali-toolkit/internal/filters/blur-two-pass-filter.h b/optional/dali-toolkit/internal/filters/blur-two-pass-filter.h
similarity index 100%
rename from dali-toolkit/internal/filters/blur-two-pass-filter.h
rename to optional/dali-toolkit/internal/filters/blur-two-pass-filter.h

diff --git a/dali-toolkit/internal/filters/emboss-filter.cpp b/optional/dali-toolkit/internal/filters/emboss-filter.cpp
similarity index 100%
rename from dali-toolkit/internal/filters/emboss-filter.cpp
rename to optional/dali-toolkit/internal/filters/emboss-filter.cpp

diff --git a/dali-toolkit/internal/filters/emboss-filter.h b/optional/dali-toolkit/internal/filters/emboss-filter.h
similarity index 100%
rename from dali-toolkit/internal/filters/emboss-filter.h
rename to optional/dali-toolkit/internal/filters/emboss-filter.h

diff --git a/dali-toolkit/internal/filters/image-filter.cpp b/optional/dali-toolkit/internal/filters/image-filter.cpp
similarity index 100%
rename from dali-toolkit/internal/filters/image-filter.cpp
rename to optional/dali-toolkit/internal/filters/image-filter.cpp

diff --git a/dali-toolkit/internal/filters/image-filter.h b/optional/dali-toolkit/internal/filters/image-filter.h
similarity index 100%
rename from dali-toolkit/internal/filters/image-filter.h
rename to optional/dali-toolkit/internal/filters/image-filter.h

diff --git a/dali-toolkit/internal/filters/spread-filter.cpp b/optional/dali-toolkit/internal/filters/spread-filter.cpp
similarity index 100%
rename from dali-toolkit/internal/filters/spread-filter.cpp
rename to optional/dali-toolkit/internal/filters/spread-filter.cpp

diff --git a/dali-toolkit/internal/filters/spread-filter.h b/optional/dali-toolkit/internal/filters/spread-filter.h
similarity index 100%
rename from dali-toolkit/internal/filters/spread-filter.h
rename to optional/dali-toolkit/internal/filters/spread-filter.h

diff --git a/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp b/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp
rename to optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp

diff --git a/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h b/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/shader-effects/page-turn-effect-impl.h
rename to optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h

diff --git a/dali-toolkit/internal/shader-effects/water-effect-impl.cpp b/optional/dali-toolkit/internal/shader-effects/water-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/shader-effects/water-effect-impl.cpp
rename to optional/dali-toolkit/internal/shader-effects/water-effect-impl.cpp

diff --git a/dali-toolkit/internal/shader-effects/water-effect-impl.h b/optional/dali-toolkit/internal/shader-effects/water-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/shader-effects/water-effect-impl.h
rename to optional/dali-toolkit/internal/shader-effects/water-effect-impl.h

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp b/optional/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp
rename to optional/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h b/optional/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h
rename to optional/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp b/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
rename to optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h b/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
rename to optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp b/optional/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp
rename to optional/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h b/optional/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h
rename to optional/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp b/optional/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp
rename to optional/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h b/optional/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h
similarity index 100%
rename from dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h
rename to optional/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h

diff --git a/dali-toolkit/public-api/builder/builder.cpp b/optional/dali-toolkit/public-api/builder/builder.cpp
similarity index 100%
rename from dali-toolkit/public-api/builder/builder.cpp
rename to optional/dali-toolkit/public-api/builder/builder.cpp

diff --git a/dali-toolkit/public-api/builder/builder.h b/optional/dali-toolkit/public-api/builder/builder.h
similarity index 100%
rename from dali-toolkit/public-api/builder/builder.h
rename to optional/dali-toolkit/public-api/builder/builder.h

diff --git a/dali-toolkit/public-api/builder/json-parser.cpp b/optional/dali-toolkit/public-api/builder/json-parser.cpp
similarity index 100%
rename from dali-toolkit/public-api/builder/json-parser.cpp
rename to optional/dali-toolkit/public-api/builder/json-parser.cpp

diff --git a/dali-toolkit/public-api/builder/json-parser.h b/optional/dali-toolkit/public-api/builder/json-parser.h
similarity index 100%
rename from dali-toolkit/public-api/builder/json-parser.h
rename to optional/dali-toolkit/public-api/builder/json-parser.h

diff --git a/dali-toolkit/public-api/builder/tree-node.cpp b/optional/dali-toolkit/public-api/builder/tree-node.cpp
similarity index 100%
rename from dali-toolkit/public-api/builder/tree-node.cpp
rename to optional/dali-toolkit/public-api/builder/tree-node.cpp

diff --git a/dali-toolkit/public-api/builder/tree-node.h b/optional/dali-toolkit/public-api/builder/tree-node.h
similarity index 100%
rename from dali-toolkit/public-api/builder/tree-node.h
rename to optional/dali-toolkit/public-api/builder/tree-node.h

diff --git a/dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp b/optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp
rename to optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp

diff --git a/dali-toolkit/public-api/controls/bloom-view/bloom-view.h b/optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.h
similarity index 100%
rename from dali-toolkit/public-api/controls/bloom-view/bloom-view.h
rename to optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.h

diff --git a/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp b/optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp
rename to optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp

diff --git a/dali-toolkit/public-api/controls/cluster/cluster-style.cpp b/optional/dali-toolkit/public-api/controls/cluster/cluster-style.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/cluster/cluster-style.cpp
rename to optional/dali-toolkit/public-api/controls/cluster/cluster-style.cpp

diff --git a/dali-toolkit/public-api/controls/cluster/cluster.cpp b/optional/dali-toolkit/public-api/controls/cluster/cluster.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/cluster/cluster.cpp
rename to optional/dali-toolkit/public-api/controls/cluster/cluster.cpp

diff --git a/dali-toolkit/public-api/controls/cluster/cluster.h b/optional/dali-toolkit/public-api/controls/cluster/cluster.h
similarity index 100%
rename from dali-toolkit/public-api/controls/cluster/cluster.h
rename to optional/dali-toolkit/public-api/controls/cluster/cluster.h

diff --git a/dali-toolkit/public-api/controls/effects-view/effects-view.cpp b/optional/dali-toolkit/public-api/controls/effects-view/effects-view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/effects-view/effects-view.cpp
rename to optional/dali-toolkit/public-api/controls/effects-view/effects-view.cpp

diff --git a/dali-toolkit/public-api/controls/effects-view/effects-view.h b/optional/dali-toolkit/public-api/controls/effects-view/effects-view.h
similarity index 100%
rename from dali-toolkit/public-api/controls/effects-view/effects-view.h
rename to optional/dali-toolkit/public-api/controls/effects-view/effects-view.h

diff --git a/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp b/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp
rename to optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp

diff --git a/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h b/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
similarity index 100%
rename from dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
rename to optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h

diff --git a/dali-toolkit/public-api/controls/image-view/image-view.cpp b/optional/dali-toolkit/public-api/controls/image-view/image-view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/image-view/image-view.cpp
rename to optional/dali-toolkit/public-api/controls/image-view/image-view.cpp

diff --git a/dali-toolkit/public-api/controls/image-view/image-view.h b/optional/dali-toolkit/public-api/controls/image-view/image-view.h
similarity index 100%
rename from dali-toolkit/public-api/controls/image-view/image-view.h
rename to optional/dali-toolkit/public-api/controls/image-view/image-view.h

diff --git a/dali-toolkit/public-api/controls/image-view/masked-image-view.cpp b/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/image-view/masked-image-view.cpp
rename to optional/dali-toolkit/public-api/controls/image-view/masked-image-view.cpp

diff --git a/dali-toolkit/public-api/controls/magnifier/magnifier.cpp b/optional/dali-toolkit/public-api/controls/magnifier/magnifier.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/magnifier/magnifier.cpp
rename to optional/dali-toolkit/public-api/controls/magnifier/magnifier.cpp

diff --git a/dali-toolkit/public-api/controls/magnifier/magnifier.h b/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h
similarity index 100%
rename from dali-toolkit/public-api/controls/magnifier/magnifier.h
rename to optional/dali-toolkit/public-api/controls/magnifier/magnifier.h

diff --git a/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h
similarity index 100%
rename from dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h
rename to optional/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h

diff --git a/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp
rename to optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp

diff --git a/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
similarity index 100%
rename from dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
rename to optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h

diff --git a/dali-toolkit/public-api/controls/navigation-frame/page.cpp b/optional/dali-toolkit/public-api/controls/navigation-frame/page.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/navigation-frame/page.cpp
rename to optional/dali-toolkit/public-api/controls/navigation-frame/page.cpp

diff --git a/dali-toolkit/public-api/controls/navigation-frame/page.h b/optional/dali-toolkit/public-api/controls/navigation-frame/page.h
similarity index 100%
rename from dali-toolkit/public-api/controls/navigation-frame/page.h
rename to optional/dali-toolkit/public-api/controls/navigation-frame/page.h

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp b/optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp
rename to optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-factory.h b/optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.h
similarity index 100%
rename from dali-toolkit/public-api/controls/page-turn-view/page-factory.h
rename to optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.h

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp
rename to optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h
similarity index 100%
rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h
rename to optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp
rename to optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
similarity index 100%
rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
rename to optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp
rename to optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
similarity index 100%
rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
rename to optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h

diff --git a/dali-toolkit/public-api/controls/selectors/rotating-selector.cpp b/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/selectors/rotating-selector.cpp
rename to optional/dali-toolkit/public-api/controls/selectors/rotating-selector.cpp

diff --git a/dali-toolkit/public-api/controls/selectors/rotating-selector.h b/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h
similarity index 100%
rename from dali-toolkit/public-api/controls/selectors/rotating-selector.h
rename to optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h

diff --git a/dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp b/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp
rename to optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp

diff --git a/dali-toolkit/public-api/controls/shadow-view/shadow-view.h b/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h
similarity index 100%
rename from dali-toolkit/public-api/controls/shadow-view/shadow-view.h
rename to optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h

diff --git a/dali-toolkit/public-api/controls/slider/slider.cpp b/optional/dali-toolkit/public-api/controls/slider/slider.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/slider/slider.cpp
rename to optional/dali-toolkit/public-api/controls/slider/slider.cpp

diff --git a/dali-toolkit/public-api/controls/slider/slider.h b/optional/dali-toolkit/public-api/controls/slider/slider.h
similarity index 100%
rename from dali-toolkit/public-api/controls/slider/slider.h
rename to optional/dali-toolkit/public-api/controls/slider/slider.h

diff --git a/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp b/optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp
rename to optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp

diff --git a/dali-toolkit/public-api/controls/tool-bar/tool-bar.cpp b/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/tool-bar/tool-bar.cpp
rename to optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.cpp

diff --git a/dali-toolkit/public-api/controls/tool-bar/tool-bar.h b/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
similarity index 100%
rename from dali-toolkit/public-api/controls/tool-bar/tool-bar.h
rename to optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h

diff --git a/dali-toolkit/public-api/controls/view/view.cpp b/optional/dali-toolkit/public-api/controls/view/view.cpp
similarity index 100%
rename from dali-toolkit/public-api/controls/view/view.cpp
rename to optional/dali-toolkit/public-api/controls/view/view.cpp

diff --git a/dali-toolkit/public-api/controls/view/view.h b/optional/dali-toolkit/public-api/controls/view/view.h
similarity index 100%
rename from dali-toolkit/public-api/controls/view/view.h
rename to optional/dali-toolkit/public-api/controls/view/view.h

diff --git a/optional/dali-toolkit/public-api/file.list b/optional/dali-toolkit/public-api/file.list
new file mode 100755 (executable)
index 0000000..a97558c
--- /dev/null
+++ b/optional/dali-toolkit/public-api/file.list
@@ -0,0 +1,147 @@
+# Add local source files here
+
+public_api_optional_src_files = \
+  $(public_api_optional_src_dir)/controls/bloom-view/bloom-view.cpp \
+  $(public_api_optional_src_dir)/controls/cluster/cluster.cpp \
+  $(public_api_optional_src_dir)/controls/cluster/cluster-style.cpp \
+  $(public_api_optional_src_dir)/controls/effects-view/effects-view.cpp \
+  $(public_api_optional_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \
+  $(public_api_optional_src_dir)/controls/image-view/image-view.cpp \
+  $(public_api_optional_src_dir)/controls/image-view/masked-image-view.cpp \
+  $(public_api_optional_src_dir)/controls/magnifier/magnifier.cpp \
+  $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-view.cpp \
+  $(public_api_optional_src_dir)/controls/page-turn-view/page-factory.cpp \
+  $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-portrait-view.cpp \
+  $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-landscape-view.cpp \
+  $(public_api_optional_src_dir)/controls/selectors/rotating-selector.cpp \
+  $(public_api_optional_src_dir)/controls/shadow-view/shadow-view.cpp \
+  $(public_api_optional_src_dir)/controls/slider/slider.cpp \
+  $(public_api_optional_src_dir)/controls/super-blur-view/super-blur-view.cpp \
+  $(public_api_optional_src_dir)/controls/tool-bar/tool-bar.cpp \
+  $(public_api_optional_src_dir)/controls/view/view.cpp \
+  $(public_api_optional_src_dir)/controls/navigation-frame/navigation-control.cpp \
+  $(public_api_optional_src_dir)/controls/navigation-frame/page.cpp \
+  $(public_api_optional_src_dir)/controls/bubble-effect/bubble-emitter.cpp \
+  $(public_api_optional_src_dir)/shader-effects/alpha-discard-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/bendy-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/blind-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/carousel-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/displacement-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/dissolve-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/dissolve-local-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/distance-field-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/iris-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/mask-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/mirror-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/motion-blur-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/motion-stretch-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/nine-patch-mask-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/overlay-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/page-turn-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/page-turn-book-spine-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/ripple-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/ripple2d-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/shear-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/soft-button-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/spot-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/square-dissolve-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/swirl-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/water-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/bubble-effect/bubble-effect.cpp \
+  $(public_api_optional_src_dir)/shader-effects/bubble-effect/color-adjuster.cpp \
+  $(public_api_optional_src_dir)/builder/builder.cpp \
+  $(public_api_optional_src_dir)/builder/json-parser.cpp \
+  $(public_api_optional_src_dir)/builder/tree-node.cpp \
+  $(public_api_optional_src_dir)/transition-effects/cube-transition-effect.cpp \
+  $(public_api_optional_src_dir)/transition-effects/cube-transition-wave-effect.cpp \
+  $(public_api_optional_src_dir)/transition-effects/cube-transition-cross-effect.cpp \
+  $(public_api_optional_src_dir)/transition-effects/cube-transition-fold-effect.cpp
+
+# Add public header files here
+
+public_api_optional_header_files =
+
+public_api_optional_controls_header_files =
+
+public_api_optional_bloom_view_header_files = \
+  $(public_api_optional_src_dir)/controls/bloom-view/bloom-view.h
+
+public_api_optional_cluster_header_files = \
+  $(public_api_optional_src_dir)/controls/cluster/cluster.h
+
+public_api_optional_effects_view_header_files = \
+  $(public_api_optional_src_dir)/controls/effects-view/effects-view.h
+
+public_api_optional_gaussian_blur_view_header_files = \
+  $(public_api_optional_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.h
+
+public_api_optional_image_view_header_files = \
+  $(public_api_optional_src_dir)/controls/image-view/image-view.h
+
+public_api_optional_magnifier_header_files = \
+  $(public_api_optional_src_dir)/controls/magnifier/magnifier.h
+
+public_api_optional_page_turn_view_header_files = \
+  $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-view.h \
+  $(public_api_optional_src_dir)/controls/page-turn-view/page-factory.h \
+  $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-portrait-view.h \
+  $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-landscape-view.h
+
+public_api_optional_slider_header_files = \
+  $(public_api_optional_src_dir)/controls/slider/slider.h
+
+public_api_optional_selectors_header_files = \
+  $(public_api_optional_src_dir)/controls/selectors/rotating-selector.h
+
+public_api_optional_shadow_view_header_files = \
+  $(public_api_optional_src_dir)/controls/shadow-view/shadow-view.h
+
+public_api_optional_super_blur_view_header_files =
+
+public_api_optional_tool_bar_header_files = \
+  $(public_api_optional_src_dir)/controls/tool-bar/tool-bar.h
+
+public_api_optional_view_header_files = \
+  $(public_api_optional_src_dir)/controls/view/view.h
+
+public_api_optional_navigation_frame_header_files = \
+  $(public_api_optional_src_dir)/controls/navigation-frame/navigation-control.h \
+  $(public_api_optional_src_dir)/controls/navigation-frame/page.h \
+  $(public_api_optional_src_dir)/controls/navigation-frame/navigation-bar-style.h
+
+public_api_optional_markup_processor_header_files =
+
+public_api_optional_shader_effects_header_files =               \
+  $(public_api_optional_src_dir)/shader-effects/alpha-discard-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/bendy-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/blind-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/carousel-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/displacement-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/dissolve-local-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/distance-field-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/mirror-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/motion-blur-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/motion-stretch-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/overlay-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/shear-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/soft-button-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/spot-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/square-dissolve-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/water-effect.h
+
+public_api_optional_bubble_effect_header_files =  \
+  $(public_api_optional_src_dir)/shader-effects/bubble-effect/bubble-effect.h \
+  $(public_api_optional_src_dir)/shader-effects/bubble-effect/color-adjuster.h
+
+public_api_optional_bubble_emitter_header_files =
+
+public_api_optional_builder_header_files = \
+  $(public_api_optional_src_dir)/builder/builder.h \
+  $(public_api_optional_src_dir)/builder/json-parser.h \
+  $(public_api_optional_src_dir)/builder/tree-node.h
+
+public_api_optional_transition_effects_header_files = \
+  $(public_api_optional_src_dir)/transition-effects/cube-transition-effect.h \
+  $(public_api_optional_src_dir)/transition-effects/cube-transition-wave-effect.h \
+  $(public_api_optional_src_dir)/transition-effects/cube-transition-cross-effect.h \
+  $(public_api_optional_src_dir)/transition-effects/cube-transition-fold-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h b/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/alpha-discard-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/bendy-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/bendy-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/bendy-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/bendy-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/bendy-effect.h b/optional/dali-toolkit/public-api/shader-effects/bendy-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/bendy-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/bendy-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/blind-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/blind-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/blind-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/blind-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/blind-effect.h b/optional/dali-toolkit/public-api/shader-effects/blind-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/blind-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/blind-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp
rename to optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp

diff --git a/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h
rename to optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h

diff --git a/dali-toolkit/public-api/shader-effects/carousel-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/carousel-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/carousel-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/carousel-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/carousel-effect.h b/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/carousel-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/carousel-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/displacement-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/displacement-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/displacement-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/displacement-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/displacement-effect.h b/optional/dali-toolkit/public-api/shader-effects/displacement-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/displacement-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/displacement-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/dissolve-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/dissolve-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/dissolve-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/dissolve-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h b/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/dissolve-local-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/distance-field-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/distance-field-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/distance-field-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/distance-field-effect.h b/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/distance-field-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/iris-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/iris-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/iris-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/iris-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/mask-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/mask-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/mask-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/mask-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/mirror-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/mirror-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/mirror-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/mirror-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/mirror-effect.h b/optional/dali-toolkit/public-api/shader-effects/mirror-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/mirror-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/mirror-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/motion-blur-effect.h b/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/motion-blur-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h b/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/motion-stretch-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/overlay-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/overlay-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/overlay-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/overlay-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/overlay-effect.h b/optional/dali-toolkit/public-api/shader-effects/overlay-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/overlay-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/overlay-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/page-turn-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/page-turn-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/page-turn-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/page-turn-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/ripple-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/ripple-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/ripple-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/ripple-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/shear-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/shear-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/shear-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/shear-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/shear-effect.h b/optional/dali-toolkit/public-api/shader-effects/shear-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/shear-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/shear-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/soft-button-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/soft-button-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/soft-button-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/soft-button-effect.h b/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/soft-button-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/spot-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/spot-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/spot-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/spot-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/spot-effect.h b/optional/dali-toolkit/public-api/shader-effects/spot-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/spot-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/spot-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h b/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/square-dissolve-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h

diff --git a/dali-toolkit/public-api/shader-effects/swirl-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/swirl-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/swirl-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/swirl-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/water-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/water-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/water-effect.cpp
rename to optional/dali-toolkit/public-api/shader-effects/water-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/water-effect.h b/optional/dali-toolkit/public-api/shader-effects/water-effect.h
similarity index 100%
rename from dali-toolkit/public-api/shader-effects/water-effect.h
rename to optional/dali-toolkit/public-api/shader-effects/water-effect.h

diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.cpp b/optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.cpp
rename to optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.cpp

diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h b/optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h
similarity index 100%
rename from dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h
rename to optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h

diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp b/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp
rename to optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp

diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-effect.h b/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h
similarity index 100%
rename from dali-toolkit/public-api/transition-effects/cube-transition-effect.h
rename to optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h

diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.cpp b/optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.cpp
rename to optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.cpp

diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h b/optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h
similarity index 100%
rename from dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h
rename to optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h

diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.cpp b/optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.cpp
similarity index 100%
rename from dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.cpp
rename to optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.cpp

diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h b/optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h
similarity index 100%
rename from dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h
rename to optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 4a3867a..d20b147 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -39,6 +39,16 @@ Requires:   boost-devel
 Application development package for the OpenGLES Canvas toolkit
 
 ##############################
 Application development package for the OpenGLES Canvas toolkit
 
 ##############################

+# Dali Base library
+##############################
+%package dali-toolkit-base
+Summary:    A library for Base Toolkit components, intended for lightweight applications
+Group:      Development/Libs
+
+%description dali-toolkit-base
+A library for Base Toolkit components, intended for lightweight applications
+
+##############################

 # Preparation
 ##############################
 %prep
 # Preparation
 ##############################
 %prep


@@ -109,3 +119,7 @@ exit 0
 %defattr(-,root,root,-)
 %{dev_include_path}/%{name}/*
 %{_libdir}/pkgconfig/*.pc
 %defattr(-,root,root,-)
 %{dev_include_path}/%{name}/*
 %{_libdir}/pkgconfig/*.pc

+
+%files dali-toolkit-base
+%defattr(-,root,root,-)
+%{_libdir}/libdali-toolkit-base.so*