From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Tue, 11 Oct 2016 14:54:43 +0000 (-0700)
Subject: Merge "Install default-feedback-theme.json files in styles folder" into devel/master
X-Git-Tag: dali_1.2.10~12
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=bd75dc4cad4ce62cc9206abf19280b40825b9726;hp=41307f75478fd6c6fb5f9ae7e7de5036647f39b3

Merge "Install default-feedback-theme.json files in styles folder" into devel/master
---

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index b094860..21e03da 100644
--- 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.
@@ -110,9 +110,10 @@ fi
 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
diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am
index f31838e..cfb5d18 100644
--- 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
 
+toolkit_styles_base_dir = ${STYLE_BASE_DIR}
 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
--- a/dali-toolkit/styles/file.list
+++ b/dali-toolkit/styles/file.list
@@ -1,6 +1,7 @@
 # Files to install here
 
 dali_toolkit_style_files =\
+    $(toolkit_styles_base_dir)/*.json \
     $(toolkit_styles_dir)/*.json
 
 dali_toolkit_style_images =\