diff options
author | Mike Holmes <mike.holmes@linaro.org> | 2015-07-06 15:13:52 -0400 |
---|---|---|
committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-07-09 14:19:16 +0300 |
commit | 38de6769b9b96b90b8ef6fbbf2049ce03aadd5c6 (patch) | |
tree | ee7ef9b780dc5d3a188509e60d70d6dbccc4e72b /helper | |
parent | 183af08a08473293c4317ff651fe1f75ddd84bde (diff) |
helper: convert to a library
Remove the need to build helper source files into the linux-generic
library by converting helpers to be their own library.
This removes the need for all other platforms to also build in the
helpers which are optional just to run the tests.
Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
Reviewed-by: Christophe Milard <christophe.milard@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'helper')
-rw-r--r-- | helper/Makefile.am | 30 | ||||
-rw-r--r-- | helper/test/Makefile.am | 2 |
2 files changed, 31 insertions, 1 deletions
diff --git a/helper/Makefile.am b/helper/Makefile.am index 02af5b3..44bcc3d 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -1 +1,29 @@ -SUBDIRS = test +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc + +LIB = $(top_builddir)/lib +AM_CFLAGS = -I$(srcdir)/include +AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/include +AM_CFLAGS += -I$(top_srcdir)/platform/linux-generic/include +AM_CFLAGS += -I$(top_srcdir)/include + +include_HEADERS = \ + $(srcdir)/include/odp/helper/ring.h \ + $(srcdir)/include/odp/helper/linux.h \ + $(srcdir)/include/odp/helper/chksum.h\ + $(srcdir)/include/odp/helper/eth.h\ + $(srcdir)/include/odp/helper/icmp.h\ + $(srcdir)/include/odp/helper/ip.h\ + $(srcdir)/include/odp/helper/ipsec.h\ + $(srcdir)/include/odp/helper/tcp.h\ + $(srcdir)/include/odp/helper/udp.h + +noinst_HEADERS = \ + $(srcdir)/odph_debug.h \ + $(srcdir)/odph_pause.h + +__LIB__libodphelper_la_SOURCES = \ + linux.c \ + ring.c + +lib_LTLIBRARIES = $(LIB)/libodphelper.la diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 9ac82eb..aed97cc 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -24,4 +24,6 @@ bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) dist_odp_chksum_SOURCES = odp_chksum.c dist_odp_thread_SOURCES = odp_thread.c +odp_thread_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la dist_odp_process_SOURCES = odp_process.c +odp_process_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la |