X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=84407bc1861ac9c1f5099ab07a8e0e6bb73b4f99;hb=4d9b9d8e74f12a26404ccdd8baf46c61b44584db;hp=a4817f2fc11246bade841fe6924be6cef2e8e73e;hpb=c99b4cd1c3aae9ca3bda0595a5cce4ea5e6ba84f;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index a4817f2fc11..84407bc1861 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -63,7 +63,8 @@ nobase_include_HEADERS +=			\
   vnet/vnet.h					\
   vnet/vnet_all_api_h.h				\
   vnet/vnet_msg_enum.h				\
-  vnet/util/radix.h
+  vnet/util/radix.h                 \
+  vnet/util/refcount.h
 
 API_FILES += vnet/interface.api
 
@@ -771,11 +772,15 @@ API_FILES += vnet/srv6/sr.api
 
 libvnet_la_SOURCES +=				\
  vnet/srmpls/sr_mpls_policy.c		\
- vnet/srmpls/sr_mpls_steering.c
+ vnet/srmpls/sr_mpls_steering.c   \
+ vnet/srmpls/sr_mpls_api.c
 
 
 nobase_include_HEADERS +=			\
- vnet/srmpls/sr.h
+ vnet/srmpls/sr_mpls.h      \
+ vnet/srmpls/sr_mpls.api.h
+
+API_FILES += vnet/srmpls/sr_mpls.api
 
 ########################################
 # IPFIX / netflow v10
@@ -899,16 +904,6 @@ nobase_include_HEADERS += 			\
 
 API_FILES += vnet/devices/tap/tapv2.api
 
-########################################
-# ssvm ethernet
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/devices/ssvm/ssvm_eth.c			\
-  vnet/devices/ssvm/node.c
-
-nobase_include_HEADERS +=			\
-  vnet/devices/ssvm/ssvm_eth.h
-
 ########################################
 # session managmeent
 ########################################
@@ -1109,7 +1104,7 @@ libvnet_la_SOURCES +=				\
   vnet/dpo/mpls_disposition.c   		\
   vnet/dpo/mpls_label_dpo.c			\
   vnet/dpo/l3_proxy_dpo.c			\
-  vnet/dpo/l2_bridge_dpo.c
+  vnet/dpo/dvr_dpo.c
 
 nobase_include_HEADERS +=			\
   vnet/dpo/load_balance.h			\
@@ -1147,7 +1142,8 @@ nobase_include_HEADERS +=			\
 ########################################
 
 libvnet_la_SOURCES +=                    \
-  vnet/util/radix.c			 \
+  vnet/util/radix.c			     \
+  vnet/util/refcount.c			 \
   vnet/util/trajectory.c
 
 ########################################
@@ -1173,7 +1169,8 @@ libvnet_la_SOURCES +=                           \
   vnet/bier/bier_disp_entry.c			\
   vnet/bier/bier_disp_lookup_node.c		\
   vnet/bier/bier_disp_dispatch_node.c		\
-  vnet/bier/bier_disp_table.c
+  vnet/bier/bier_disp_table.c			\
+  vnet/bier/bier_bift_table.c
 
 nobase_include_HEADERS +=			\
   vnet/bier/bier_types.h                        \
@@ -1184,6 +1181,21 @@ nobase_include_HEADERS +=			\
 
 API_FILES += vnet/bier/bier.api
 
+########################################
+# Test apps
+########################################
+
+noinst_PROGRAMS += tcp_echo udp_echo
+
+TEST_APPS_LDADD = libvlibmemoryclient.la libsvm.la libvppinfra.la
+TEST_APPS_LDADD += -lpthread -lm -lrt
+
+tcp_echo_SOURCES = tests/vnet/session/tcp_echo.c
+tcp_echo_LDADD = $(TEST_APPS_LDADD)
+
+udp_echo_SOURCES = tests/vnet/session/udp_echo.c
+udp_echo_LDADD = $(TEST_APPS_LDADD)
+
 ########################################
 # Plugin client library
 ########################################