From 45a00c44d1dd893474819e88a7d7eed1c7947c4d Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Sun, 8 Jan 2017 15:34:50 +0100 Subject: Multiple Autotools improvements - Defines some dependencies between shared libraries - updates version.h only when version changes Updating version.h on each "make" and "make install" was causing issues with parallel builds. "make install" was re-linking vpp binary due to "updated" version.h and in parallel it was re-linking shared libraries as part of installation process. That was resulting on sporadic build failures. Change-Id: I2a27ae1aea6a7a4100822018e095a60dd48d39ca Signed-off-by: Damjan Marion --- src/vlib-api.am | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/vlib-api.am') diff --git a/src/vlib-api.am b/src/vlib-api.am index 80eb760d108..128cc07a1d5 100644 --- a/src/vlib-api.am +++ b/src/vlib-api.am @@ -14,6 +14,8 @@ lib_LTLIBRARIES += libvlibapi.la libvlibmemory.la libvlibmemoryclient.la \ libvlibsocket.la +libvlibapi_la_LIBADD = libvppinfra.la +libvlibapi_la_DEPENDENCIES = libvppinfra.la libvlib.la libvlibapi_la_SOURCES = \ vlibapi/api.h \ vlibapi/api_helper_macros.h \ @@ -22,6 +24,8 @@ libvlibapi_la_SOURCES = \ nobase_include_HEADERS += vlibapi/api.h vlibapi/api_helper_macros.h +libvlibmemory_la_LIBADD = libvppinfra.la libsvm.la -lpthread +libvlibmemory_la_DEPENDENCIES = libvppinfra.la libsvm.la libvlib.la libvlibmemory_la_SOURCES = \ vlibmemory/api.h \ vlibmemory/memclnt.api \ @@ -32,6 +36,8 @@ libvlibmemory_la_SOURCES = \ vlibmemory/unix_shared_memory_queue.c \ vlibmemory/unix_shared_memory_queue.h +libvlibmemoryclient_la_LIBADD = libvppinfra.la libsvm.la -lpthread +libvlibmemoryclient_la_DEPENDENCIES = libvppinfra.la libsvm.la libvlib.la libvlibmemoryclient_la_SOURCES = \ vlibmemory/api.h \ vlibmemory/memclnt.api \ @@ -49,6 +55,8 @@ nobase_include_HEADERS += \ vlibmemory/unix_shared_memory_queue.h \ vlibmemory/memclnt.api.h +libvlibsocket_la_LIBADD = libvppinfra.la +libvlibsocket_la_DEPENDENCIES = libvppinfra.la libvlibsocket_la_SOURCES = \ vlibsocket/api.h \ vlibsocket/sockclnt.api \ -- cgit 1.2.3-korg