X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=a0e62dbdb5cea316c894776fb33356ec74990e9d;hb=770e89e6b916319eedd91c6edf16f0d7e89f556c;hp=e691a5393d3de2eeb5816928ccb601f916ef64f0;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/Makefile.am b/src/Makefile.am
index e691a5393d3..a0e62dbdb5c 100644
--- 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,15 @@ noinst_HEADERS =
 dist_bin_SCRIPTS =
 lib_LTLIBRARIES =
 BUILT_SOURCES =
+CLEANFILES =
+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,10 +46,10 @@ 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
-DPDK_LD_ADD = -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB
+if WITH_DPDK_CRYPTO_SW
+DPDK_LD_ADD = -lIPSec_MB
 endif
 if WITH_DPDK_MLX5_PMD
 DPDK_LD_FLAGS += -libverbs -lmlx5 -lnuma
@@ -79,7 +89,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,8 +112,9 @@ 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
 endif # if ENABLE_SVM
+
+CLEANFILES += $(BUILT_SOURCES) $(api_DATA)