X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=f5fa3398ea40c8d89832e1391665684857b1979b;hb=40e6bdfff72fda7c0c51648686812f34fe8024ed;hp=5daaa48e9df48d0b0e98751de64d61a7d54b643b;hpb=c3a814be9dc769be942ff8029c7b6eccd4b3af05;p=vpp.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 5daaa48e9df..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
@@ -67,18 +68,16 @@ 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
 SUBDIRS += vpp-api/python
 endif
 
-if ENABLE_JAPI
-SUBDIRS += vpp-api/java
-endif
-
 ###############################################################################
 # API
 ###############################################################################