X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=121d1a9c6a241488d8b1893d81b1567a1e018848;hb=b0972cbb35550619483b90004a00566f9641f983;hp=823dd0d69654733556d526bb7da2cc9371a84440;hpb=386be87d887a0335f4d9712a02960f0ddefe8971;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index 823dd0d6965..121d1a9c6a2 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -40,8 +40,7 @@ libvnet_la_SOURCES +=				\
   vnet/interface_format.c			\
   vnet/interface_output.c			\
   vnet/misc.c					\
-  vnet/replication.c                            \
-  vnet/rewrite.c
+  vnet/replication.c
 
 nobase_include_HEADERS +=			\
   vnet/api_errno.h				\
@@ -53,10 +52,11 @@ nobase_include_HEADERS +=			\
   vnet/interface.h				\
   vnet/interface.api.h				\
   vnet/interface_funcs.h			\
+  vnet/ip/ip4_to_ip6.h   			\
+  vnet/ip/ip6_to_ip4.h   			\
   vnet/l3_types.h				\
   vnet/pipeline.h				\
   vnet/replication.h				\
-  vnet/rewrite.h				\
   vnet/vnet.h					\
   vnet/vnet_all_api_h.h				\
   vnet/vnet_msg_enum.h				\
@@ -664,19 +664,6 @@ nobase_include_HEADERS +=			\
 
 API_FILES += vnet/lisp-gpe/lisp_gpe.api
 
-if ENABLE_TESTS
-TESTS += test_test
-
-test_test_SOURCES = tests/vnet/lisp-gpe/test.c
-
-test_test_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-
-test_test_LDADD = $(LIBOBJS)
-
-noinst_PROGRAMS += $(TESTS)
-check_PROGRAMS += $(TESTS)
-endif
-
 ########################################
 # DHCP client
 ########################################
@@ -710,21 +697,31 @@ nobase_include_HEADERS +=			\
 # ipv6 segment routing
 ########################################
 
-if WITH_LIBSSL
 libvnet_la_SOURCES +=				\
- vnet/sr/sr.c						\
- vnet/sr/sr_localsid.c				\
- vnet/sr/sr_policy_rewrite.c		\
- vnet/sr/sr_steering.c				\
- vnet/sr/sr_api.c
-endif
+ vnet/srv6/sr.c						\
+ vnet/srv6/sr_localsid.c			\
+ vnet/srv6/sr_policy_rewrite.c		\
+ vnet/srv6/sr_steering.c			\
+ vnet/srv6/sr_api.c
 
 nobase_include_HEADERS +=			\
- vnet/sr/sr_packet.h				\
- vnet/sr/sr.h						\
- vnet/sr/sr.api.h
+ vnet/srv6/sr_packet.h				\
+ vnet/srv6/sr.h 					\
+ vnet/srv6/sr.api.h
 
-API_FILES += vnet/sr/sr.api
+API_FILES += vnet/srv6/sr.api
+
+########################################
+# mpls segment routing
+########################################
+
+libvnet_la_SOURCES +=				\
+ vnet/srmpls/sr_mpls_policy.c		\
+ vnet/srmpls/sr_mpls_steering.c
+
+
+nobase_include_HEADERS +=			\
+ vnet/srmpls/sr.h
 
 ########################################
 # IPFIX / netflow v10
@@ -829,6 +826,7 @@ libvnet_la_SOURCES +=				\
   vnet/session/session_cli.c			\
   vnet/session/hashes.c				\
   vnet/session/application_interface.c		\
+  vnet/session/segment_manager.c		\
   vnet/session/session_api.c
 
 nobase_include_HEADERS +=			\
@@ -837,6 +835,7 @@ nobase_include_HEADERS +=			\
   vnet/session/transport.h			\
   vnet/session/application_interface.h		\
   vnet/session/session_debug.h			\
+  vnet/session/segment_manager.h		\
   vnet/session/session.api.h
 
 API_FILES += vnet/session/session.api
@@ -938,7 +937,8 @@ libvnet_la_SOURCES +=				\
   vnet/fib/fib_path.c				\
   vnet/fib/fib_path_ext.c			\
   vnet/fib/fib_urpf_list.c			\
-  vnet/fib/fib_attached_export.c
+  vnet/fib/fib_attached_export.c		\
+  vnet/fib/fib_bfd.c
 
 nobase_include_HEADERS +=			\
   vnet/fib/fib.h				\
@@ -963,14 +963,18 @@ libvnet_la_SOURCES +=				\
   vnet/adj/adj_mcast.c   			\
   vnet/adj/adj_l2.c      			\
   vnet/adj/adj_nsh.c      			\
-  vnet/adj/adj.c
+  vnet/adj/adj.c		                \
+  vnet/adj/rewrite.c				\
+  vnet/adj/adj_bfd.c				\
+  vnet/adj/adj_delegate.c
 
 nobase_include_HEADERS +=			\
   vnet/adj/adj.h				\
   vnet/adj/adj_types.h				\
   vnet/adj/adj_glean.h  			\
   vnet/adj/adj_nsh.h  				\
-  vnet/adj/adj_nbr.h
+  vnet/adj/adj_nbr.h 				\
+  vnet/adj/rewrite.h
 
 ########################################
 # Data-Plane Objects
@@ -987,6 +991,8 @@ libvnet_la_SOURCES +=				\
   vnet/dpo/lookup_dpo.c   			\
   vnet/dpo/classify_dpo.c   			\
   vnet/dpo/replicate_dpo.c   			\
+  vnet/dpo/interface_dpo.c   			\
+  vnet/dpo/mpls_disposition.c   		\
   vnet/dpo/mpls_label_dpo.c
 
 nobase_include_HEADERS +=			\