X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2FMakefile.am;h=dcea38fb8dcaedb706f6c5a7bcb31e3cac686ba0;hb=ed9b757a106c2a7193a90734e43fce9feac21e30;hp=84ee79e91782529627945151bb1026fe3acf3f4c;hpb=e7a40e86b1f7f2325ebcff1d2506ef6a81536955;p=vpp.git

diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index 84ee79e9178..dcea38fb8dc 100644
--- a/vnet/Makefile.am
+++ b/vnet/Makefile.am
@@ -13,7 +13,7 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CFLAGS = -Wall @DPDK@ @VIRL@ @IPSEC@ @VCGN@ @IPV6SR@
+AM_CFLAGS = -Wall @DPDK@ @VIRL@ @IPSEC@ @IPV6SR@
 
 libvnet_la_SOURCES =
 libvnetplugin_la_SOURCES =
@@ -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
@@ -524,41 +523,6 @@ nobase_include_HEADERS +=			\
  vnet/sr/sr_error.def				\
  vnet/sr/sr.h
 
-########################################
-# CGN
-#########################################
-
-if WITH_VCGN
-libvnet_la_SOURCES +=						\
- vnet/vcgn/cnat_bulk_port.c					\
- vnet/vcgn/cnat_config.c					\
- vnet/vcgn/cnat_db_scanner.c					\
- vnet/vcgn/cnat_db_v2.c						\
- vnet/vcgn/cnat_debug_msg_handler.c				\
- vnet/vcgn/cnat_cli_handler.c					\
- vnet/vcgn/cnat_global.c					\
- vnet/vcgn/cnat_ipv4_udp_inside_input.c				\
- vnet/vcgn/cnat_ipv4_udp_inside_input_exceptions.c		\
- vnet/vcgn/cnat_ipv4_udp_outside_input.c			\
- vnet/vcgn/cnat_ipv4_tcp_inside_input.c				\
- vnet/vcgn/cnat_ipv4_tcp_inside_input_exceptions.c		\
- vnet/vcgn/cnat_ipv4_tcp_outside_input.c			\
- vnet/vcgn/cnat_ipv4_icmp_query_inside_input.c			\
- vnet/vcgn/cnat_ipv4_icmp_query_inside_input_exception.c	\
- vnet/vcgn/cnat_ipv4_icmp_query_outside_input.c			\
- vnet/vcgn/cnat_ipv4_icmp_error_inside_input.c			\
- vnet/vcgn/cnat_ipv4_icmp_error_outside_input.c			\
- vnet/vcgn/cnat_logging.c					\
- vnet/vcgn/cnat_ports.c						\
- vnet/vcgn/cnat_util.c						\
- vnet/vcgn/cnat_show.c						\
- vnet/vcgn/cnat_syslog.c					\
- vnet/vcgn/cnat_v4_functions.c					\
- vnet/vcgn/index_list.c						\
- vnet/vcgn/spp_platform_trace_log.c				\
- vnet/vcgn/vcgn_classify.c
-endif
-
 ########################################
 # DHCPv6 proxy
 ########################################
@@ -629,13 +593,17 @@ libvnet_la_SOURCES +=				\
   vnet/devices/dpdk/format.c		\
   vnet/devices/dpdk/init.c			\
   vnet/devices/dpdk/node.c			\
-  vnet/devices/dpdk/threads.c       \
   vnet/devices/dpdk/vhost_user.c    \
   vnet/devices/dpdk/cli.c
 
 nobase_include_HEADERS +=			\
-  vnet/devices/dpdk/dpdk.h			\
-  vnet/devices/dpdk/threads.h
+  vnet/devices/dpdk/dpdk.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
 
 ########################################
@@ -714,16 +682,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 =