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

diff --git a/src/Makefile.am b/src/Makefile.am
index c1b6b0e9d89..6a9227522b0 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@ @DLMALLOC@ -Wall
+AM_CXXFLAGS = -Wall -std=gnu++11
 
 SUBDIRS = .
 SUFFIXES = .api.h .api .api.json
@@ -67,10 +68,10 @@ include vlib-api.am
 include vnet.am
 include vpp.am
 include vpp-api-test.am
-include uri.am
 include vcl.am
 
 SUBDIRS += plugins
+SUBDIRS += vpp-api/vapi
 
 if ENABLE_PAPI
 include vpp-api.am
@@ -81,8 +82,6 @@ if ENABLE_JAPI
 SUBDIRS += vpp-api/java
 endif
 
-SUBDIRS += vpp-api/vapi
-
 ###############################################################################
 # API
 ###############################################################################