Signed-off-by: Nicolas Morey-Chaisemartin <[email protected]>
---
configure.ac | 2 --
platform/Makefile.inc | 4 ----
platform/linux-generic/Makefile.am | 6 ++++++
platform/linux-generic/m4/configure.m4 | 4 +++-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 091054e..6e14855 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,8 +252,6 @@ AM_CXXFLAGS="-std=c++11"
AC_CONFIG_FILES([Makefile
helper/Makefile
helper/test/Makefile
- pkgconfig/libodp-linux.pc
- pkgconfig/libodphelper-linux.pc
scripts/Makefile
])
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 053bd12..9c5a4d6 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -1,12 +1,8 @@
LIB = $(top_builddir)/lib
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp-linux.pc
-
-.PHONY: pkgconfig/libodp-linux.pc
VPATH = $(srcdir) $(builddir)
-lib_LTLIBRARIES = $(LIB)/libodp-linux.la
AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)'
diff --git a/platform/linux-generic/Makefile.am
b/platform/linux-generic/Makefile.am
index c8fd8cb..dafdfd8 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -4,6 +4,12 @@
include $(top_srcdir)/platform/Makefile.inc
include $(top_srcdir)/platform/@with_platform@/Makefile.inc
+pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp-linux.pc
+
+.PHONY: pkgconfig/libodp-linux.pc
+
+lib_LTLIBRARIES = $(LIB)/libodp-linux.la
+
AM_CFLAGS += -I$(srcdir)/include
AM_CFLAGS += -I$(top_srcdir)/include
diff --git a/platform/linux-generic/m4/configure.m4
b/platform/linux-generic/m4/configure.m4
index acfa68d..c8be275 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -36,6 +36,8 @@ m4_include([platform/linux-generic/m4/odp_dpdk.m4])
m4_include([platform/linux-generic/m4/odp_ipc.m4])
m4_include([platform/linux-generic/m4/odp_schedule.m4])
-AC_CONFIG_FILES([platform/linux-generic/Makefile])
+AC_CONFIG_FILES([platform/linux-generic/Makefile
+ pkgconfig/libodp-linux.pc
+ pkgconfig/libodphelper-linux.pc])
ODP_LIB_NAME=linux
--
2.10.1.4.g0ffc436
