SPAN API: Fix various errors making SPAN break make tests.

[vpp.git] / vnet / Makefile.am

diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index 7cf19eb..930d6bb 100644 (file)
--- a/vnet/Makefile.am
+++ b/vnet/Makefile.am
@@ -15,8 +15,17 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 
 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
+BUILT_SOURCES =                                \
+ 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/map/map.api.h                            \
+ vnet/map/map.api.json                         \
+ vnet/span/span.api.h                          \
+ vnet/span/span.api.json
 
 libvnet_la_SOURCES =
 libvnetplugin_la_SOURCES =
@@ -294,6 +303,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                                  \
@@ -313,6 +323,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                           \
@@ -393,17 +404,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
@@ -660,10 +673,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
 
 ########################################
@@ -815,6 +830,7 @@ 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                         \
@@ -896,7 +912,13 @@ 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
+
+api_DATA =                                     \
+ vnet/interface.api.json                       \
+ vnet/ip/ip.api.json                           \
+ vnet/l2/l2.api.json                           \
+ vnet/map/map.api.json                         \
+ vnet/span/span.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