X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=f5fa3398ea40c8d89832e1391665684857b1979b;hb=6bd197ebb9fd9ae271449ad3937ae076d85c6479;hp=239afeacd52c9519c0e7116c982483e8343793be;hpb=d04b60bfa940e21ab4676a1cb3c15989748be40a;p=vpp.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 239afeacd52..f5fa3398ea4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 AM_LIBTOOLFLAGS = --quiet
 
-AM_CFLAGS = -Wall
+AM_CFLAGS = @CPU_FLAGS@ -Wall
+AM_CXXFLAGS = -Wall -std=gnu++11
 
 SUBDIRS = .
 SUFFIXES = .api.h .api .api.json
@@ -28,6 +29,7 @@ noinst_HEADERS =
 dist_bin_SCRIPTS =
 lib_LTLIBRARIES =
 BUILT_SOURCES =
+CLEANFILES =
 install-data-local:
 	@echo "Building vppctl command list..."
 	@DIR_SEARCH="$(srcdir)" ; \
@@ -37,27 +39,6 @@ install-data-local:
 	GREP_TIME=`echo $$GREP_TIME | awk '{print $$2}'` ; \
 	echo "Command list built, Time taken: $$GREP_TIME"
 
-###############################################################################
-# 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,-lm,-ldl
-endif
-if WITH_DPDK_CRYPTO_SW
-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
-
 ###############################################################################
 # Components
 ###############################################################################
@@ -87,17 +68,16 @@ 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
 
-if ENABLE_JAPI
-SUBDIRS += vpp-api/java
-endif
-
 ###############################################################################
 # API
 ###############################################################################
@@ -115,3 +95,5 @@ BUILT_SOURCES += \
 
 endif # if ENABLE_VLIB
 endif # if ENABLE_SVM
+
+CLEANFILES += $(BUILT_SOURCES) $(api_DATA)