[2/3] helper: pkgconfig: remove linux-generic from helper lib name

Message ID 1487681494-15621-2-git-send-email-petri.savolainen@linaro.org
State New
Headers show
Series
  • [1/3] helper: linux: add common linux helper file
Related show

Commit Message

Petri Savolainen Feb. 21, 2017, 12:51 p.m.
Helper library should be built ABI compatible when it's part of
a distro. There's no need to have implementation specific helper
libs. Those would be needed only if non-ABI compat helper
libraries need to be distributed.

Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org>

---
 configure.ac                               |  2 +-
 helper/Makefile.am                         |  2 +-
 pkgconfig/libodphelper-linux-generic.pc.in | 11 -----------
 pkgconfig/libodphelper.pc.in               | 11 +++++++++++
 4 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 pkgconfig/libodphelper-linux-generic.pc.in
 create mode 100644 pkgconfig/libodphelper.pc.in

-- 
2.8.1

Patch hide | download patch | download mbox

diff --git a/configure.ac b/configure.ac
index d344e6a..9b5c306 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,7 +328,7 @@  AM_CXXFLAGS="-std=c++11"
 
 AC_CONFIG_FILES([Makefile
 		 pkgconfig/libodp-linux.pc
-		 pkgconfig/libodphelper-linux-generic.pc
+		 pkgconfig/libodphelper.pc
 		 ])
 
 AC_SEARCH_LIBS([timer_create],[rt posix4])
diff --git a/helper/Makefile.am b/helper/Makefile.am
index b478dcd..2c5452d 100644
--- a/helper/Makefile.am
+++ b/helper/Makefile.am
@@ -1,7 +1,7 @@ 
 include $(top_srcdir)/platform/@with_platform@/Makefile.inc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper-linux-generic.pc
+pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc
 
 LIB   = $(top_builddir)/lib
 AM_CFLAGS += -I$(srcdir)/include
diff --git a/pkgconfig/libodphelper-linux-generic.pc.in b/pkgconfig/libodphelper-linux-generic.pc.in
deleted file mode 100644
index cab7be2..0000000
--- a/pkgconfig/libodphelper-linux-generic.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@ 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libodphelper-linux-generic
-Description: Helper for the ODP packet processing engine
-Version: @PKGCONFIG_VERSION@
-Libs: -L${libdir} -lodphelper-linux-generic
-Libs.private:
-Cflags: -I${includedir}
diff --git a/pkgconfig/libodphelper.pc.in b/pkgconfig/libodphelper.pc.in
new file mode 100644
index 0000000..b14335e
--- /dev/null
+++ b/pkgconfig/libodphelper.pc.in
@@ -0,0 +1,11 @@ 
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libodphelper
+Description: Helper for the ODP packet processing engine
+Version: @PKGCONFIG_VERSION@
+Libs: -L${libdir} -lodphelper
+Libs.private:
+Cflags: -I${includedir}