X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra.am;h=7641c71a2a55d3d44e9fd40ca8e5b64f76c63009;hb=6a5adc369591fcac2447e9809deaa22f56b53911;hp=e751de27ae91eece53a2f977b223ee2170275a11;hpb=2a3fb1a28b170ac1d37815983611e83d148811d4;p=vpp.git

diff --git a/src/vppinfra.am b/src/vppinfra.am
index e751de27ae9..7641c71a2a5 100644
--- a/src/vppinfra.am
+++ b/src/vppinfra.am
@@ -248,7 +248,6 @@ nobase_include_HEADERS = \
   vppinfra/memcpy_avx512.h \
   vppinfra/mhash.h \
   vppinfra/mheap.h \
-  vppinfra/mheap_bootstrap.h \
   vppinfra/os.h \
   vppinfra/pipeline.h \
   vppinfra/pool.h \
@@ -290,6 +289,14 @@ nobase_include_HEADERS = \
   vppinfra/xy.h \
   vppinfra/zvec.h
 
+if ENABLE_DLMALLOC
+  nobase_include_HEADERS += \
+  vppinfra/dlmalloc.h
+else
+  nobase_include_HEADERS +=  \
+  vppinfra/mheap_bootstrap.h 
+endif
+
 CLIB_CORE = \
   vppinfra/asm_x86.c \
   vppinfra/backtrace.c \
@@ -314,8 +321,6 @@ CLIB_CORE = \
   vppinfra/longjmp.S \
   vppinfra/macros.c \
   vppinfra/mhash.c \
-  vppinfra/mheap.c \
-  vppinfra/mem_mheap.c \
   vppinfra/ptclosure.c \
   vppinfra/random.c \
   vppinfra/random_buffer.c \
@@ -344,6 +349,17 @@ CLIB_CORE = \
   vppinfra/vector.c \
   vppinfra/zvec.c
 
+if ENABLE_DLMALLOC
+  CLIB_CORE += \
+  vppinfra/mem_dlmalloc.c \
+  vppinfra/dlmalloc.c \
+  vppinfra/dlmalloc.h
+else
+  CLIB_CORE += \
+  vppinfra/mheap.c \
+  vppinfra/mem_mheap.c 
+endif
+
 # Core plus Unix additions
 libvppinfra_la_SOURCES =			\
   $(CLIB_CORE)					\