X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=9c55e336d0482d41ef3acb2a6bfbc39058389976;hb=6792ec059696a358b6c98d8d86e9740b34c01e24;hp=923f61d8a0bd9d0e00ff1781ddd6bf91543d6f03;hpb=68b0fb0c620c7451ef1a6380c43c39de6614db51;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index 923f61d8a0b..9c55e336d04 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -23,8 +23,7 @@ libvnet_la_DEPENDENCIES = \
 	libvlibmemory.la	\
 	libvlibmemoryclient.la
 
-libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt $(DPDK_LD_ADD)
-libvnet_la_LDFLAGS = $(DPDK_LD_FLAGS)
+libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt
 
 if WITH_LIBSSL
 libvnet_la_LIBADD += -lcrypto
@@ -43,7 +42,7 @@ libvnet_la_SOURCES +=				\
   vnet/interface_format.c			\
   vnet/interface_output.c			\
   vnet/misc.c					\
-  vnet/replication.c				\
+  vnet/replication.c                            \
   vnet/rewrite.c
 
 nobase_include_HEADERS +=			\
@@ -59,7 +58,6 @@ nobase_include_HEADERS +=			\
   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				\
@@ -115,14 +113,16 @@ libvnet_la_SOURCES +=				\
  vnet/ethernet/init.c				\
  vnet/ethernet/interface.c			\
  vnet/ethernet/node.c				\
- vnet/ethernet/pg.c
+ vnet/ethernet/pg.c				\
+ vnet/ethernet/sfp.c
 
 nobase_include_HEADERS +=			\
  vnet/ethernet/arp_packet.h			\
  vnet/ethernet/error.def			\
  vnet/ethernet/ethernet.h			\
  vnet/ethernet/packet.h				\
- vnet/ethernet/types.def
+ vnet/ethernet/types.def			\
+ vnet/ethernet/sfp.h
 
 ########################################
 # Layer 2 protocol: Ethernet bridging
@@ -370,6 +370,7 @@ libvnet_la_SOURCES +=				\
  vnet/bfd/bfd_udp.c				\
  vnet/bfd/bfd_main.c				\
  vnet/bfd/bfd_protocol.c			\
+ vnet/bfd/bfd_cli.c                             \
  vnet/bfd/bfd_api.c
 
 API_FILES += vnet/bfd/bfd.api
@@ -396,15 +397,6 @@ libvnet_la_SOURCES +=				\
  vnet/ipsec/ipsec_api.c
 
 API_FILES += vnet/ipsec/ipsec.api
-
-if WITH_DPDK
-libvnet_la_SOURCES +=				\
- vnet/devices/dpdk/ipsec/esp_encrypt.c		\
- vnet/devices/dpdk/ipsec/esp_decrypt.c		\
- vnet/devices/dpdk/ipsec/crypto_node.c		\
- vnet/devices/dpdk/ipsec/cli.c			\
- vnet/devices/dpdk/ipsec/ipsec.c
-endif
 endif
 
 libvnet_la_SOURCES +=				\
@@ -416,11 +408,6 @@ nobase_include_HEADERS +=			\
  vnet/ipsec/ikev2.h				\
  vnet/ipsec/ikev2_priv.h			\
  vnet/ipsec/ipsec.api.h
-if WITH_DPDK
-nobase_include_HEADERS +=			\
- vnet/devices/dpdk/ipsec/ipsec.h		\
- vnet/devices/dpdk/ipsec/esp.h
-endif
 
 ########################################
 # Layer 3 protocol: osi
@@ -475,11 +462,15 @@ libvnet_la_SOURCES +=				\
  vnet/tcp/tcp_output.c				\
  vnet/tcp/tcp_input.c				\
  vnet/tcp/tcp_newreno.c				\
+ vnet/tcp/builtin_client.c			\
+ vnet/tcp/builtin_server.c			\
+ vnet/tcp/tcp_test.c				\
  vnet/tcp/tcp.c
 
 nobase_include_HEADERS +=			\
  vnet/tcp/tcp_packet.h				\
  vnet/tcp/tcp_timer.h				\
+ vnet/tcp/tcp_debug.h				\
  vnet/tcp/tcp.h
 
 ########################################
@@ -541,7 +532,7 @@ libvnet_la_SOURCES +=				\
  vnet/mpls/mpls_lookup.c			\
  vnet/mpls/mpls_output.c			\
  vnet/mpls/mpls_features.c			\
- vnet/mpls/node.c				\
+ vnet/mpls/mpls_input.c				\
  vnet/mpls/interface.c			        \
  vnet/mpls/mpls_tunnel.c		        \
  vnet/mpls/pg.c			        \
@@ -724,13 +715,15 @@ nobase_include_HEADERS +=			\
 
 if WITH_LIBSSL
 libvnet_la_SOURCES +=				\
- vnet/sr/sr.c					\
+ 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
 
 nobase_include_HEADERS +=			\
  vnet/sr/sr_packet.h				\
- vnet/sr/sr_error.def				\
  vnet/sr/sr.h						\
  vnet/sr/sr.api.h
 
@@ -803,36 +796,6 @@ nobase_include_HEADERS +=			\
   vnet/pg/pg.h					\
   vnet/pg/edit.h
 
-########################################
-# DPDK
-########################################
-if WITH_DPDK
-libvnet_la_SOURCES +=				\
-  vnet/devices/dpdk/buffer.c			\
-  vnet/devices/dpdk/dpdk_priv.h		\
-  vnet/devices/dpdk/device.c		\
-  vnet/devices/dpdk/format.c		\
-  vnet/devices/dpdk/init.c			\
-  vnet/devices/dpdk/main.c			\
-  vnet/devices/dpdk/node.c			\
-  vnet/devices/dpdk/thread.c			\
-  vnet/devices/dpdk/hqos.c			\
-  vnet/devices/dpdk/cli.c			\
-  vnet/devices/dpdk/dpdk_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/devices/dpdk/dpdk.h			\
-  vnet/devices/dpdk/dpdk.api.h
-
-API_FILES += vnet/devices/dpdk/dpdk.api
-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
-
 ########################################
 # virtio
 ########################################
@@ -875,7 +838,9 @@ nobase_include_HEADERS +=			\
   vnet/session/session.h			\
   vnet/session/application.h			\
   vnet/session/transport.h			\
-  vnet/session/application_interface.h
+  vnet/session/application_interface.h		\
+  vnet/session/session_debug.h			\
+  vnet/session/session.api.h
 
 API_FILES += vnet/session/session.api