Conversion to Apache 2.0 license

[platform/core/uifw/dali-toolkit.git] / build / slp / dali-toolkit-base / Makefile.am

diff --git a/build/slp/dali-toolkit-base/Makefile.am b/build/slp/dali-toolkit-base/Makefile.am
index 50eaa34..36a76cb 100644 (file)
--- a/build/slp/dali-toolkit-base/Makefile.am
+++ b/build/slp/dali-toolkit-base/Makefile.am
@@ -1,14 +1,14 @@
 #
 # Copyright (c) 2014 Samsung Electronics Co., Ltd.
 #
 #
 # Copyright (c) 2014 Samsung Electronics Co., Ltd.
 #

-# Licensed under the Flora License, Version 1.0 (the License);
+# Licensed under the Apache License, Version 2.0 (the "License");

 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://floralicense.org/license/
+# http://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 #
 # Unless required by applicable law or agreed to in writing, software

-# distributed under the License is distributed on an AS IS BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS,

 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # 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.


@@ -19,11 +19,13 @@
 # Base files
 toolkit_base_images_dir = ../../../base/dali-toolkit/images
 toolkit_base_sounds_dir = ../../../base/dali-toolkit/sounds
 # Base files
 toolkit_base_images_dir = ../../../base/dali-toolkit/images
 toolkit_base_sounds_dir = ../../../base/dali-toolkit/sounds

+toolkit_base_styles_dir = ../../../base/dali-toolkit/styles

 toolkit_base_src_dir    = ../../../base/dali-toolkit/internal
 public_api_base_src_dir = ../../../base/dali-toolkit/public-api
 
 include ../../../base/dali-toolkit/images/file.list
 include ../../../base/dali-toolkit/sounds/file.list
 toolkit_base_src_dir    = ../../../base/dali-toolkit/internal
 public_api_base_src_dir = ../../../base/dali-toolkit/public-api
 
 include ../../../base/dali-toolkit/images/file.list
 include ../../../base/dali-toolkit/sounds/file.list

+include ../../../base/dali-toolkit/styles/file.list

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


@@ -33,6 +35,9 @@ include ../../../base/dali-toolkit/public-api/file.list
 #dalisounddir = ${dataReadOnlyDir}/toolkit/sounds/
 #dalisound_DATA = ${dali_toolkit_base_sound_files}
 
 #dalisounddir = ${dataReadOnlyDir}/toolkit/sounds/
 #dalisound_DATA = ${dali_toolkit_base_sound_files}
 

+#dalistyledir = ${dataReadOnlyDir}/toolkit/styles/
+#dalistyle_DATA = ${dali_toolkit_style_files}
+

 # The Base library
 lib_LTLIBRARIES = libdali-toolkit-base.la
 
 # The Base library
 lib_LTLIBRARIES = libdali-toolkit-base.la
 


@@ -43,8 +48,11 @@ libdali_toolkit_base_la_SOURCES = \
 libdali_toolkit_base_la_DEPENDENCIES =
 
 libdali_toolkit_base_la_CXXFLAGS = -DDALI_COMPILATION \
 libdali_toolkit_base_la_DEPENDENCIES =
 
 libdali_toolkit_base_la_CXXFLAGS = -DDALI_COMPILATION \

+                      -DDALI_TOOLKIT_BASE \

                       -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \
                       -DDALI_SOUND_DIR="\"${dalisounddir}\"" \
                       -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \
                       -DDALI_SOUND_DIR="\"${dalisounddir}\"" \

+                      -DDALI_STYLE_DIR="\"${dalistyledir}\"" \
+                      -DDALI_DATA_READ_ONLY_DIR="\"${dataReadOnlyDir}\"" \

                       -Werror -Wall \
                       -I../../../base \
                       -I../../../capi \
                       -Werror -Wall \
                       -I../../../base \
                       -I../../../capi \