Merge branch 'devel/master' into tizen_4.0

Change-Id: I7c1224356c85e314eda4d21e808668cb53454a04

diff --combined build/tizen/adaptor/Makefile.am
index 496a96f,f1bfe8c..6ade662
--- 1/build/tizen/adaptor/Makefile.am
--- 2/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@@ -266,11 -266,14 +266,14 @@@ DALI_ADAPTOR_CFLAGS += -DENABLE_VECTOR_
  endif
  
  pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = dali-adaptor.pc dali-adaptor-integration.pc
  
- lib_LTLIBRARIES = libdali-adaptor.la
+ if ENABLE_CXX03_ABI
+ pkgconfig_DATA = dali-adaptor-cxx03.pc dali-adaptor-integration-cxx03.pc
+ else
+ pkgconfig_DATA = dali-adaptor.pc dali-adaptor-integration.pc
+ endif
  
- libdali_adaptor_la_SOURCES = \
+ LIBDALI_ADAPTOR_LA_SOURCES = \
                       $(base_adaptor_src_files) \
                       $(main_loop_integration_src_files) \
                       $(tizen_platform_abstraction_src_files) \
@@@ -283,14 -286,14 +286,14 @@@
  
  
  if ENABLE_NETWORK_LOGGING
- libdali_adaptor_la_SOURCES += \
+ LIBDALI_ADAPTOR_LA_SOURCES += \
    $(base_adaptor_networking_src_files)
  endif
  
  libdali_adaptor_la_DEPENDENCIES =
  
  # List include directories with more platform-specific (tizen) before portable root:
- libdali_adaptor_la_includes = \
+ LIBDALI_ADAPTOR_LA_includes = \
                        -I../../.. \
                        -I../../../platform-abstractions/tizen \
                        -I../../../platform-abstractions/tizen/resource-loader \
@@@ -308,39 -311,39 +311,39 @@@
                        -I../../../third-party/image-resampler
  
  if WAYLAND
- libdali_adaptor_la_includes += -I../../../adaptors/integration-api/wayland
+ LIBDALI_ADAPTOR_LA_includes += -I../../../adaptors/integration-api/wayland
  
  if USE_ECORE_WAYLAND
- libdali_adaptor_la_includes += \
+ LIBDALI_ADAPTOR_LA_includes += \
                        -I../../../adaptors/ecore/common \
                        -I../../../adaptors/ecore/wayland
  else
- libdali_adaptor_la_includes += -I../../../adaptors/wayland \
+ LIBDALI_ADAPTOR_LA_includes += -I../../../adaptors/wayland \
                                 -I../../../adaptors/wayland/input/text/imf \
                                 -I../../../adaptors/wayland/clipboard
  endif # USE_ECORE_WAYLADN
  
- libdali_adaptor_la_includes += \
+ LIBDALI_ADAPTOR_LA_includes += \
                        -I../../../adaptors/tizen
  else
- libdali_adaptor_la_includes += \
+ LIBDALI_ADAPTOR_LA_includes += \
                        -I../../../adaptors/ecore/common \
                        -I../../../adaptors/x11 \
                        -I../../../adaptors/integration-api/x11
  endif # WAYLAND
  
  if UBUNTU_PROFILE
- libdali_adaptor_la_includes += \
+ LIBDALI_ADAPTOR_LA_includes += \
                        -I../../../adaptors/ubuntu
  else
- libdali_adaptor_la_includes += \
+ LIBDALI_ADAPTOR_LA_includes += \
                        -I../../../adaptors/tizen
  endif
  
  daliDefaultThemeDir  = ${dataReadWriteDir}/theme/
  daliShaderbinCacheDir = ${dataReadOnlyDir}/core/shaderbin/
  
- libdali_adaptor_la_CXXFLAGS = \
+ LIBDALI_ADAPTOR_LA_CXXFLAGS = \
                        -DDALI_DATA_RW_DIR="\"${daliReadWriteDir}\"" \
                        -DDALI_DATA_RO_DIR="\"${daliReadOnlyDir}\"" \
                        -DDALI_DEFAULT_FONT_CACHE_DIR="\"${daliDefaultFontCacheDir}\"" \
@@@ -355,7 -358,7 +358,7 @@@
                        -DNON_POWER_OF_TWO_TEXTURES \
                        -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \
                        -Werror -Wall -lgcc -Wold-style-cast\
-                       $(libdali_adaptor_la_includes) \
+                       $(LIBDALI_ADAPTOR_LA_includes) \
                        $(DALI_ADAPTOR_CFLAGS) \
                        $(DALICORE_CFLAGS) \
                        $(OPENGLES20_CFLAGS) \
@@@ -376,15 -379,15 +379,15 @@@
  
  # Todo, as soon as common repos are updated on build server remove this.
  if !COMMON_PROFILE
- libdali_adaptor_la_CXXFLAGS += -DWAYLAND_EXTENSIONS_SUPPORTED
+ LIBDALI_ADAPTOR_LA_CXXFLAGS += -DWAYLAND_EXTENSIONS_SUPPORTED
  endif
  
- libdali_adaptor_la_CFLAGS = \
+ LIBDALI_ADAPTOR_LA_CFLAGS = \
                        -Werror -Wall \
                        -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \
                        $(DALI_ADAPTOR_CFLAGS)
  
- libdali_adaptor_la_LIBADD = \
+ LIBDALI_ADAPTOR_LA_LIBADD = \
                        $(DALICORE_LIBS) \
                        $(OPENGLES20_LIBS) \
                        $(FREETYPE_LIBS) \
@@@ -407,122 -410,113 +410,122 @@@
                        -ljpeg
  
  # EVAS used indicator
- libdali_adaptor_la_CXXFLAGS += $(EVAS_CFLAGS) \
+ LIBDALI_ADAPTOR_LA_CXXFLAGS += $(EVAS_CFLAGS) \
                                 $(ECORE_CFLAGS) \
                                 $(ECORE_IPC_CFLAGS) \
                                 $(ELDBUS_CFLAGS)
  
  
- libdali_adaptor_la_LIBADD += $(ECORE_IPC_LIBS) \
+ LIBDALI_ADAPTOR_LA_LIBADD += $(ECORE_IPC_LIBS) \
                               $(ELDBUS_LIBS)
  
  if USE_APPFW
  
- libdali_adaptor_la_CXXFLAGS += $(CAPI_APPFW_APPLICATION_CFLAGS) \
+ LIBDALI_ADAPTOR_LA_CXXFLAGS += $(CAPI_APPFW_APPLICATION_CFLAGS) \
                                 $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS) \
                                 $(CAPI_SYSTEM_INFO_CFLAGS) \
                                 $(TTS_CFLAGS) \
                                 $(SENSOR_CFLAGS)
  
- libdali_adaptor_la_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \
+ LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \
                               $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \
                               $(CAPI_SYSTEM_INFO_LIBS) \
                               $(TTS_LIBS) \
                               $(SENSOR_LIBS)
  if USE_APPFW_EFL_BASE
- libdali_adaptor_la_CXXFLAGS += $(ELEMENTARY_CFLAGS)
+ LIBDALI_ADAPTOR_LA_CXXFLAGS += $(ELEMENTARY_CFLAGS)
  
- libdali_adaptor_la_LIBADD += $(ELEMENTARY_LIBS)
+ LIBDALI_ADAPTOR_LA_LIBADD += $(ELEMENTARY_LIBS)
  
  else
- libdali_adaptor_la_CXXFLAGS += $(CAPI_APPFW_COMMON_CFLAGS) \
+ LIBDALI_ADAPTOR_LA_CXXFLAGS += $(CAPI_APPFW_COMMON_CFLAGS) \
                                 $(CAPI_APPFW_CONTROL_CFLAGS) \
                                 $(ECORE_IMF_CFLAGS) \
                                 $(FRIBIDI_CFLAGS)
  
- libdali_adaptor_la_LIBADD += $(CAPI_APPFW_COMMON_LIBS) \
+ LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_COMMON_LIBS) \
                               $(CAPI_APPFW_CONTROL_LIBS) \
                               $(ECORE_IMF_LIBS) \
                               $(FRIBIDI_LIBS)
  endif
  else
- libdali_adaptor_la_CXXFLAGS += $(ELEMENTARY_CFLAGS)
+ LIBDALI_ADAPTOR_LA_CXXFLAGS += $(ELEMENTARY_CFLAGS)
  
- libdali_adaptor_la_LIBADD += $(ELEMENTARY_LIBS)
+ LIBDALI_ADAPTOR_LA_LIBADD += $(ELEMENTARY_LIBS)
  endif
  
  if WAYLAND
  # This is to avoid having to include wayland-egl.h everywhere
- libdali_adaptor_la_CXXFLAGS += -DWL_EGL_PLATFORM
- libdali_adaptor_la_CXXFLAGS += $(WAYLAND_CFLAGS)
- libdali_adaptor_la_LIBADD += $(WAYLAND_LIBS)
+ LIBDALI_ADAPTOR_LA_CXXFLAGS += -DWL_EGL_PLATFORM
+ LIBDALI_ADAPTOR_LA_CXXFLAGS += $(WAYLAND_CFLAGS)
+ LIBDALI_ADAPTOR_LA_LIBADD += $(WAYLAND_LIBS)
  else
- libdali_adaptor_la_CXXFLAGS += $(X11_CFLAGS)
- libdali_adaptor_la_LIBADD += $(X11_LIBS)
- libdali_adaptor_la_LIBADD += $(ECORE_X_LIBS)
+ LIBDALI_ADAPTOR_LA_CXXFLAGS += $(X11_CFLAGS)
+ LIBDALI_ADAPTOR_LA_LIBADD += $(X11_LIBS)
+ LIBDALI_ADAPTOR_LA_LIBADD += $(ECORE_X_LIBS)
  endif
  
  if COMMON_PROFILE
- libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS)
+ LIBDALI_ADAPTOR_LA_CXXFLAGS += $(HAPTIC_CFLAGS)
  endif
  
  if MOBILE_PROFILE
- libdali_adaptor_la_CXXFLAGS += \
+ LIBDALI_ADAPTOR_LA_CXXFLAGS += \
                        $(DEVICED_CFLAGS) \
                        $(EFL_ASSIST_CFLAGS) \
                        $(NATIVE_BUFFER_CFLAGS) \
                        $(NATIVE_BUFFER_POOL_CFLAGS)
  
- libdali_adaptor_la_LIBADD += \
+ LIBDALI_ADAPTOR_LA_LIBADD += \
                        $(EFL_ASSIST_LIBS) \
                        $(NATIVE_BUFFER_LIBS) \
                        $(NATIVE_BUFFER_POOL_LIBS)
  endif
  
  if WEARABLE_PROFILE
- libdali_adaptor_la_CXXFLAGS += \
+ LIBDALI_ADAPTOR_LA_CXXFLAGS += \
                        $(HAPTIC_CFLAGS) \
                        $(EFL_ASSIST_CFLAGS) \
                        $(SCREENCONNECTORPROVIDER_CFLAGS) \
                        $(APPCORE_WATCH_CFLAGS)
  
- libdali_adaptor_la_LIBADD += \
+ LIBDALI_ADAPTOR_LA_LIBADD += \
                        $(SCREENCONNECTORPROVIDER_LIBS) \
                        $(APPCORE_WATCH_LIBS)
  endif
  
  if TV_PROFILE
- libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS)
- libdali_adaptor_la_LIBADD +=
+ LIBDALI_ADAPTOR_LA_CXXFLAGS += $(HAPTIC_CFLAGS)
+ LIBDALI_ADAPTOR_LA_LIBADD +=
  endif
  
  if IVI_PROFILE
- libdali_adaptor_la_CXXFLAGS += \
+ LIBDALI_ADAPTOR_LA_CXXFLAGS += \
                        $(DEVICED_CFLAGS) \
                        $(EFL_ASSIST_CFLAGS) \
                        $(NATIVE_BUFFER_CFLAGS) \
                        $(NATIVE_BUFFER_POOL_CFLAGS)
  
- libdali_adaptor_la_LIBADD += \
+ LIBDALI_ADAPTOR_LA_LIBADD += \
                        $(EFL_ASSIST_LIBS) \
                        $(NATIVE_BUFFER_LIBS) \
                        $(NATIVE_BUFFER_POOL_LIBS)
  endif
  
  if UBUNTU_PROFILE
- libdali_adaptor_la_LIBADD += -ljpeg
+ LIBDALI_ADAPTOR_LA_LIBADD += -ljpeg
  CFLAGS += -fPIC
  endif
  
 +if !UBUNTU_PROFILE
 +if WAYLAND
 +else
 +# X11
 +libdali_adaptor_la_CXXFLAGS += $(UTILX_CFLAGS)
 +libdali_adaptor_la_LIBADD += $(UTILX_LIBS)
 +endif
 +endif
 +
  tizenadaptorpublicapidir = $(devincludepath)/dali/public-api
  tizenadaptorpublicapi_HEADERS = $(public_api_header_files)
  
@@@ -576,6 -570,30 +579,30 @@@ bin_SCRIPTS = ../../../adaptors/scripts
  packagedoxydir = $(devincludepath)/dali/doc
  packagedoxy_HEADERS = $(package_doxy_files)
  
+ 
+ 
+ if ENABLE_CXX03_ABI
+ 
+ lib_LTLIBRARIES = libdali-adaptor.la
+ 
+ libdali_adaptor_la_SOURCES = $(LIBDALI_ADAPTOR_LA_SOURCES)
+ libdali_adaptor_la_includes = $(LIBDALI_ADAPTOR_LA_INCLUDES)
+ libdali_adaptor_la_CFLAGS = $(LIBDALI_ADAPTOR_LA_CFLAGS)
+ libdali_adaptor_la_CXXFLAGS = $(LIBDALI_ADAPTOR_LA_CXXFLAGS)
+ libdali_adaptor_la_LIBADD = $(LIBDALI_ADAPTOR_LA_LIBADD)
+ 
+ else
+ 
+ lib_LTLIBRARIES = libdali-adaptor-cxx11.la
+ 
+ libdali_adaptor_cxx11_la_SOURCES = $(LIBDALI_ADAPTOR_LA_SOURCES)
+ libdali_adaptor_cxx11_la_includes = $(LIBDALI_ADAPTOR_LA_INCLUDES)
+ libdali_adaptor_cxx11_la_CFLAGS = $(LIBDALI_ADAPTOR_LA_CFLAGS)
+ libdali_adaptor_cxx11_la_CXXFLAGS = $(LIBDALI_ADAPTOR_LA_CXXFLAGS)
+ libdali_adaptor_cxx11_la_LIBADD = $(LIBDALI_ADAPTOR_LA_LIBADD)
+ 
+ endif
+ 
  # linking test
  noinst_PROGRAMS = linker.test
  
@@@ -604,11 -622,36 +631,36 @@@ linker_test_CXXFLAGS += 
    -I../../../adaptors/integration-api/x11
  endif
  
- 
- linker_test_DEPENDENCIES = libdali-adaptor.la
  linker_test_LDADD = \
    $(DALICORE_LIBS) \
    $(VCONF_LIBS) \
-   libdali-adaptor.la \
    $(HARFBUZZ_LIBS) \
    -L${prefix}/lib
+ 
+ if ENABLE_CXX03_ABI
+ 
+ linker_test_LDADD += libdali-adaptor.la
+ linker_test_DEPENDENCIES = libdali-adaptor.la
+ 
+ if ENABLE_RENAME_SO
+ #rename
+ install: install-am
+       rm -rf $(libdir)/libdali-adaptor.so
+       rm -rf $(libdir)/libdali-adaptor-cxx03.so
+       ln -s $(libdir)/libdali-adaptor.so.0.0.* $(libdir)/libdali-adaptor-cxx03.so
+ endif
+ 
+ else
+ 
+ linker_test_LDADD += libdali-adaptor-cxx11.la
+ linker_test_DEPENDENCIES = libdali-adaptor-cxx11.la
+ 
+ if ENABLE_RENAME_SO
+ #rename
+ install: install-am
+       rm -rf $(libdir)/libdali-adaptor-cxx11.so
+       rm -rf $(libdir)/libdali-adaptor.so
+       ln -s $(libdir)/libdali-adaptor-cxx11.so.0.0.* $(libdir)/libdali-adaptor.so
+ endif
+ 
+ endif