Move java api to extras/

[vpp.git] / src / vppinfra.am

diff --git a/src/vppinfra.am b/src/vppinfra.am
index 185541e..57f7a1f 100644 (file)
--- a/src/vppinfra.am
+++ b/src/vppinfra.am
@@ -32,7 +32,6 @@ TESTS  +=  test_bihash_template \
           test_longjmp \
           test_macros \
           test_maplog \
-          test_md5 \
           test_mheap \
           test_pool_iterate \
           test_ptclosure \
@@ -42,6 +41,7 @@ TESTS  +=  test_bihash_template \
           test_slist \
           test_socket \
           test_time \
+          test_time_range \
           test_timing_wheel \
           test_tw_timer \
           test_valloc \
@@ -68,7 +68,6 @@ test_heap_SOURCES = vppinfra/test_heap.c
 test_longjmp_SOURCES = vppinfra/test_longjmp.c
 test_macros_SOURCES = vppinfra/test_macros.c
 test_maplog_SOURCES = vppinfra/test_maplog.c
-test_md5_SOURCES = vppinfra/test_md5.c
 test_mheap_SOURCES = vppinfra/test_mheap.c
 test_pool_iterate_SOURCES = vppinfra/test_pool_iterate.c
 test_ptclosure_SOURCES = vppinfra/test_ptclosure.c
@@ -78,6 +77,7 @@ test_serialize_SOURCES = vppinfra/test_serialize.c
 test_slist_SOURCES = vppinfra/test_slist.c
 test_socket_SOURCES = vppinfra/test_socket.c
 test_time_SOURCES = vppinfra/test_time.c
+test_time_range_SOURCES = vppinfra/test_time_range.c
 test_timing_wheel_SOURCES = vppinfra/test_timing_wheel.c
 test_tw_timer_SOURCES = vppinfra/test_tw_timer.c
 test_valloc_SOURCES = vppinfra/test_valloc.c
@@ -102,7 +102,6 @@ test_heap_CPPFLAGS =        $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_longjmp_CPPFLAGS =        $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_macros_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_maplog_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_md5_CPPFLAGS =    $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_mheap_CPPFLAGS =  $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_pool_iterate_CPPFLAGS =   $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_ptclosure_CPPFLAGS =      $(AM_CPPFLAGS) -DCLIB_DEBUG
@@ -134,7 +133,6 @@ test_heap_LDADD =   libvppinfra.la
 test_longjmp_LDADD =   libvppinfra.la
 test_macros_LDADD =    libvppinfra.la
 test_maplog_LDADD =    libvppinfra.la
-test_md5_LDADD =       libvppinfra.la
 test_mheap_LDADD =     libvppinfra.la
 test_pool_iterate_LDADD =      libvppinfra.la
 test_ptclosure_LDADD = libvppinfra.la
@@ -144,6 +142,7 @@ test_serialize_LDADD =      libvppinfra.la
 test_slist_LDADD =     libvppinfra.la
 test_socket_LDADD =    libvppinfra.la
 test_time_LDADD =      libvppinfra.la -lm
+test_time_range_LDADD =        libvppinfra.la -lm
 test_timing_wheel_LDADD =      libvppinfra.la -lm
 test_tw_timer_LDADD =  libvppinfra.la
 test_valloc_LDADD =    libvppinfra.la
@@ -166,7 +165,6 @@ test_heap_LDFLAGS = -static
 test_longjmp_LDFLAGS = -static
 test_macros_LDFLAGS = -static
 test_maplog_LDFLAGS = -static
-test_md5_LDFLAGS = -static
 test_mheap_LDFLAGS = -static
 test_pool_iterate_LDFLAGS = -static
 test_ptclosure_LDFLAGS = -static
@@ -176,6 +174,7 @@ test_serialize_LDFLAGS = -static
 test_slist_LDFLAGS = -static
 test_socket_LDFLAGS = -static
 test_time_LDFLAGS = -static
+test_time_range_LDFLAGS = -static
 test_timing_wheel_LDFLAGS = -static
 test_tw_timer_LDFLAGS = -static
 test_valloc_LDFLAGS = -static
@@ -195,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 \
@@ -202,10 +202,12 @@ nobase_include_HEADERS = \
   vppinfra/bitops.h \
   vppinfra/byte_order.h \
   vppinfra/cache.h \
+  vppinfra/config.h \
   vppinfra/clib.h \
   vppinfra/clib_error.h \
   vppinfra/cpu.h \
   vppinfra/crc32.h \
+  vppinfra/lb_hash_hash.h \
   vppinfra/dlist.h \
   vppinfra/elf.h \
   vppinfra/elf_clib.h \
@@ -229,7 +231,6 @@ nobase_include_HEADERS = \
   vppinfra/macros.h \
   vppinfra/maplog.h \
   vppinfra/math.h \
-  vppinfra/md5.h \
   vppinfra/mem.h \
   vppinfra/memcpy_sse3.h \
   vppinfra/memcpy_avx2.h \
@@ -251,6 +252,7 @@ nobase_include_HEADERS = \
   vppinfra/sparse_vec.h \
   vppinfra/string.h \
   vppinfra/time.h \
+  vppinfra/time_range.h \
   vppinfra/timing_wheel.h \
   vppinfra/timer.h \
   vppinfra/tw_timer_2t_1w_2048sl.h \
@@ -267,6 +269,8 @@ nobase_include_HEADERS = \
   vppinfra/vec_bootstrap.h \
   vppinfra/vector.h \
   vppinfra/vector_altivec.h \
+  vppinfra/vector_avx2.h \
+  vppinfra/vector_avx512.h \
   vppinfra/vector_funcs.h \
   vppinfra/vector_neon.h \
   vppinfra/vector_sse42.h \
@@ -275,6 +279,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 \
@@ -299,9 +311,6 @@ CLIB_CORE = \
   vppinfra/longjmp.S \
   vppinfra/macros.c \
   vppinfra/mhash.c \
-  vppinfra/mheap.c \
-  vppinfra/md5.c \
-  vppinfra/mem_mheap.c \
   vppinfra/ptclosure.c \
   vppinfra/random.c \
   vppinfra/random_buffer.c \
@@ -311,6 +320,7 @@ CLIB_CORE = \
   vppinfra/std-formats.c \
   vppinfra/string.c \
   vppinfra/time.c \
+  vppinfra/time_range.c \
   vppinfra/timing_wheel.c \
   vppinfra/tw_timer_template.h \
   vppinfra/tw_timer_2t_1w_2048sl.h \
@@ -329,6 +339,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)                                 \