Revert "[3.0] Install default-feedback-theme.json files in styles folder"

This reverts commit 21d91e0a6191122957426d1ba09cd9f80374c67e.

Change-Id: I1a39e6c3c7332235d699280afd279d8b1088f2f3

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 21e03daeabf1360b96dff9d2738ebbc93bd6de97..b094860fa97957b5062870a98dff143cba32b44f 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016 Samsung Electronics Co., Ltd.
+# Copyright (c) 2014 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,10 +110,9 @@ fi
 DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDALI_PROFILE_${dali_profile}"
 
 # Style folder
-STYLE_BASE_DIR=../../../dali-toolkit/styles
-STYLE_DIR=$STYLE_BASE_DIR/$dali_style
+STYLE_DIR=../../../dali-toolkit/styles
+STYLE_DIR=$STYLE_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 209ecda3bd0d808468edfc4ebfcdc064a5e4fc87..ab272facdad8bb4a817210d495b6c138576466e5 100644 (file)
--- a/build/tizen/dali-toolkit/Makefile.am
+++ b/build/tizen/dali-toolkit/Makefile.am
@@ -23,7 +23,6 @@ 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 5f1bd6c09ffbc672c8648cd512581223705d8a80..6c329e965f93157afda3c3d7ba3de55f4392841d 100644 (file)
--- a/dali-toolkit/styles/file.list
+++ b/dali-toolkit/styles/file.list
@@ -1,7 +1,6 @@
 # Files to install here
 
 dali_toolkit_style_files =\
-    $(toolkit_styles_base_dir)/*.json \
     $(toolkit_styles_dir)/*.json
 
 dali_toolkit_style_images =\