Install default-feedback-theme.json files in styles folder

"feedback-style.cpp" can't find default-feedback-theme.json file because json file is not installed to
${PREFIX}/share/dali/toolkit/styles folder.

To fix this, make default-feedback-theme.json be installed to ${PREFIX}/dali/toolkit/styles folder

Change-Id: I1a4944c46187c3710c1b635366bdb119eb45c372
Signed-off-by: minho.sun <minho.sun@samsung.com>

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index b094860..21e03da 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (c) 2014 Samsung Electronics Co., Ltd.
+# Copyright (c) 2016 Samsung Electronics Co., Ltd.

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -110,9 +110,10 @@ fi
 DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDALI_PROFILE_${dali_profile}"
 
 # Style folder
 DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDALI_PROFILE_${dali_profile}"
 
 # Style folder

-STYLE_DIR=../../../dali-toolkit/styles
-STYLE_DIR=$STYLE_DIR/$dali_style
+STYLE_BASE_DIR=../../../dali-toolkit/styles
+STYLE_DIR=$STYLE_BASE_DIR/$dali_style

 
 

+AC_SUBST(STYLE_BASE_DIR)

 AC_SUBST(STYLE_DIR)
 
 # v8 version 4+ requires c++11
 AC_SUBST(STYLE_DIR)
 
 # v8 version 4+ requires c++11

diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am
index 5c6d46c..29519f6 100644 (file)
--- a/build/tizen/dali-toolkit/Makefile.am
+++ b/build/tizen/dali-toolkit/Makefile.am
@@ -23,6 +23,7 @@ public_api_src_dir  = ../../../dali-toolkit/public-api
 devel_api_src_dir   = ../../../dali-toolkit/devel-api
 third_party_src_dir = ../../../dali-toolkit/third-party
 
 devel_api_src_dir   = ../../../dali-toolkit/devel-api
 third_party_src_dir = ../../../dali-toolkit/third-party
 

+toolkit_styles_base_dir = ${STYLE_BASE_DIR}

 toolkit_styles_dir = $(STYLE_DIR)
 toolkit_style_images_dir = $(STYLE_DIR)/images
 
 toolkit_styles_dir = $(STYLE_DIR)
 toolkit_style_images_dir = $(STYLE_DIR)/images
 

diff --git a/dali-toolkit/styles/file.list b/dali-toolkit/styles/file.list
index 6c329e9..5f1bd6c 100644 (file)
--- a/dali-toolkit/styles/file.list
+++ b/dali-toolkit/styles/file.list
@@ -1,6 +1,7 @@
 # Files to install here
 
 dali_toolkit_style_files =\
 # Files to install here
 
 dali_toolkit_style_files =\

+    $(toolkit_styles_base_dir)/*.json \

     $(toolkit_styles_dir)/*.json
 
 dali_toolkit_style_images =\
     $(toolkit_styles_dir)/*.json
 
 dali_toolkit_style_images =\