Test commit

Change-Id: I4de9cfadd54e6ed221220631c66ca649747eb970

diff --git a/build/tizen/adaptor-uv/Makefile.am b/build/tizen/adaptor-uv/Makefile.am
index 9de9012..cd6b2be 100755 (executable)
--- a/build/tizen/adaptor-uv/Makefile.am
+++ b/build/tizen/adaptor-uv/Makefile.am
@@ -273,13 +273,8 @@ main_loop_integration_src_files = $(adaptor_common_internal_ecore_src_files)
 input_event_handler_src_files = $(adaptor_ecore_x_event_handler_internal_src_files)
 endif
 
-if ENABLE_CXX03_ABI
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dali-adaptor-uv-cxx03.pc
-else
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dali-adaptor-uv.pc
-endif
 
 
 if ENABLE_CXX03_ABI

diff --git a/build/tizen/adaptor-uv/configure.ac b/build/tizen/adaptor-uv/configure.ac
index 51ee04d..5e268bc 100755 (executable)
--- a/build/tizen/adaptor-uv/configure.ac
+++ b/build/tizen/adaptor-uv/configure.ac
@@ -355,11 +355,7 @@ AC_SUBST(devincludepath)
 
 AC_CONFIG_FILES([Makefile])
 
-if test "x$enable_cxx03_abi" = "xyes"; then
-AC_CONFIG_FILES([dali-adaptor-uv-cxx03.pc])
-else
 AC_CONFIG_FILES([dali-adaptor-uv.pc])
-fi
 
 if test "x$freetype_bitmap_support" = "xyes"; then
 DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DFREETYPE_BITMAP_SUPPORT"

diff --git a/build/tizen/adaptor-uv/dali-adaptor-uv-cxx03.pc.in b/build/tizen/adaptor-uv/dali-adaptor-uv-cxx03.pc.in
deleted file mode 100644 (file)
index f63525f..0000000
--- a/build/tizen/adaptor-uv/dali-adaptor-uv-cxx03.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-apiversion=@DALI_ADAPTOR_VERSION@
-libdir=@libdir@
-includedir=@devincludepath@
-
-Name: dali-adaptor-uv-cxx03
-Description: DALi adaptor using libuv
-Version: ${apiversion}
-Requires: dali-core-cxx03
-Libs: -L${libdir} -ldali-adaptor-uv
-Cflags: -I${includedir}/dali

diff --git a/build/tizen/adaptor-uv/dali-adaptor-uv.pc.in b/build/tizen/adaptor-uv/dali-adaptor-uv.pc.in
index 53367a1..465a9d1 100644 (file)
--- a/build/tizen/adaptor-uv/dali-adaptor-uv.pc.in
+++ b/build/tizen/adaptor-uv/dali-adaptor-uv.pc.in
@@ -8,5 +8,6 @@ Name: dali-adaptor-uv
 Description: DALi adaptor using libuv
 Version: ${apiversion}
 Requires: dali-core
-Libs: -L${libdir} -ldali-adaptor-uv_cxx11
+Requires: dali-core-cxx03
+Libs: -L${libdir} -ldali-adaptor-uv
 Cflags: -I${includedir}/dali

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 1f4b7a2..647db70 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -290,14 +290,8 @@ adaptor_internal_src_files += $(static_libraries_glyphy_src_files)
 DALI_ADAPTOR_CFLAGS += -DENABLE_VECTOR_BASED_TEXT_RENDERING
 endif
 
-if ENABLE_CXX03_ABI
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dali-adaptor-cxx03.pc dali-adaptor-integration-cxx03.pc
-else
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dali-adaptor.pc dali-adaptor-integration.pc
-endif
-
 
 if ENABLE_CXX03_ABI
 

diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac
index 6429b99..a4a40b0 100644 (file)
--- a/build/tizen/adaptor/configure.ac
+++ b/build/tizen/adaptor/configure.ac
@@ -350,11 +350,7 @@ AC_SUBST(devincludepath)
 
 AC_CONFIG_FILES([Makefile])
 
-if test "x$enable_cxx03_abi" = "xyes"; then
-AC_CONFIG_FILES([dali-adaptor-cxx03.pc dali-adaptor-integration-cxx03.pc])
-else
 AC_CONFIG_FILES([dali-adaptor.pc dali-adaptor-integration.pc])
-fi
 
 if test "x$freetype_bitmap_support" = "xyes"; then
 DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DFREETYPE_BITMAP_SUPPORT"

diff --git a/build/tizen/adaptor/dali-adaptor-cxx03.pc.in b/build/tizen/adaptor/dali-adaptor-cxx03.pc.in
deleted file mode 100644 (file)
index f726245..0000000
--- a/build/tizen/adaptor/dali-adaptor-cxx03.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-apiversion=@DALI_ADAPTOR_VERSION@
-libdir=@libdir@
-includedir=@devincludepath@
-
-Name: dali-adaptor-cxx03
-Description: DALi adaptor using ecore
-Version: ${apiversion}
-Requires: dali-core-cxx03
-Libs: -L${libdir} -ldali-adaptor
-Cflags: -I${includedir}/dali

diff --git a/build/tizen/adaptor/dali-adaptor-integration-cxx03.pc.in b/build/tizen/adaptor/dali-adaptor-integration-cxx03.pc.in
deleted file mode 100644 (file)
index db22442..0000000
--- a/build/tizen/adaptor/dali-adaptor-integration-cxx03.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-apiversion=@DALI_ADAPTOR_VERSION@
-libdir=@libdir@
-includedir=@devincludepath@
-
-Name: dali-adaptor-integration-cxx03
-Description: Integration APIs for dali-adaptor
-Version: ${apiversion}
-Requires: dali-adaptor-cxx03
-Libs: -L${libdir}
-Cflags: -I${includedir}/dali/public-api/adaptor-framework/ -I${includedir}/dali/devel-api/adaptor-framework/ -I${includedir}/dali/integration-api/adaptors/

diff --git a/build/tizen/adaptor/dali-adaptor-integration.pc.in b/build/tizen/adaptor/dali-adaptor-integration.pc.in
index 6a861fb..d3595ab 100644 (file)
--- a/build/tizen/adaptor/dali-adaptor-integration.pc.in
+++ b/build/tizen/adaptor/dali-adaptor-integration.pc.in
@@ -8,5 +8,6 @@ Name: dali-adaptor-integration
 Description: Integration APIs for dali-adaptor
 Version: ${apiversion}
 Requires: dali-adaptor
+Requires: dali-adaptor-cxx03
 Libs: -L${libdir}
 Cflags: -I${includedir}/dali/public-api/adaptor-framework/ -I${includedir}/dali/devel-api/adaptor-framework/ -I${includedir}/dali/integration-api/adaptors/

diff --git a/build/tizen/adaptor/dali-adaptor.pc.in b/build/tizen/adaptor/dali-adaptor.pc.in
index b9692a9..2167902 100644 (file)
--- a/build/tizen/adaptor/dali-adaptor.pc.in
+++ b/build/tizen/adaptor/dali-adaptor.pc.in
@@ -8,5 +8,6 @@ Name: dali-adaptor
 Description: DALi adaptor using ecore
 Version: ${apiversion}
 Requires: dali-core
-Libs: -L${libdir} -ldali-adaptor_cxx11
+Requires: dali-core-cxx03
+Libs: -L${libdir} -ldali-adaptor
 Cflags: -I${includedir}/dali

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index ff76188..5c6d9e1 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -321,31 +321,7 @@ Requires:   %{name} = %{version}-%{release}
 Integration development package for the Adaptor - headers for integrating with an adaptor library.
 
 
-##############################
-# devel cxx03
-##############################
-%package devel-cxx03
-Summary:    Development components for the DALi Tizen Adaptor
-Group:      Development/Building
-Requires:   %{name}-cxx03 = %{version}-%{release}
-Requires:   %{name}-integration-devel-cxx03 = %{version}-%{release}
-
-%description devel-cxx03
-Development components for the DALi Tizen Adaptor - public headers and package configs
-
-##############################
-# integration-devel cxx03
-##############################
-%package integration-devel-cxx03
-Summary:    Integration development package for the Adaptor
-Group:      Development/Building
-Requires:   %{name}-cxx03 = %{version}-%{release}
-
-%description integration-devel-cxx03
-Integration development package for the Adaptor - headers for integrating with an adaptor library.
-
-
-##############################
+#############################
 # Dali Feedback Plugin
 ##############################
 
@@ -1264,17 +1240,3 @@ exit 0
 %{_libdir}/libdali-adaptor-uv.so*.ivi
 %endif
 
-
-%files devel-cxx03
-%defattr(-,root,root,-)
-%{dev_include_path}/dali/dali.h
-%{dev_include_path}/dali/public-api/*
-%{dev_include_path}/dali/devel-api/*
-%{dev_include_path}/dali/doc/*
-%{_libdir}/pkgconfig/dali-adaptor-cxx03.pc
-%{_libdir}/pkgconfig/dali-adaptor-uv-cxx03.pc
-
-%files integration-devel-cxx03
-%defattr(-,root,root,-)
-%{dev_include_path}/dali/integration-api/adaptors/*
-%{_libdir}/pkgconfig/dali-adaptor-integration-cxx03.pc