Cleanup URI code and TCP bugfixing

[vpp.git] / src / vnet.am

diff --git a/src/vnet.am b/src/vnet.am
index 923f61d..4e30ee9 100644 (file)
--- 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
@@ -370,6 +369,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 +396,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 +407,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,6 +461,7 @@ libvnet_la_SOURCES +=                               \
  vnet/tcp/tcp_output.c                         \
  vnet/tcp/tcp_input.c                          \
  vnet/tcp/tcp_newreno.c                                \
+ vnet/tcp/builtin_server.c                     \
  vnet/tcp/tcp.c
 
 nobase_include_HEADERS +=                      \
@@ -724,13 +711,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,29 +792,7 @@ 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
+if !WITH_DPDK
 libvnet_la_SOURCES +=                          \
   vnet/devices/nic/ixge.c                       \
   vnet/devices/nic/ixge.h                       \