projects / platform / core / uifw / dali-core.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[3.0] Remove/move experimental features
[platform/core/uifw/dali-core.git] / build / tizen / dali-core / Makefile.am
diff --git a/build/tizen/dali-core/Makefile.am b/build/tizen/dali-core/Makefile.am
index 880e60d..58e6afe 100644 (file)
--- a/build/tizen/dali-core/Makefile.am
+++ b/build/tizen/dali-core/Makefile.am
@@ -1,4 +1,4 @@
-# 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.
@@ -17,27 +17,27 @@
 # These files define <module>_src_files & <module>_header_files,
 # where <module> is the subdirectory from core_src_dir
 
-emoticons_dir = /usr/share/emoticons/
-
 internal_src_dir = ../../../dali/internal
 include ../../../dali/internal/file.list
 
 public_api_src_dir = ../../../dali/public-api
 include ../../../dali/public-api/file.list
 
+devel_api_src_dir = ../../../dali/devel-api
+include ../../../dali/devel-api/file.list
+
 platform_abstraction_src_dir = ../../../dali/integration-api
 include ../../../dali/integration-api/file.list
 
+package_doxy_dir = ../../../doc
+include ../../../doc/file.list
+
 # Build the Dali libtool library
 
 src_files = $(internal_src_files) \
-            $(effects_src_files) \
             $(platform_abstraction_src_files) \
-            $(public_api_src_files)
-
-if DYNAMICS_SUPPORT
-src_files += $(internal_dynamics_src_files)
-endif
+            $(public_api_src_files) \
+            $(devel_api_src_files)
 
 lib_LTLIBRARIES = libdali-core.la
 
@@ -58,14 +58,12 @@ dali-shaders.cpp: $(dali_shaders_script) $(dali_shaders_dir)/*.txt
 dali_core_includes = \
         -I../../..
 
-daliGlyphCacheDir = ${dataReadWriteDir}/glyphcache/
+cxx_flags = -Werror -Wall -Wextra -Wno-unused-parameter -Wfloat-equal
 
 libdali_core_la_CXXFLAGS = -DDALI_COMPILATION \
                            -DDALI_DATA_RW_DIR="\"${daliReadWriteDir}\"" \
                            -DDALI_DATA_RO_DIR="\"${daliReadOnlyDir}\"" \
-                           -DDALI_GLYPH_CACHE_DIR="\"${daliGlyphCacheDir}\"" \
-                           -DDALI_EMOTICON_DIR="\"${emoticons_dir}\"" \
-                           -Werror -Wall -Wfloat-equal \
+                           $(cxx_flags) \
                            $(dali_core_includes) \
                            $(DALI_CFLAGS)
 
@@ -75,49 +73,74 @@ libdali_core_la_LIBADD = $(DALI_LDFLAGS) \
 # Install headers under the correct subdirectories
 platformabstractiondir = $(includedir)/dali/integration-api
 platformabstractioneventsdir = $(includedir)/dali/integration-api/events
-platformabstractiondynamicsdir = $(includedir)/dali/integration-api/dynamics
 
 platformabstraction_HEADERS = $(platform_abstraction_header_files)
 platformabstractionevents_HEADERS = $(platform_abstraction_events_header_files)
-platformabstractiondynamics_HEADERS = $(platform_abstraction_dynamics_header_files)
 
+#devel api (used by adaptor / toolkit
+develapidir = $(devincludepath)/dali/devel-api
+develapiactorsdir = $(develapidir)/actors
+develapianimationdir = $(develapidir)/animation
+develapicommondir = $(develapidir)/common
+develapieventsdir = $(develapidir)/events
+develapigeometrydir = $(develapidir)/geometry
+develapiimagesdir = $(develapidir)/images
+develapimodelingdir = $(develapidir)/modeling
+develapiobjectdir = $(develapidir)/object
+develapirenderingdir = $(develapidir)/rendering
+develapiscriptingdir = $(develapidir)/scripting
+develapisignalsdir = $(develapidir)/signals
+develapithreadingdir = $(develapidir)/threading
+develapishadereffectsdir = $(develapidir)/shader-effects
+
+develapi_HEADERS = $(devel_api_header_files)
+develapiactors_HEADERS = $(devel_api_core_actors_header_files)
+develapianimation_HEADERS = $(devel_api_core_animation_header_files)
+develapicommon_HEADERS = $(devel_api_core_common_header_files)
+develapievents_HEADERS = $(devel_api_core_events_header_files)
+develapiimages_HEADERS = $(devel_api_core_images_header_files)
+develapimodeling_HEADERS = $(devel_api_core_modeling_header_files)
+develapiobject_HEADERS = $(devel_api_core_object_header_files)
+develapirendering_HEADERS = $(devel_api_core_rendering_header_files)
+develapiscripting_HEADERS = $(devel_api_core_scripting_header_files)
+develapisignals_HEADERS = $(devel_api_core_signals_header_files)
+develapithreading_HEADERS = $(devel_api_core_threading_header_files)
+develapishadereffects_HEADERS = $(devel_api_core_shader_effects_header_files)
+
+#public api
 publicapidir = $(devincludepath)/dali/public-api
 publicapiactorsdir = $(publicapidir)/actors
 publicapianimationdir = $(publicapidir)/animation
 publicapicommondir = $(publicapidir)/common
-publicapidynamicsdir = $(publicapidir)/dynamics
 publicapieventsdir = $(publicapidir)/events
-publicapigeometrydir = $(publicapidir)/geometry
 publicapiimagesdir = $(publicapidir)/images
 publicapimathdir = $(publicapidir)/math
-publicapimodelingdir = $(publicapidir)/modeling
 publicapiobjectdir = $(publicapidir)/object
+publicapirenderingdir = $(publicapidir)/rendering
 publicapirendertasksdir = $(publicapidir)/render-tasks
-publicapishadereffectsdir = $(publicapidir)/shader-effects
 publicapisignalsdir = $(publicapidir)/signals
-publicapitextdir = $(publicapidir)/text
-publicapiscriptingdir = $(publicapidir)/scripting
+publicapisizenegotiationdir = $(publicapidir)/size-negotiation
 
 publicapi_HEADERS = $(public_api_header_files)
 publicapiactors_HEADERS = $(public_api_core_actors_header_files)
 publicapianimation_HEADERS = $(public_api_core_animation_header_files)
 publicapicommon_HEADERS = $(public_api_core_common_header_files)
-publicapidynamics_HEADERS = $(public_api_core_dynamics_header_files)
 publicapievents_HEADERS = $(public_api_core_events_header_files)
-publicapigeometry_HEADERS = $(public_api_core_geometry_header_files)
 publicapiimages_HEADERS = $(public_api_core_images_header_files)
 publicapimath_HEADERS = $(public_api_core_math_header_files)
-publicapimodeling_HEADERS = $(public_api_core_modeling_header_files)
-publicapirendertasks_HEADERS = $(public_api_core_render_tasks_header_files)
 publicapiobject_HEADERS = $(public_api_core_object_header_files)
-publicapiscripting_HEADERS = $(public_api_core_scripting_header_files)
-publicapishadereffects_HEADERS = $(public_api_core_shader_effects_header_files)
+publicapirendering_HEADERS = $(public_api_core_rendering_header_files)
+publicapirendertasks_HEADERS = $(public_api_core_render_tasks_header_files)
 publicapisignals_HEADERS = $(public_api_core_signals_header_files)
-publicapitext_HEADERS = $(public_api_core_text_header_files)
+publicapisizenegotiation_HEADERS = $(public_api_core_size_negotiation_header_files)
 
 CLEANFILES = dali-shaders.cpp \
              dali-shaders.h
 
+# package doxygen file (contains doxygen grouping information)
+packagedoxydir = $(devincludepath)/dali/doc
+packagedoxy_HEADERS = $(package_doxy_files)
+
 # linking test
 
 noinst_PROGRAMS = linker.test
@@ -129,11 +152,10 @@ linker_test_SOURCES = linker-test.cpp  \
     ../../../automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.cpp \
     ../../../automated-tests/src/dali/dali-test-suite-utils/test-gesture-manager.cpp \
     ../../../automated-tests/src/dali/dali-test-suite-utils/test-gl-sync-abstraction.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-trace-call-stack.cpp \
-    ../../../automated-tests/src/dali/dali-test-suite-utils/test-dynamics.cpp
+    ../../../automated-tests/src/dali/dali-test-suite-utils/test-trace-call-stack.cpp
 
 linker_test_CXXFLAGS = \
-  -Werror -Wall -Wfloat-equal \
+  $(cxx_flags) \
   -I../../../automated-tests/src/dali/dali-test-suite-utils \
   $(dali_core_includes) \
   $(DALI_CFLAGS)
Domain: Graphics System / DALi;