X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vppinfra%2FMakefile.am;h=d0a023e25d33c3285e1689322a709195853721e9;hb=ed1c1835043a1d266a5928c40f41b340f6c968d7;hp=1b4d627dfb6a33f317871a56d1804b3c9848f65d;hpb=f1213b82771ce929c076339c24a777cfd59690e6;p=vpp.git

diff --git a/vppinfra/Makefile.am b/vppinfra/Makefile.am
index 1b4d627dfb6..d0a023e25d3 100644
--- a/vppinfra/Makefile.am
+++ b/vppinfra/Makefile.am
@@ -12,7 +12,7 @@
 # limitations under the License.
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CPPFLAGS = -Wall @VEC64@ # -Werror
+AM_CPPFLAGS = -Wall -Werror
 
 if WITH_UNIX
   lib_LTLIBRARIES = libvppinfra.la
@@ -24,6 +24,7 @@ TESTS =
 
 if ENABLE_TESTS
 TESTS  +=  test_bihash_template \
+	   test_dlist \
 	   test_elog \
 	   test_elf \
 	   test_fifo \
@@ -34,10 +35,8 @@ TESTS  +=  test_bihash_template \
 	   test_macros \
 	   test_md5 \
 	   test_mheap \
-	   test_pfhash \
-	   test_phash \
 	   test_pool_iterate \
-	   test_qhash \
+	   test_ptclosure \
 	   test_random \
 	   test_random_isaac \
 	   test_serialize \
@@ -53,6 +52,7 @@ noinst_PROGRAMS = $(TESTS)
 check_PROGRAMS	= $(TESTS)
 
 test_bihash_template_SOURCES = vppinfra/test_bihash_template.c
+test_dlist_SOURCES = vppinfra/test_dlist.c
 test_elog_SOURCES = vppinfra/test_elog.c
 test_elf_SOURCES = vppinfra/test_elf.c
 test_fifo_SOURCES = vppinfra/test_fifo.c
@@ -63,10 +63,8 @@ test_longjmp_SOURCES = vppinfra/test_longjmp.c
 test_macros_SOURCES = vppinfra/test_macros.c
 test_md5_SOURCES = vppinfra/test_md5.c
 test_mheap_SOURCES = vppinfra/test_mheap.c
-test_pfhash_SOURCES = vppinfra/test_pfhash.c
-test_phash_SOURCES = vppinfra/test_phash.c
 test_pool_iterate_SOURCES = vppinfra/test_pool_iterate.c
-test_qhash_SOURCES = vppinfra/test_qhash.c
+test_ptclosure_SOURCES = vppinfra/test_ptclosure.c
 test_random_SOURCES = vppinfra/test_random.c
 test_random_isaac_SOURCES = vppinfra/test_random_isaac.c
 test_serialize_SOURCES = vppinfra/test_serialize.c
@@ -80,6 +78,7 @@ test_zvec_SOURCES = vppinfra/test_zvec.c
 # All unit tests use ASSERT for failure
 # So we'll need -DDEBUG to enable ASSERTs
 test_bihash_template_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_dlist_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_elog_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_elf_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_fifo_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
@@ -90,10 +89,8 @@ test_longjmp_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_macros_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_md5_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_mheap_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_pfhash_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_phash_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_pool_iterate_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_qhash_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
+test_ptclosure_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_random_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_random_isaac_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 test_socket_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
@@ -105,6 +102,7 @@ test_vec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 test_zvec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
 
 test_bihash_template_LDADD =	libvppinfra.la
+test_dlist_LDADD =	libvppinfra.la
 test_elog_LDADD =	libvppinfra.la
 test_elf_LDADD =	libvppinfra.la
 test_fifo_LDADD =	libvppinfra.la
@@ -115,10 +113,8 @@ test_longjmp_LDADD =	libvppinfra.la
 test_macros_LDADD =	libvppinfra.la
 test_md5_LDADD =	libvppinfra.la
 test_mheap_LDADD =	libvppinfra.la
-test_pfhash_LDADD =	libvppinfra.la
-test_phash_LDADD =	libvppinfra.la
 test_pool_iterate_LDADD =	libvppinfra.la
-test_qhash_LDADD =	libvppinfra.la
+test_ptclosure_LDADD =	libvppinfra.la
 test_random_LDADD =	libvppinfra.la
 test_random_isaac_LDADD =	libvppinfra.la
 test_serialize_LDADD =	libvppinfra.la
@@ -130,6 +126,7 @@ test_vec_LDADD =	libvppinfra.la
 test_zvec_LDADD =	libvppinfra.la
 
 test_bihash_template_LDFLAGS = -static
+test_dlist_LDFLAGS = -static
 test_elog_LDFLAGS = -static
 test_elf_LDFLAGS = -static
 test_fifo_LDFLAGS = -static
@@ -140,10 +137,8 @@ test_longjmp_LDFLAGS = -static
 test_macros_LDFLAGS = -static
 test_md5_LDFLAGS = -static
 test_mheap_LDFLAGS = -static
-test_pfhash_LDFLAGS = -static
-test_phash_LDFLAGS = -static
 test_pool_iterate_LDFLAGS = -static
-test_qhash_LDFLAGS = -static
+test_ptclosure_LDFLAGS = -static
 test_random_LDFLAGS = -static
 test_random_isaac_LDFLAGS = -static
 test_serialize_LDFLAGS = -static
@@ -173,6 +168,7 @@ nobase_include_HEADERS = \
   vppinfra/cache.h \
   vppinfra/clib.h \
   vppinfra/cpu.h \
+  vppinfra/dlist.h \
   vppinfra/elf.h \
   vppinfra/elf_clib.h \
   vppinfra/elog.h \
@@ -195,18 +191,15 @@ nobase_include_HEADERS = \
   vppinfra/mheap.h \
   vppinfra/mheap_bootstrap.h \
   vppinfra/os.h \
-  vppinfra/pfhash.h \
-  vppinfra/phash.h \
   vppinfra/pipeline.h \
   vppinfra/pool.h \
-  vppinfra/qhash.h \
+  vppinfra/ptclosure.h \
   vppinfra/random.h \
   vppinfra/random_buffer.h \
   vppinfra/random_isaac.h \
   vppinfra/serialize.h \
   vppinfra/slist.h \
   vppinfra/smp.h \
-  vppinfra/smp_fifo.h \
   vppinfra/socket.h \
   vppinfra/sparse_vec.h \
   vppinfra/string.h \
@@ -231,6 +224,9 @@ nobase_include_HEADERS = \
 CLIB_CORE = \
   vppinfra/asm_x86.c \
   vppinfra/backtrace.c \
+  vppinfra/bihash_8_8.h \
+  vppinfra/bihash_24_8.h \
+  vppinfra/bihash_template.h \
   vppinfra/cpu.c \
   vppinfra/elf.c \
   vppinfra/elog.c \
@@ -247,16 +243,12 @@ CLIB_CORE = \
   vppinfra/mheap.c \
   vppinfra/md5.c \
   vppinfra/mem_mheap.c \
-  vppinfra/pfhash.c \
-  vppinfra/phash.c \
-  vppinfra/qhash.c \
+  vppinfra/ptclosure.c \
   vppinfra/random.c \
   vppinfra/random_buffer.c \
   vppinfra/random_isaac.c \
   vppinfra/serialize.c \
   vppinfra/slist.c \
-  vppinfra/smp.c \
-  vppinfra/smp_fifo.c \
   vppinfra/std-formats.c \
   vppinfra/string.c \
   vppinfra/time.c \
@@ -278,5 +270,5 @@ libvppinfra_la_SOURCES =			\
 bin_PROGRAMS = elftool
 
 elftool_SOURCES = tools/elftool.c
-elftool_CPPFLAGS = -Wall
+elftool_CPPFLAGS = $(AM_CPPFLAGS)
 elftool_LDADD = libvppinfra.la -lpthread -lrt -lm