Code Review / vpp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
MPLS Mcast
[vpp.git] / src / vnet.am
diff --git a/src/vnet.am b/src/vnet.am
index 923f61d..bed4902 100644 (file)
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -19,12 +19,9 @@ libvnet_la_DEPENDENCIES = \
        libvlib.la              \
        libsvmdb.la             \
        libsvm.la               \
-       libvlibapi.la           \
-       libvlibmemory.la        \
-       libvlibmemoryclient.la
+       libvlibmemory.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,8 +40,7 @@ libvnet_la_SOURCES +=                         \
   vnet/interface_format.c                      \
   vnet/interface_output.c                      \
   vnet/misc.c                                  \
-  vnet/replication.c                           \
-  vnet/rewrite.c
+  vnet/replication.c
 
 nobase_include_HEADERS +=                      \
   vnet/api_errno.h                             \
@@ -59,7 +55,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 +110,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 +367,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 +394,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 +405,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
@@ -459,8 +443,7 @@ test_map_SOURCES =                             \
 test_map_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 
 test_map_LDADD = libvnet.la libvppinfra.la libvlib.la  \
-  -lpthread -lvlibmemory -lvlibapi \
-  -ldl -lsvm -lrt
+  -lpthread -lvlibmemory -ldl -lsvm -lrt
 
 test_map_LDFLAGS = -static
 endif
@@ -475,11 +458,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 +528,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                                \
@@ -627,7 +614,6 @@ LDS = \
   libvlib.la  \
   libsvm.la \
   libsvmdb.la \
-  libvlibapi.la \
   libvlibmemory.la \
   -lpthread -ldl -lrt -lm
 
@@ -724,13 +710,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 +791,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 +833,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
 
@@ -976,7 +936,8 @@ libvnet_la_SOURCES +=                               \
   vnet/fib/fib_path.c                          \
   vnet/fib/fib_path_ext.c                      \
   vnet/fib/fib_urpf_list.c                     \
-  vnet/fib/fib_attached_export.c
+  vnet/fib/fib_attached_export.c               \
+  vnet/fib/fib_bfd.c
 
 nobase_include_HEADERS +=                      \
   vnet/fib/fib.h                               \
@@ -1001,14 +962,18 @@ libvnet_la_SOURCES +=                            \
   vnet/adj/adj_mcast.c                         \
   vnet/adj/adj_l2.c                            \
   vnet/adj/adj_nsh.c                           \
-  vnet/adj/adj.c
+  vnet/adj/adj.c                               \
+  vnet/adj/rewrite.c                           \
+  vnet/adj/adj_bfd.c                           \
+  vnet/adj/adj_delegate.c
 
 nobase_include_HEADERS +=                      \
   vnet/adj/adj.h                               \
   vnet/adj/adj_types.h                         \
   vnet/adj/adj_glean.h                         \
   vnet/adj/adj_nsh.h                           \
-  vnet/adj/adj_nbr.h
+  vnet/adj/adj_nbr.h                           \
+  vnet/adj/rewrite.h
 
 ########################################
 # Data-Plane Objects
@@ -1025,6 +990,8 @@ libvnet_la_SOURCES +=                              \
   vnet/dpo/lookup_dpo.c                        \
   vnet/dpo/classify_dpo.c                      \
   vnet/dpo/replicate_dpo.c                     \
+  vnet/dpo/interface_dpo.c                     \
+  vnet/dpo/mpls_disposition.c                  \
   vnet/dpo/mpls_label_dpo.c
 
 nobase_include_HEADERS +=                      \
Vector Packet Processing