Rename library name for cxx11 abi

libnamex_cxx11.so -> libname-cxx11.so

Change-Id: I4ad0be1e41f17476ca1478bae68b8dd137759807

diff --git a/packaging/pepper-dali.spec b/packaging/pepper-dali.spec
index 8974c61442b80a8a6d1ee5058bfbdc0508106c8b..a73b6c3fddcd25dfc792b09a23d82eab02e26901 100644 (file)
--- a/packaging/pepper-dali.spec
+++ b/packaging/pepper-dali.spec
@@ -76,7 +76,7 @@ make %{?_smp_mflags}
 %make_install
 
 pushd %{buildroot}%{_libdir}
-for FILE in libpepper-dali_cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/$FILE"; done
+for FILE in libpepper-dali-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/$FILE"; done
 mv pkgconfig/pepper-dali.pc %{_builddir}/%{name}-%{version}/pepper-dali.pc 
 popd
 
@@ -92,7 +92,7 @@ make %{?_smp_mflags}
 %make_install
 
 pushd %{_builddir}/%{name}-%{version}
-for FILE in libpepper-dali_cxx11.so*; do mv "$FILE" "%{buildroot}%{_libdir}/$FILE"; done
+for FILE in libpepper-dali-cxx11.so*; do mv "$FILE" "%{buildroot}%{_libdir}/$FILE"; done
 mv pepper-dali.pc %{buildroot}%{_libdir}/pkgconfig/pepper-dali.pc 
 popd
 
@@ -101,9 +101,9 @@ popd
 #############################
 pushd  %{buildroot}%{_libdir}
 rm -rf libpepper-dali.so
-rm -rf libpepper-dali_cxx11.so
+rm -rf libpepper-dali-cxx11.so
 ln -s libpepper-dali.so.0.0.* libpepper-dali-cxx03.so
-ln -s libpepper-dali_cxx11.so.0.0.* libpepper-dali.so
+ln -s libpepper-dali-cxx11.so.0.0.* libpepper-dali.so
 popd
 
 
@@ -113,7 +113,7 @@ popd
 %files -n %{name}
 %manifest pepper-dali.manifest
 %defattr(-,root,root,-)
-%{_libdir}/libpepper-dali_cxx11.so.0*
+%{_libdir}/libpepper-dali-cxx11.so.0*
 %{_libdir}/libpepper-dali.so
 
 %files -n %{name}-cxx03

diff --git a/pepper-dali.pc.in b/pepper-dali.pc.in
index d71c974996cea398c4a7870ef71f631cd4fa9f2c..ce92385667edae8ccfa4f146ebb3800549293df0 100644 (file)
--- a/pepper-dali.pc.in
+++ b/pepper-dali.pc.in
@@ -9,5 +9,5 @@ Name: Pepper DALi
 Description: The Pepper DALi Libaray
 Version: @VERSION@
 Requires: dali-toolkit
-Libs: -L${libdir} -lpepper-dali_cxx11
+Libs: -L${libdir} -lpepper-dali
 Cflags: -I${includedir}/pepper-dali

diff --git a/pepper-dali/Makefile.am b/pepper-dali/Makefile.am
index 70fe0a986745cd562ac4d19f99230e2bf9a4876b..efbf9f173e4682523134cf06093e834d770d97e1 100644 (file)
--- a/pepper-dali/Makefile.am
+++ b/pepper-dali/Makefile.am
@@ -29,7 +29,7 @@ libpepper_dali_la_SOURCES = $(src_files)
 
 else
 
-libpepper_dali_cxx11_la_LTLIBRARIES = libpepper-dali_cxx11.la
+libpepper_dali_cxx11_la_LTLIBRARIES = libpepper-dali-cxx11.la
 libpepper_dali_cxx11_ladir = $(libdir)
 libpepper_dali_cxx11_la_LIBADD = @DALI_LIBS@ @WAYLAND_LIBS@ @PEPPER_LIBS@ @WAYLAND_TBM_LIBS@
 libpepper_dali_cxx11_la_LDFLAGS = ${LDFLAGS}