dpdk: rework cryptodev ipsec build and setup

[vpp.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index e691a53..239afea 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,7 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I m4
+AM_LIBTOOLFLAGS = --quiet
 
 AM_CFLAGS = -Wall
 
@@ -27,6 +28,14 @@ noinst_HEADERS =
 dist_bin_SCRIPTS =
 lib_LTLIBRARIES =
 BUILT_SOURCES =
+install-data-local:
+       @echo "Building vppctl command list..."
+       @DIR_SEARCH="$(srcdir)" ; \
+       DIR_EXCLUDE="examples" ; \
+       GREP_TIME=`time (grep -wIr "\.path = " $$DIR_SEARCH --exclude-dir=$$DIR_EXCLUDE \
+       | cut -d '"' -f2 | sort -u > $(srcdir)/scripts/vppctl-cmd-list) 2>&1` ; \
+       GREP_TIME=`echo $$GREP_TIME | awk '{print $$2}'` ; \
+       echo "Command list built, Time taken: $$GREP_TIME"
 
 ###############################################################################
 # DPDK
@@ -36,9 +45,9 @@ if WITH_DPDK
 if ENABLE_DPDK_SHARED
 DPDK_LD_FLAGS = -Wl,--whole-archive,-ldpdk,--no-whole-archive
 else
-DPDK_LD_FLAGS = -Wl,--whole-archive,-l:libdpdk.a,--no-whole-archive
+DPDK_LD_FLAGS = -Wl,--whole-archive,-l:libdpdk.a,--no-whole-archive,-lm,-ldl
 endif
-if WITH_DPDK_CRYPTO
+if WITH_DPDK_CRYPTO_SW
 DPDK_LD_ADD = -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB
 endif
 if WITH_DPDK_MLX5_PMD
@@ -79,7 +88,15 @@ include vnet.am
 include vpp.am
 include vpp-api-test.am
 
-SUBDIRS += vpp-api/python plugins
+SUBDIRS += plugins
+
+if ENABLE_PAPI
+SUBDIRS += vpp-api/python
+endif
+
+if ENABLE_JAPI
+SUBDIRS += vpp-api/java
+endif
 
 ###############################################################################
 # API
@@ -94,7 +111,6 @@ api_DATA = \
        $(patsubst %.api,%.api.json,$(API_FILES))
 
 BUILT_SOURCES += \
-       $(patsubst %.api,%.api.json,$(API_FILES)) \
        $(patsubst %.api,%.api.h,$(API_FILES))
 
 endif # if ENABLE_VLIB