X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2FMakefile.am;h=d0a06be8e9e769e50e93fc664d9703a184fcc3f0;hb=355cf68f926b5971d94c1e59b358b5447430e8e3;hp=5fdffcaa13da3de0aeb93c4451c5411bdce716a6;hpb=108c7313854953ee3b66069b902f9fabb097ed25;p=vpp.git

diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index 5fdffcaa13d..d0a06be8e9e 100644
--- a/vnet/Makefile.am
+++ b/vnet/Makefile.am
@@ -26,6 +26,7 @@ TESTS =
 ########################################
 libvnet_la_SOURCES +=					\
   vnet/config.c						\
+  vnet/handoff.c					\
   vnet/interface.c					\
   vnet/interface_cli.c					\
   vnet/interface_format.c				\
@@ -39,6 +40,7 @@ nobase_include_HEADERS +=			\
   vnet/buffer.h					\
   vnet/config.h					\
   vnet/global_funcs.h				\
+  vnet/handoff.h				\
   vnet/interface.h				\
   vnet/interface_funcs.h			\
   vnet/l3_types.h				\
@@ -58,6 +60,8 @@ libvnet_la_SOURCES +=				\
 
 nobase_include_HEADERS +=			\
   vnet/policer/police.h				\
+  vnet/policer/policer.h			\
+  vnet/policer/fix_types.h			\
   vnet/policer/xlate.h
 
 ########################################
@@ -244,10 +248,10 @@ libvnet_la_SOURCES +=				\
  vnet/ip/format.c				\
  vnet/ip/icmp4.c				\
  vnet/ip/icmp6.c				\
+ vnet/ip/ip_feature_registration.c		\
  vnet/ip/ip46_cli.c				\
  vnet/ip/ip4_format.c				\
  vnet/ip/ip4_forward.c				\
- vnet/ip/ip4_hop_by_hop.c			\
  vnet/ip/ip4_input.c				\
  vnet/ip/ip4_mtrie.c				\
  vnet/ip/ip4_pg.c				\
@@ -277,6 +281,7 @@ nobase_include_HEADERS +=			\
  vnet/ip/icmp6.h				\
  vnet/ip/igmp_packet.h				\
  vnet/ip/ip.h					\
+ vnet/ip/ip_feature_registration.h		\
  vnet/ip/ip4.h					\
  vnet/ip/ip4_mtrie.h				\
  vnet/ip/ip4_error.h				\
@@ -343,15 +348,11 @@ libvnet_la_SOURCES +=                           \
  vnet/map/map.c                                 \
  vnet/map/ip4_map.c                             \
  vnet/map/ip6_map.c                             \
- vnet/map/sixrd.c                               \
- vnet/map/ip4_sixrd.c                           \
- vnet/map/ip6_sixrd.c                           \
  vnet/map/ip4_map_t.c                           \
  vnet/map/ip6_map_t.c
 
 nobase_include_HEADERS +=                       \
- vnet/map/map.h                                 \
- vnet/map/sixrd.h
+ vnet/map/map.h
 
 ########################################
 # Tunnel protocol: gre
@@ -397,32 +398,18 @@ nobase_include_HEADERS +=			\
 
 
 ########################################
-# Tunnel protocol: nsh-gre
+# Tunnel protocol: vxlan-gpe
 ########################################
 
 libvnet_la_SOURCES +=				\
- vnet/nsh-gre/nsh_gre.c				\
- vnet/nsh-gre/encap.c				\
- vnet/nsh-gre/decap.c
+ vnet/vxlan-gpe/vxlan_gpe.c			\
+ vnet/vxlan-gpe/encap.c	        		\
+ vnet/vxlan-gpe/decap.c
 
 nobase_include_HEADERS +=			\
- vnet/nsh-gre/nsh_gre.h				\
- vnet/nsh-gre/nsh_gre_packet.h			\
- vnet/nsh-gre/nsh_gre_error.def
-
-########################################
-# Tunnel protocol: nsh-vxlan-gpe
-########################################
-
-libvnet_la_SOURCES +=				\
- vnet/nsh-vxlan-gpe/nsh_vxlan_gpe.c		\
- vnet/nsh-vxlan-gpe/encap.c			\
- vnet/nsh-vxlan-gpe/decap.c
-
-nobase_include_HEADERS +=			\
- vnet/nsh-vxlan-gpe/nsh_vxlan_gpe.h		\
- vnet/nsh-vxlan-gpe/vxlan_gpe_packet.h		\
- vnet/nsh-vxlan-gpe/nsh_vxlan_gpe_error.def
+ vnet/vxlan-gpe/vxlan_gpe.h			\
+ vnet/vxlan-gpe/vxlan_gpe_packet.h		\
+ vnet/vxlan-gpe/vxlan_gpe_error.def
 
 ########################################
 # LISP control plane: lisp-cp
@@ -478,6 +465,7 @@ endif
 libvnet_la_SOURCES +=				\
  vnet/lisp-gpe/lisp_gpe.c			\
  vnet/lisp-gpe/interface.c			\
+ vnet/lisp-gpe/ip_forward.c			\
  vnet/lisp-gpe/decap.c				
 
 nobase_include_HEADERS +=			\
@@ -526,7 +514,8 @@ nobase_include_HEADERS +=			\
 
 if WITH_IPV6SR
 libvnet_la_SOURCES +=				\
- vnet/sr/sr.c
+ vnet/sr/sr.c					\
+ vnet/sr/sr_replicate.c
 endif
  
 nobase_include_HEADERS +=			\
@@ -646,6 +635,12 @@ libvnet_la_SOURCES +=				\
 nobase_include_HEADERS +=			\
   vnet/devices/dpdk/dpdk.h			\
   vnet/devices/dpdk/threads.h
+else
+libvnet_la_SOURCES +=				\
+  vnet/devices/nic/ixge.c                       \
+  vnet/devices/nic/ixge.h                       \
+  vnet/devices/nic/sfp.c                        \
+  vnet/devices/nic/sfp.h
 endif
 
 ########################################