X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=68cff7852ef1a15495797f395e0885e2232d8c8d;hb=0d427d8d8a48af404dfc6535ae72d334b790f809;hp=a0e62dbdb5cea316c894776fb33356ec74990e9d;hpb=6ca42d333b247eaee4995a7f779a43759a81909e;p=vpp.git

diff --git a/src/Makefile.am b/src/Makefile.am
index a0e62dbdb5c..68cff7852ef 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
@@ -38,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 = -lIPSec_MB
-endif
-if WITH_DPDK_MLX5_PMD
-DPDK_LD_FLAGS += -libverbs -lmlx5 -lnuma
-endif
-else
-DPDK_LD_FLAGS =
-DPDK_LD_ADD =
-endif
-
 ###############################################################################
 # Components
 ###############################################################################
@@ -88,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