span: fix wrong next1 feature index in dual loop

[vpp.git] / vnet / Makefile.am

diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index 185c08a..d806785 100644 (file)
--- a/vnet/Makefile.am
+++ b/vnet/Makefile.am
@@ -13,7 +13,7 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CFLAGS = -Wall -Werror @DPDK@ @IPSEC@ @IPV6SR@
+AM_CFLAGS = -Wall -Werror @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @IPV6SR@
 
 libvnet_la_SOURCES =
 libvnetplugin_la_SOURCES =
@@ -31,6 +31,7 @@ endif
 ########################################
 libvnet_la_SOURCES +=                                  \
   vnet/config.c                                                \
+  vnet/devices/devices.c                               \
   vnet/handoff.c                                       \
   vnet/interface.c                                     \
   vnet/interface_cli.c                                 \
@@ -344,7 +345,15 @@ libvnet_la_SOURCES +=                              \
  vnet/ipsec/ikev2_cli.c                                \
  vnet/ipsec/ikev2_payload.c                    \
  vnet/ipsec/ikev2_format.c
-endif 
+if WITH_DPDK_CRYPTO
+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 +=                          \
  vnet/ipsec/ipsec_output.c
@@ -354,6 +363,11 @@ nobase_include_HEADERS +=                          \
  vnet/ipsec/esp.h                              \
  vnet/ipsec/ikev2.h                             \
  vnet/ipsec/ikev2_priv.h
+if WITH_DPDK_CRYPTO
+nobase_include_HEADERS +=                      \
+ vnet/devices/dpdk/ipsec/ipsec.h               \
+ vnet/devices/dpdk/ipsec/esp.h
+endif
 
 ########################################
 # Layer 3 protocol: osi
@@ -630,6 +644,17 @@ libvnet_la_SOURCES +=                              \
 nobase_include_HEADERS +=                      \
   vnet/lawful-intercept/lawful_intercept.h
 
+########################################
+# SPAN (port mirroring)
+########################################
+
+libvnet_la_SOURCES +=                          \
+  vnet/span/span.c     \
+  vnet/span/node.c
+
+nobase_include_HEADERS +=                      \
+  vnet/span/span.h
+
 ########################################
 # Packet generator
 ########################################
@@ -647,7 +672,7 @@ nobase_include_HEADERS +=                   \
   vnet/pg/edit.h
 
 ########################################
-# Intel DPDK
+# DPDK
 ########################################
 if WITH_DPDK
 libvnet_la_SOURCES +=                          \
@@ -721,7 +746,6 @@ nobase_include_HEADERS +=                   \
 ########################################
 
 libvnet_la_SOURCES +=                          \
-  vnet/devices/feature.c                       \
   vnet/feature/feature.c                       \
   vnet/feature/registration.c