X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=6a9227522b07e1d3005889126eb694ae0bb39f7f;hb=6a5adc369591fcac2447e9809deaa22f56b53911;hp=0fc437a46aa0b3d6b1581df165d46afe50a115da;hpb=cb034b9b374927c7552e36dcbc306d8456b2a0cb;p=vpp.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 0fc437a46aa..6a9227522b0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,10 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I m4
+AM_LIBTOOLFLAGS = --quiet
 
-AM_CFLAGS = -Wall
+AM_CFLAGS = @CPU_FLAGS@ @DLMALLOC@ -Wall
+AM_CXXFLAGS = -Wall -std=gnu++11
 
 SUBDIRS = .
 SUFFIXES = .api.h .api .api.json
@@ -27,27 +29,15 @@ noinst_HEADERS =
 dist_bin_SCRIPTS =
 lib_LTLIBRARIES =
 BUILT_SOURCES =
-
-###############################################################################
-# DPDK
-###############################################################################
-
-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
-endif
-if WITH_DPDK_CRYPTO
-DPDK_LD_ADD = -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB
-endif
-if WITH_DPDK_MLX5_PMD
-DPDK_LD_FLAGS += -libverbs -lmlx5 -lnuma
-endif
-else
-DPDK_LD_FLAGS =
-DPDK_LD_ADD =
-endif
+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"
 
 ###############################################################################
 # Components
@@ -78,10 +68,13 @@ include vlib-api.am
 include vnet.am
 include vpp.am
 include vpp-api-test.am
+include vcl.am
 
 SUBDIRS += plugins
+SUBDIRS += vpp-api/vapi
 
 if ENABLE_PAPI
+include vpp-api.am
 SUBDIRS += vpp-api/python
 endif
 
@@ -102,8 +95,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)