X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fvppinfra.am;h=840ce27fb5ac2deddb46a38cb82d476f01b20554;hb=16be62e3846750b5b7921c0b4d6408477be434f7;hp=66c2ad2a9fc5aabe568cd7fe477e5f71d73f5227;hpb=a98c40305deedc58860722fb9710075028c8b9f8;p=vpp.git

diff --git a/src/vppinfra.am b/src/vppinfra.am
index 66c2ad2a9fc..840ce27fb5a 100644
--- a/src/vppinfra.am
+++ b/src/vppinfra.am
@@ -13,17 +13,6 @@
 
 lib_LTLIBRARIES += libvppinfra.la
 
-BUILT_SOURCES += vppinfra/config.h
-
-vppinfra/config.h:
-	@echo "/** Autogenerated by Autotools **/" > $@
-	@echo "#ifndef included_clib_config_h" >> $@
-	@echo "#define included_clib_config_h" >> $@
-	@echo "#ifndef CLIB_LOG2_CACHE_LINE_BYTES " >> $@
-	@echo "#define CLIB_LOG2_CACHE_LINE_BYTES " @LOG2_CACHE_LINE_BYTES@ >> $@
-	@echo "#endif " >> $@
-	@echo "#endif " >> $@
-
 TESTS = 
 
 if ENABLE_TESTS
@@ -205,6 +194,7 @@ nobase_include_HEADERS = \
   vppinfra/bihash_vec8_8.h \
   vppinfra/bihash_16_8.h \
   vppinfra/bihash_24_8.h \
+  vppinfra/bihash_40_8.h \
   vppinfra/bihash_48_8.h \
   vppinfra/bihash_template.h \
   vppinfra/bihash_template.c \
@@ -247,7 +237,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 \
@@ -289,6 +278,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 \
@@ -313,8 +310,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 \
@@ -343,6 +338,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)					\