summaryrefslogtreecommitdiffstats
path: root/src/vnet.am
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2017-01-16 14:00:03 +0100
committerFlorin Coras <florin.coras@gmail.com>2017-01-16 17:21:07 +0000
commitc74a86af08ae9cf312c47ad4dad54d70ae3093ed (patch)
tree529d14e0d23260ac5f5696f2ab3f0840e9bdbd5b /src/vnet.am
parent51a7c8b762d4340b64d868e8003bdcdd27effde1 (diff)
Define more dependencies between libs
Change-Id: Ia74699bad15c1c583571944458fc8a5c3ded574b Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vnet.am')
-rw-r--r--src/vnet.am22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/vnet.am b/src/vnet.am
index 47c5eda78d5..76824fdb262 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -14,9 +14,17 @@
lib_LTLIBRARIES += libvnet.la
libvnet_la_SOURCES =
-
-libvnet_la_LIBADD = libvppinfra.la libsvm.la
-libvnet_la_DEPENDENCIES = libvppinfra.la libvlib.la libsvmdb.la libsvm.la libvlibapi.la libvlibmemory.la libvlibmemoryclient.la
+libvnet_la_DEPENDENCIES = \
+ libvppinfra.la \
+ libvlib.la \
+ libsvmdb.la \
+ libsvm.la \
+ libvlibapi.la \
+ libvlibmemory.la \
+ libvlibmemoryclient.la
+
+libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt $(DPDK_LD_ADD)
+libvnet_la_LDFLAGS = $(DPDK_LD_FLAGS)
if WITH_IPV6SR
libvnet_la_LIBADD += -lcrypto
@@ -579,7 +587,7 @@ LDS = \
libsvmdb.la \
libvlibapi.la \
libvlibmemory.la \
- -lpthread -ldl -lrt -lm -lcrypto
+ -lpthread -ldl -lrt -lm
TESTS += test_cp_serdes test_lisp_types
@@ -597,10 +605,8 @@ test_lisp_types_SOURCES = \
test_cp_serdes_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
test_lisp_types_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_cp_serdes_LDFLAGS = $(DPDK_LD_FLAGS)
-test_cp_serdes_LDADD = $(LDS) $(DPDK_LD_ADD)
-test_lisp_types_LDFLAGS = $(DPDK_LD_FLAGS)
-test_lisp_types_LDADD = $(LDS) $(DPDK_LD_ADD)
+test_cp_serdes_LDADD = $(LDS)
+test_lisp_types_LDADD = $(LDS)
endif
########################################