X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2FMakefile.am;h=37798c9c3bb53cbca0c6ea4c19477a8cfd2ee5da;hb=c4d1cf76072b54f630b0263cd86e01df82249568;hp=0ba07bac5bd8981e73e20a9fd4bca91145232445;hpb=f14e3bf7b297f3b9eea87af412929bb8f277b315;p=vpp.git

diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index 0ba07bac5bd..37798c9c3bb 100644
--- a/vnet/Makefile.am
+++ b/vnet/Makefile.am
@@ -15,7 +15,33 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 
 AM_CFLAGS = -Wall -Werror @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @IPV6SR@
 
-BUILT_SOURCES = vnet/interface.api.h vnet/interface.api.json
+BUILT_SOURCES = 				\
+ vnet/devices/af_packet/af_packet.api.h		\
+ vnet/devices/af_packet/af_packet.api.json	\
+ vnet/devices/netmap/netmap.api.h		\
+ vnet/devices/netmap/netmap.api.json		\
+ vnet/devices/virtio/vhost_user.api.h		\
+ vnet/devices/virtio/vhost_user.api.json	\
+ vnet/gre/gre.api.h				\
+ vnet/gre/gre.api.json				\
+ vnet/interface.api.h				\
+ vnet/interface.api.json			\
+ vnet/ip/ip.api.h				\
+ vnet/ip/ip.api.json				\
+ vnet/l2/l2.api.h				\
+ vnet/l2/l2.api.json				\
+ vnet/l2tp/l2tp.api.h				\
+ vnet/l2tp/l2tp.api.json			\
+ vnet/map/map.api.h				\
+ vnet/map/map.api.json				\
+ vnet/span/span.api.h				\
+ vnet/span/span.api.json			\
+ vnet/unix/tap.api.h				\
+ vnet/unix/tap.api.json				\
+ vnet/vxlan/vxlan.api.h				\
+ vnet/vxlan/vxlan.api.json			\
+ vnet/vxlan-gpe/vxlan_gpe.api.h			\
+ vnet/vxlan-gpe/vxlan_gpe.api.json
 
 libvnet_la_SOURCES =
 libvnetplugin_la_SOURCES =
@@ -116,6 +142,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			\
@@ -149,7 +176,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
@@ -218,12 +246,14 @@ nobase_include_HEADERS +=			\
 libvnet_la_SOURCES +=				\
   vnet/vxlan/vxlan.c				\
   vnet/vxlan/encap.c				\
-  vnet/vxlan/decap.c	
+  vnet/vxlan/decap.c                \
+  vnet/vxlan/vxlan_api.c	
 
 nobase_include_HEADERS +=			\
   vnet/vxlan/vxlan.h				\
   vnet/vxlan/vxlan_packet.h         		\
-  vnet/vxlan/vxlan_error.def
+  vnet/vxlan/vxlan_error.def        \
+  vnet/vxlan/vxlan.api.h
 
 ########################################
 # Layer 2 / CDP
@@ -291,6 +321,7 @@ libvnet_la_SOURCES +=				\
  vnet/ip/ip6_input.c				\
  vnet/ip/ip6_neighbor.c				\
  vnet/ip/ip6_pg.c				\
+ vnet/ip/ip_api.c				\
  vnet/ip/ip_checksum.c				\
  vnet/ip/ip_frag.c				\
  vnet/ip/ip.h					\
@@ -310,6 +341,7 @@ nobase_include_HEADERS +=			\
  vnet/ip/icmp4.h				\
  vnet/ip/icmp6.h				\
  vnet/ip/igmp_packet.h				\
+ vnet/ip/ip.api.h				\
  vnet/ip/ip4_error.h				\
  vnet/ip/ip4.h					\
  vnet/ip/ip4_mtrie.h				\
@@ -319,6 +351,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	\
@@ -332,6 +365,22 @@ nobase_include_HEADERS +=			\
  vnet/ip/udp.h					\
  vnet/ip/udp_packet.h
 
+########################################
+# Bidirectional Forwarding Detection
+########################################
+
+nobase_include_HEADERS +=                       \
+ vnet/bfd/bfd_protocol.h			\
+ vnet/bfd/bfd_main.h                            \
+ vnet/bfd/bfd_api.h                            \
+ vnet/bfd/bfd_udp.h
+
+libvnet_la_SOURCES +=				\
+ vnet/bfd/bfd_api.h                            \
+ vnet/bfd/bfd_udp.c                             \
+ vnet/bfd/bfd_main.c                            \
+ vnet/bfd/bfd_protocol.c
+
 ########################################
 # Layer 3 protocol: IPSec
 ########################################
@@ -389,17 +438,19 @@ nobase_include_HEADERS +=			\
 ########################################
 # Layer 3 protocol: MAP
 ########################################
-libvnet_la_SOURCES +=                           \
- vnet/map/map.c                                 \
- vnet/map/map_dpo.c                             \
- vnet/map/ip4_map.c                             \
- vnet/map/ip6_map.c                             \
- vnet/map/ip4_map_t.c                           \
- vnet/map/ip6_map_t.c
+libvnet_la_SOURCES +=				\
+ vnet/map/map.c					\
+ vnet/map/map_dpo.c				\
+ vnet/map/ip4_map.c				\
+ vnet/map/ip6_map.c				\
+ vnet/map/ip4_map_t.c				\
+ vnet/map/ip6_map_t.c				\
+ vnet/map/map_api.c
 
-nobase_include_HEADERS +=                       \
- vnet/map/map.h                                 \
- vnet/map/map_dpo.h
+nobase_include_HEADERS +=			\
+ vnet/map/map.h					\
+ vnet/map/map_dpo.h				\
+ vnet/map/map.api.h
 
 if ENABLE_TESTS
 TESTS += test_map
@@ -422,12 +473,14 @@ libvnet_la_SOURCES +=				\
  vnet/gre/gre.c					\
  vnet/gre/node.c				\
  vnet/gre/interface.c				\
- vnet/gre/pg.c
+ vnet/gre/pg.c					\
+ vnet/gre/gre_api.c
  
 nobase_include_HEADERS +=			\
  vnet/gre/gre.h					\
  vnet/gre/packet.h				\
- vnet/gre/error.def
+ vnet/gre/error.def				\
+ vnet/gre/gre.api.h
 
 ########################################
 # Tunnel protocol: l2tpv3
@@ -436,11 +489,13 @@ libvnet_la_SOURCES +=				\
  vnet/l2tp/l2tp.c				\
  vnet/l2tp/encap.c 				\
  vnet/l2tp/decap.c  				\
- vnet/l2tp/pg.c
+ vnet/l2tp/pg.c					\
+ vnet/l2tp/l2tp_api.c
  
 nobase_include_HEADERS +=			\
  vnet/l2tp/l2tp.h				\
- vnet/l2tp/packet.h				
+ vnet/l2tp/packet.h				\
+ vnet/l2tp/l2tp.api.h	
 
 ########################################
 # Tunnel protocol: gre+mpls
@@ -452,12 +507,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
 
@@ -469,12 +525,14 @@ nobase_include_HEADERS +=			\
 libvnet_la_SOURCES +=				\
  vnet/vxlan-gpe/vxlan_gpe.c			\
  vnet/vxlan-gpe/encap.c	        		\
- vnet/vxlan-gpe/decap.c
+ vnet/vxlan-gpe/decap.c				\
+ vnet/vxlan-gpe/vxlan_gpe_api.c
 
 nobase_include_HEADERS +=			\
  vnet/vxlan-gpe/vxlan_gpe.h			\
  vnet/vxlan-gpe/vxlan_gpe_packet.h		\
- vnet/vxlan-gpe/vxlan_gpe_error.def
+ vnet/vxlan-gpe/vxlan_gpe_error.def	\
+ vnet/vxlan-gpe/vxlan_gpe.api.h
 
 ########################################
 # Tunnel protocol: ipsec+gre
@@ -655,10 +713,12 @@ nobase_include_HEADERS += 			\
 ########################################
 
 libvnet_la_SOURCES +=				\
-  vnet/span/span.c	\
+  vnet/span/span_api.c  \
+  vnet/span/span.c	    \
   vnet/span/node.c
 
 nobase_include_HEADERS += 			\
+  vnet/span/span.api.h  \
   vnet/span/span.h
 
 ########################################
@@ -705,10 +765,12 @@ endif
 ########################################
 
 libvnet_la_SOURCES +=       \
-  vnet/devices/virtio/vhost-user.c
+  vnet/devices/virtio/vhost-user.c	\
+  vnet/devices/virtio/vhost_user_api.c
 
 nobase_include_HEADERS +=     \
-  vnet/devices/virtio/vhost-user.h
+  vnet/devices/virtio/vhost-user.h	\
+  vnet/devices/virtio/vhost_user.api.h
 
 ########################################
 # ssvm ethernet
@@ -728,10 +790,12 @@ libvnet_la_SOURCES +=				\
   vnet/devices/af_packet/af_packet.c		\
   vnet/devices/af_packet/device.c		\
   vnet/devices/af_packet/node.c			\
-  vnet/devices/af_packet/cli.c
+  vnet/devices/af_packet/cli.c			\
+  vnet/devices/af_packet/af_packet_api.c
 
-nobase_include_HEADERS +=			\
-  vnet/devices/af_packet/af_packet.h
+nobase_include_HEADERS +=				\
+  vnet/devices/af_packet/af_packet.h	\
+  vnet/devices/af_packet/af_packet.api.h
 
 ########################################
 # NETMAP interface
@@ -741,11 +805,12 @@ libvnet_la_SOURCES +=				\
   vnet/devices/netmap/netmap.c			\
   vnet/devices/netmap/device.c			\
   vnet/devices/netmap/node.c			\
-  vnet/devices/netmap/cli.c
+  vnet/devices/netmap/cli.c				\
+  vnet/devices/netmap/netmap_api.c
 
 nobase_include_HEADERS +=			\
-  vnet/devices/netmap/netmap.h
-
+  vnet/devices/netmap/netmap.h		\
+  vnet/devices/netmap/netmap.api.h
 
 ########################################
 # Driver feature graph arc support
@@ -767,12 +832,14 @@ nobase_include_HEADERS +=			\
 libvnet_la_SOURCES +=				\
   vnet/unix/gdb_funcs.c				\
   vnet/unix/pcap.c				\
+  vnet/unix/tap_api.c				\
   vnet/unix/tapcli.c				\
   vnet/unix/tuntap.c
 
 nobase_include_HEADERS +=			\
   vnet/unix/pcap.h				\
   vnet/unix/tuntap.h				\
+  vnet/unix/tap.api.h				\
   vnet/unix/tapcli.h
 
 ########################################
@@ -801,6 +868,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			\
@@ -809,13 +877,15 @@ libvnet_la_SOURCES +=				\
 
 nobase_include_HEADERS +=			\
   vnet/fib/fib.h				\
+  vnet/fib/fib_api.h				\
   vnet/fib/ip4_fib.h				\
   vnet/fib/ip6_fib.h				\
   vnet/fib/fib_types.h				\
   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
@@ -889,7 +959,21 @@ 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
+
+api_DATA =					\
+ vnet/devices/af_packet/af_packet.api.json	\
+ vnet/devices/netmap/netmap.api.json		\
+ vnet/devices/virtio/vhost_user.api.json	\
+ vnet/gre/gre.api.json				\
+ vnet/interface.api.json			\
+ vnet/ip/ip.api.json				\
+ vnet/l2/l2.api.json				\
+ vnet/l2tp/l2tp.api.json			\
+ vnet/map/map.api.json				\
+ vnet/span/span.api.json			\
+ vnet/unix/tap.api.json				\
+ vnet/vxlan/vxlan.api.json			\
+ vnet/vxlan-gpe/vxlan_gpe.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