Fix wrong dependencies

I was reported an issue affecting VPP build only with 1 thread (e.g. -j1
option to make). That is quite important from a reproducible build
perspective.
This patch addresses that issue.

Change-Id: Ia8e3b9a9716a260d8b6f1c2d92dd166eddf6716f
Signed-off-by: Marco Varlese <[email protected]>

diff --git a/src/plugins/acl.am b/src/plugins/acl.am
index f73fda6..8122e5e 100644 (file)
--- a/src/plugins/acl.am
+++ b/src/plugins/acl.am
@@ -19,7 +19,7 @@ acl_plugin_la_LDFLAGS += -Wl,-lm,-ldl
 
 
 
-acl_plugin_la_LIBADD =
+acl_plugin_la_DEPENDENCIES =
 
 acl_plugin_la_SOURCES =                                \
        acl/acl.c                               \
@@ -48,7 +48,7 @@ libacl_plugin_avx2_la_CFLAGS =                                 \
         $(AM_CFLAGS)  @CPU_AVX2_FLAGS@                          \
         -DCLIB_MARCH_VARIANT=avx2
 noinst_LTLIBRARIES += libacl_plugin_avx2.la
-acl_plugin_la_LIBADD += libacl_plugin_avx2.la
+acl_plugin_la_DEPENDENCIES += libacl_plugin_avx2.la
 endif
 
 if CC_SUPPORTS_AVX512
@@ -60,7 +60,7 @@ libacl_plugin_avx512_la_CFLAGS =                               \
         $(AM_CFLAGS) @CPU_AVX512_FLAGS@                         \
         -DCLIB_MARCH_VARIANT=avx512
 noinst_LTLIBRARIES += libacl_plugin_avx512.la
-acl_plugin_la_LIBADD += libacl_plugin_avx512.la
+acl_plugin_la_DEPENDENCIES += libacl_plugin_avx512.la
 endif
 endif
 

diff --git a/src/plugins/avf.am b/src/plugins/avf.am
index 3a1ce8e..207c0d3 100644 (file)
--- a/src/plugins/avf.am
+++ b/src/plugins/avf.am
@@ -14,7 +14,7 @@
 vppplugins_LTLIBRARIES += avf_plugin.la
 vppapitestplugins_LTLIBRARIES += avf_test_plugin.la
 
-avf_plugin_la_LIBADD =
+avf_plugin_la_DEPENDENCIES =
 avf_plugin_la_SOURCES = \
        avf/cli.c                       \
        avf/device.c                    \
@@ -51,7 +51,7 @@ libavf_plugin_avx2_la_CFLAGS =                                \
        $(AM_CFLAGS)  @CPU_AVX2_FLAGS@                          \
        -DCLIB_MARCH_VARIANT=avx2
 noinst_LTLIBRARIES += libavf_plugin_avx2.la
-avf_plugin_la_LIBADD += libavf_plugin_avx2.la
+avf_plugin_la_DEPENDENCIES += libavf_plugin_avx2.la
 endif
 
 if CC_SUPPORTS_AVX512
@@ -63,7 +63,7 @@ libavf_plugin_avx512_la_CFLAGS =                              \
        $(AM_CFLAGS) @CPU_AVX512_FLAGS@                         \
        -DCLIB_MARCH_VARIANT=avx512
 noinst_LTLIBRARIES += libavf_plugin_avx512.la
-avf_plugin_la_LIBADD += libavf_plugin_avx512.la
+avf_plugin_la_DEPENDENCIES += libavf_plugin_avx512.la
 endif
 endif
 

diff --git a/src/plugins/dpdk.am b/src/plugins/dpdk.am
index 6c15d0a..524ae87 100644 (file)
--- a/src/plugins/dpdk.am
+++ b/src/plugins/dpdk.am
@@ -31,7 +31,7 @@ dpdk_plugin_la_LDFLAGS += -Wl,-lnuma
 endif
 
 dpdk_plugin_la_LDFLAGS += -Wl,-lm,-ldl
-dpdk_plugin_la_LIBADD =
+dpdk_plugin_la_DEPENDENCIES =
 
 dpdk_plugin_la_SOURCES =                                       \
   dpdk/main.c                                                  \
@@ -71,7 +71,7 @@ libdpdk_plugin_avx2_la_CFLAGS =                                       \
        $(AM_CFLAGS)  @CPU_AVX2_FLAGS@                          \
        -DCLIB_MARCH_VARIANT=avx2
 noinst_LTLIBRARIES += libdpdk_plugin_avx2.la
-dpdk_plugin_la_LIBADD += libdpdk_plugin_avx2.la
+dpdk_plugin_la_DEPENDENCIES += libdpdk_plugin_avx2.la
 endif
 
 if CC_SUPPORTS_AVX512
@@ -83,7 +83,7 @@ libdpdk_plugin_avx512_la_CFLAGS =                             \
        $(AM_CFLAGS) @CPU_AVX512_FLAGS@                         \
        -DCLIB_MARCH_VARIANT=avx512
 noinst_LTLIBRARIES += libdpdk_plugin_avx512.la
-dpdk_plugin_la_LIBADD += libdpdk_plugin_avx512.la
+dpdk_plugin_la_DEPENDENCIES += libdpdk_plugin_avx512.la
 endif
 endif
 

diff --git a/src/plugins/memif.am b/src/plugins/memif.am
index e7deb7d..0d5e5a2 100644 (file)
--- a/src/plugins/memif.am
+++ b/src/plugins/memif.am
@@ -14,7 +14,7 @@
 vppplugins_LTLIBRARIES += memif_plugin.la
 vppapitestplugins_LTLIBRARIES += memif_test_plugin.la
 
-memif_plugin_la_LIBADD =
+memif_plugin_la_DEPENDENCIES =
 memif_plugin_la_SOURCES = memif/memif.c   \
        memif/memif_api.c                 \
        memif/cli.c                       \
@@ -49,7 +49,7 @@ memif_plugin_avx2_la_CFLAGS =                                 \
        $(AM_CFLAGS)  @CPU_AVX2_FLAGS@                          \
        -DCLIB_MARCH_VARIANT=avx2
 noinst_LTLIBRARIES += memif_plugin_avx2.la
-memif_plugin_la_LIBADD += memif_plugin_avx2.la
+memif_plugin_la_DEPENDENCIES += memif_plugin_avx2.la
 endif
 
 if CC_SUPPORTS_AVX512
@@ -61,7 +61,7 @@ memif_plugin_avx512_la_CFLAGS =                                       \
        $(AM_CFLAGS) @CPU_AVX512_FLAGS@                         \
        -DCLIB_MARCH_VARIANT=avx512
 noinst_LTLIBRARIES += memif_plugin_avx512.la
-memif_plugin_la_LIBADD += memif_plugin_avx512.la
+memif_plugin_la_DEPENDENCIES += memif_plugin_avx512.la
 endif
 endif
 

diff --git a/src/vnet.am b/src/vnet.am
index b9ae408..eb93255 100644 (file)
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -1294,7 +1294,7 @@ libvnet_avx2_la_CFLAGS =                  \
        $(AM_CFLAGS)  @CPU_AVX2_FLAGS@          \
        -DCLIB_MARCH_VARIANT=avx2
 noinst_LTLIBRARIES += libvnet_avx2.la
-libvnet_la_LIBADD += libvnet_avx2.la
+libvnet_la_DEPENDENCIES += libvnet_avx2.la
 endif
 
 if CC_SUPPORTS_AVX512
@@ -1306,7 +1306,7 @@ libvnet_avx512_la_CFLAGS =                        \
        $(AM_CFLAGS) @CPU_AVX512_FLAGS@         \
        -DCLIB_MARCH_VARIANT=avx512
 noinst_LTLIBRARIES += libvnet_avx512.la
-libvnet_la_LIBADD += libvnet_avx512.la
+libvnet_la_DEPENDENCIES += libvnet_avx512.la
 endif
 endif