X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2FMakefile.am;h=b758c7f1cc9f6444b61e9e6a7f851bf3e4aa4ae8;hb=3b3688f9d3a640a169e9c7fc858d36ab3aeb147e;hp=8a9f214ca70cc953a16bb1c4cdc3a0190d61a795;hpb=94b1442a6731bb879797c016a8febaec2f2ae7c9;p=vpp.git

diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index 8a9f214ca70..b758c7f1cc9 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
 
 ########################################
@@ -247,7 +251,6 @@ libvnet_la_SOURCES +=				\
  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				\
@@ -343,15 +346,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
@@ -396,30 +395,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
 ########################################
@@ -658,6 +633,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
 
 ########################################