Remove CXX03 Build

[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 ad081d5..7e4630c 100644 (file)
--- a/build/tizen/dali-core/Makefile.am
+++ b/build/tizen/dali-core/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Samsung Electronics Co., Ltd.
+# Copyright (c) 2019 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.
@@ -34,27 +34,29 @@ include ../../../doc/file.list
 
 # Build the Dali libtool library
 
-lib_LTLIBRARIES = libdali-core.la
+DALI_CORE_LA_SOURCES = $(internal_src_files) \
+                       $(platform_abstraction_src_files) \
+                       $(public_api_src_files) \
+                       $(devel_api_src_files)
 
-libdali_core_la_SOURCES = $(internal_src_files) \
-                          $(platform_abstraction_src_files) \
-                          $(public_api_src_files) \
-                          $(devel_api_src_files)
+DALI_CORE_LA_CXXFLAGS = -DDALI_COMPILATION \
+                        -DDALI_DATA_RW_DIR="\"${daliReadWriteDir}\"" \
+                        -DDALI_DATA_RO_DIR="\"${daliReadOnlyDir}\"" \
+                         $(cxx_flags) \
+                         $(dali_core_includes) \
+                         $(DALI_CFLAGS)
+
+DALI_CORE_LA_LIBADD = $(DALI_LDFLAGS) \
+                      -lpthread
 
 dali_core_includes = \
         -I../../..
 
-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}\"" \
-                           $(cxx_flags) \
-                           $(dali_core_includes) \
-                           $(DALI_CFLAGS)
+lib_LTLIBRARIES = libdali-core-cxx11.la
 
-libdali_core_la_LIBADD = $(DALI_LDFLAGS) \
-                         -lpthread
+libdali_core_cxx11_la_SOURCES = $(DALI_CORE_LA_SOURCES)
+libdali_core_cxx11_la_CXXFLAGS = $(DALI_CORE_LA_CXXFLAGS)
+libdali_core_cxx11_la_LIBADD = $(DALI_CORE_LA_LIBADD)
 
 # Install headers under the correct subdirectories
 platformabstractiondir = $(includedir)/dali/integration-api
@@ -77,6 +79,7 @@ develapirenderingdir = $(develapidir)/rendering
 develapiscriptingdir = $(develapidir)/scripting
 develapisignalsdir = $(develapidir)/signals
 develapithreadingdir = $(develapidir)/threading
+develapiupdatedir = $(develapidir)/update
 
 develapi_HEADERS = $(devel_api_header_files)
 develapiactors_HEADERS = $(devel_api_core_actors_header_files)
@@ -90,6 +93,7 @@ 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)
+develapiupdate_HEADERS = $(devel_api_core_update_header_files)
 
 #public api
 publicapidir = $(devincludepath)/dali/public-api
@@ -130,6 +134,7 @@ linker_test_SOURCES = linker-test.cpp  \
     ../../../automated-tests/src/dali/dali-test-suite-utils/test-application.cpp \
     ../../../automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp \
     ../../../automated-tests/src/dali/dali-test-suite-utils/test-render-controller.cpp \
+    ../../../automated-tests/src/dali/dali-test-suite-utils/test-render-surface.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 \
@@ -141,6 +146,15 @@ linker_test_CXXFLAGS = \
   $(dali_core_includes) \
   $(DALI_CFLAGS)
 
-linker_test_DEPENDENCIES = libdali-core.la
+linker_test_DEPENDENCIES = libdali-core-cxx11.la
 linker_test_LDADD = \
-  libdali-core.la
+  libdali-core-cxx11.la
+
+if ENABLE_RENAME_SO
+#rename
+install: install-am
+       rm -rf $(libdir)/libdali-core-cxx11.so
+       rm -rf $(libdir)/libdali-core.so
+       ln -s $(libdir)/libdali-core-cxx11.so.0.0.* $(libdir)/libdali-core.so
+endif
+