Add config option to use dlmalloc instead of mheap

[vpp.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5daaa48..6a92275 100644 (file)
--- 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,11 +68,13 @@ 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