More LISP SD FIB and forwarding fixes

[vpp.git] / vnet / Makefile.am

diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index dddcdbf..d0a06be 100644 (file)
--- 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                              \
@@ -246,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                              \
@@ -279,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                           \
@@ -345,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
@@ -398,30 +397,6 @@ nobase_include_HEADERS +=                  \
  vnet/mpls-gre/error.def
 
 
-########################################
-# NSH Map: nsh
-########################################
- libvnet_la_SOURCES +=                         \
-  vnet/nsh/nsh.c
-
- nobase_include_HEADERS +=                     \
-  vnet/nsh/nsh_packet.h                                \
-  vnet/nsh/nsh.h                               \
-  vnet/nsh/nsh_error.def
-
-
-########################################
-# Tunnel protocol: nsh-gre
-########################################
-
-# libvnet_la_SOURCES +=                                \
-#   vnet/nsh-gre/nsh_gre.c                     \
-#   vnet/nsh-gre/encap.c                               \
-#   vnet/nsh-gre/decap.c
-
-# nobase_include_HEADERS +=                    \
-#   vnet/nsh-gre/nsh_gre.h                             
-
 ########################################
 # Tunnel protocol: vxlan-gpe
 ########################################
@@ -660,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
 
 ########################################
@@ -738,16 +719,6 @@ libvnetplugin_la_SOURCES +=                    \
 nobase_include_HEADERS +=                      \
   vnet/plugin/plugin.h
 
-########################################
-# Service Chain verification util
-########################################
-libvnet_la_SOURCES +=       \
- vnet/lib-scv/scv_util.c
-
-nobase_include_HEADERS +=                       \
- vnet/lib-scv/scv_util.h                        \
- vnet/lib-scv/math64.h
-
 lib_LTLIBRARIES = libvnet.la libvnetplugin.la
 
 dpdk_libs =