X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2FMakefile.am;h=7cf19eb81560e173d7ae9a9778b0e65653c15fd3;hb=3e046ea96e7e9d98a8dd67eab84031e1d71b4422;hp=96306dd3ccd7374c61ed87cfb6947fabce54f922;hpb=2231150b52b58c4114f8520cde8b26df2761e064;p=vpp.git

diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index 96306dd3ccd..7cf19eb8156 100644
--- a/vnet/Makefile.am
+++ b/vnet/Makefile.am
@@ -13,7 +13,10 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CFLAGS = -Wall -Werror @DPDK@ @IPSEC@ @IPV6SR@
+AM_CFLAGS = -Wall -Werror @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @IPV6SR@
+
+BUILT_SOURCES = vnet/interface.api.h vnet/interface.api.json vnet/l2/l2.api.h \
+  vnet/l2/l2.api.json
 
 libvnet_la_SOURCES =
 libvnetplugin_la_SOURCES =
@@ -31,8 +34,10 @@ endif
 ########################################
 libvnet_la_SOURCES +=					\
   vnet/config.c						\
+  vnet/devices/devices.c				\
   vnet/handoff.c					\
   vnet/interface.c					\
+  vnet/interface_api.c					\
   vnet/interface_cli.c					\
   vnet/interface_format.c				\
   vnet/interface_output.c				\
@@ -44,15 +49,19 @@ nobase_include_HEADERS +=			\
   vnet/api_errno.h				\
   vnet/buffer.h					\
   vnet/config.h					\
+  vnet/devices/devices.h			\
   vnet/global_funcs.h				\
   vnet/handoff.h				\
   vnet/interface.h				\
+  vnet/interface.api.h				\
   vnet/interface_funcs.h			\
   vnet/l3_types.h				\
   vnet/pipeline.h				\
   vnet/replication.h				\
   vnet/rewrite.h				\
-  vnet/vnet.h
+  vnet/vnet.h					\
+  vnet/vnet_all_api_h.h				\
+  vnet/vnet_msg_enum.h
 
 ########################################
 # Policer infra
@@ -108,6 +117,7 @@ nobase_include_HEADERS +=			\
 ########################################
 libvnet_la_SOURCES +=				\
  vnet/l2/feat_bitmap.c				\
+ vnet/l2/l2_api.c      				\
  vnet/l2/l2_bd.c				\
  vnet/l2/l2_bvi.c				\
  vnet/l2/l2_input_classify.c			\
@@ -141,7 +151,8 @@ nobase_include_HEADERS +=			\
  vnet/l2/l2_fib.h				\
  vnet/l2/l2_rw.h                                \
  vnet/l2/l2_xcrw.h				\
- vnet/l2/l2_classify.h
+ vnet/l2/l2_classify.h				\
+ vnet/l2/l2.api.h
 
 ########################################
 # Layer 2 protocol: SRP
@@ -311,6 +322,7 @@ nobase_include_HEADERS +=			\
  vnet/ip/ip6_hop_by_hop.h			\
  vnet/ip/ip6_hop_by_hop_packet.h		\
  vnet/ip/ip6_packet.h				\
+ vnet/ip/ip6_neighbor.h				\
  vnet/ip/ip.h					\
  vnet/ip/ip_packet.h				\
  vnet/ip/ip_source_and_port_range_check.h	\
@@ -343,7 +355,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
@@ -353,6 +373,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
@@ -431,12 +456,13 @@ libvnet_la_SOURCES +=				\
  vnet/mpls/mpls_features.c			\
  vnet/mpls/node.c				\
  vnet/mpls/interface.c			        \
- vnet/mpls/policy_encap.c			\
+ vnet/mpls/mpls_tunnel.c		        \
  vnet/mpls/pg.c
  
 nobase_include_HEADERS +=			\
  vnet/mpls/mpls.h				\
  vnet/mpls/mpls_types.h			        \
+ vnet/mpls/mpls_tunnel.h		        \
  vnet/mpls/packet.h				\
  vnet/mpls/error.def
 
@@ -627,9 +653,19 @@ libvnet_la_SOURCES +=				\
   vnet/lawful-intercept/node.c
 
 nobase_include_HEADERS += 			\
-  vnet/dpdk_replication.h			\
   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 +683,7 @@ nobase_include_HEADERS +=			\
   vnet/pg/edit.h
 
 ########################################
-# Intel DPDK
+# DPDK
 ########################################
 if WITH_DPDK
 libvnet_la_SOURCES +=				\
@@ -721,7 +757,6 @@ nobase_include_HEADERS +=			\
 ########################################
 
 libvnet_la_SOURCES +=				\
-  vnet/devices/feature.c			\
   vnet/feature/feature.c			\
   vnet/feature/registration.c
 
@@ -771,6 +806,7 @@ libvnet_la_SOURCES +=				\
   vnet/fib/fib_entry_src_mpls.c                 \
   vnet/fib/fib_entry_src_lisp.c                 \
   vnet/fib/fib_entry_cover.c                    \
+  vnet/fib/fib_entry_delegate.c                 \
   vnet/fib/fib_path_list.c                      \
   vnet/fib/fib_path.c				\
   vnet/fib/fib_path_ext.c			\
@@ -785,7 +821,8 @@ nobase_include_HEADERS +=			\
   vnet/fib/fib_table.h				\
   vnet/fib/fib_node.h				\
   vnet/fib/fib_node_list.h			\
-  vnet/fib/fib_entry.h				
+  vnet/fib/fib_entry.h				\
+  vnet/fib/fib_entry_delegate.h
 
 ########################################
 # ADJ
@@ -852,3 +889,16 @@ pcap2pg_LDFLAGS = -static
 pcap2pg_LDADD = libvnet.la -l:libvppinfra.a -lpthread -lm -ldl
 
 noinst_PROGRAMS += pcap2pg
+
+# Set the suffix list
+SUFFIXES = .api.h .api .api.json
+
+# install the API definition, so we can produce java bindings, etc.
+
+apidir = $(prefix)/vnet
+api_DATA = vnet/interface.api.json vnet/l2/l2.api.json
+
+# The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk
+# and requires a symbolic link at the top of the vnet source tree
+
+include $(top_srcdir)/suffix-rules.mk