On 12/06/16 23:37, Mike Holmes wrote: > On 6 December 2016 at 12:08, Nicolas Morey-Chaisemartin > <nmo...@kalray.eu> wrote: >> Signed-off-by: Nicolas Morey-Chaisemartin <nmo...@kalray.eu> >> --- >> helper/Makefile.am | 6 +++--- >> helper/test/Makefile.am | 6 +++--- >> 2 files changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/helper/Makefile.am b/helper/Makefile.am >> index d09d900..c75db00 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.pc >> +pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper@ODP_LIB_FLAVOR@.pc > > Why would the helpers be tied to the implementation being built ? They > should be agnostic and depend on the OS > I think the helpers are broken or we need an alternative to linux.c in > there, perhaps a odp/helpers/platform/linux/linux.c and > odp/helpers/platform/mpaa/linux.c >
Nicolas, do you have modification in helpers? We checked that linux-generic and odp-dpdk platform have the same source code for helpers. And we are doing efforts to make it the same. Maxim. >> >> LIB = $(top_builddir)/lib >> AM_CFLAGS = -I$(srcdir)/include >> @@ -31,7 +31,7 @@ noinst_HEADERS = \ >> $(srcdir)/odph_lineartable.h \ >> $(srcdir)/odph_list_internal.h >> >> -__LIB__libodphelper_linux_la_SOURCES = \ >> +__LIB__libodphelper@ODP_LIB_FLAVOR@_la_SOURCES = \ >> eth.c \ >> ip.c \ >> chksum.c \ >> @@ -39,4 +39,4 @@ __LIB__libodphelper_linux_la_SOURCES = \ >> hashtable.c \ >> lineartable.c >> >> -lib_LTLIBRARIES = $(LIB)/libodphelper-linux.la >> +lib_LTLIBRARIES = $(LIB)/libodphelper@ODP_LIB_FLAVOR@.la >> diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am >> index 545db73..02c260c 100644 >> --- a/helper/test/Makefile.am >> +++ b/helper/test/Makefile.am >> @@ -28,10 +28,10 @@ EXTRA_DIST = odpthreads_as_processes >> odpthreads_as_pthreads >> >> dist_chksum_SOURCES = chksum.c >> dist_odpthreads_SOURCES = odpthreads.c >> -odpthreads_LDADD = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la >> +odpthreads_LDADD = $(LIB)/libodphelper@ODP_LIB_FLAVOR@.la >> $(LIB)/libodp@ODP_LIB_FLAVOR@.la >> dist_thread_SOURCES = thread.c >> -thread_LDADD = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la >> +thread_LDADD = $(LIB)/libodphelper@ODP_LIB_FLAVOR@.la >> $(LIB)/libodp@ODP_LIB_FLAVOR@.la >> dist_process_SOURCES = process.c >> dist_parse_SOURCES = parse.c >> -process_LDADD = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la >> +process_LDADD = $(LIB)/libodphelper@ODP_LIB_FLAVOR@.la >> $(LIB)/libodp@ODP_LIB_FLAVOR@.la >> dist_table_SOURCES = table.c >> -- >> 2.10.1.4.g0ffc436 >> >> > > >
