[v4,13/20] linux-gen: move libodp-linux.pc.in to platform directory

Message ID 1507316415-2144-14-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • Another build system update
Related show

Commit Message

Github ODP bot Oct. 6, 2017, 7 p.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 213 (lumag:plat-def)
 ** https://github.com/Linaro/odp/pull/213
 ** Patch: https://github.com/Linaro/odp/pull/213.patch
 ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68
 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383
 **/
 configure.ac                                             | 1 -
 platform/Makefile.inc                                    | 4 +---
 {pkgconfig => platform/linux-generic}/libodp-linux.pc.in | 0
 platform/linux-generic/m4/configure.m4                   | 1 +
 4 files changed, 2 insertions(+), 4 deletions(-)
 rename {pkgconfig => platform/linux-generic}/libodp-linux.pc.in (100%)

Patch

diff --git a/configure.ac b/configure.ac
index 2b075e917..600f52bc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,7 +353,6 @@  CFLAGS="$CFLAGS $ODP_CFLAGS"
 CXXFLAGS="$CXXFLAGS $ODP_CXXFLAGS"
 
 AC_CONFIG_FILES([Makefile
-		 pkgconfig/libodp-linux.pc
 		 pkgconfig/libodphelper.pc
 		 ])
 
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index f3161abd4..b1eeb361a 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -1,9 +1,7 @@ 
 LIB   = $(top_builddir)/lib
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp-linux.pc
-
-.PHONY: pkgconfig/libodp-linux.pc
+pkgconfig_DATA = libodp-linux.pc
 
 VPATH = $(srcdir) $(builddir)
 lib_LTLIBRARIES = $(LIB)/libodp-linux.la
diff --git a/pkgconfig/libodp-linux.pc.in b/platform/linux-generic/libodp-linux.pc.in
similarity index 100%
rename from pkgconfig/libodp-linux.pc.in
rename to platform/linux-generic/libodp-linux.pc.in
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4
index 1a09102e7..7dc83bf87 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -12,6 +12,7 @@  m4_include([platform/linux-generic/m4/odp_schedule.m4])
 m4_include([platform/linux-generic/m4/performance.m4])
 
 AC_CONFIG_FILES([platform/linux-generic/Makefile
+		 platform/linux-generic/libodp-linux.pc
 		 platform/linux-generic/include/odp/api/plat/static_inline.h
 		 platform/linux-generic/test/Makefile
 		 platform/linux-generic/test/validation/api/shmem/Makefile