X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=baddaf30544ea90eee9374c45250d797f2432e33;hb=4c64b6edc86f7732f4a160b948b3386e4021a265;hp=d6a5d524e537985516b4e96bc0b6ee85182e36c8;hpb=17ff3c1fa5687255a118c53223fa2cd49132d929;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index d6a5d524e53..baddaf30544 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -117,7 +117,6 @@ API_FILES += vnet/cop/cop.api
 # Layer 2 protocol: Ethernet
 ########################################
 libvnet_la_SOURCES +=				\
- vnet/ethernet/arp.c				\
  vnet/ethernet/format.c				\
  vnet/ethernet/init.c				\
  vnet/ethernet/interface.c			\
@@ -132,7 +131,6 @@ libvnet_multiversioning_sources +=		\
  vnet/l2/l2_output.c
 
 nobase_include_HEADERS +=			\
- vnet/ethernet/arp_packet.h			\
  vnet/ethernet/error.def			\
  vnet/ethernet/ethernet.h			\
  vnet/ethernet/packet.h				\
@@ -350,6 +348,7 @@ libvnet_la_SOURCES +=				\
  vnet/ip/icmp4.c				\
  vnet/ip/icmp6.c				\
  vnet/ip/ip46_cli.c				\
+ vnet/ip/ip_types_api.c				\
  vnet/ip/ip4_format.c				\
  vnet/ip/ip4_forward.c				\
  vnet/ip/ip4_punt_drop.c			\
@@ -418,8 +417,19 @@ API_FILES += 					\
  vnet/ip/punt.api
 
 libvnet_multiversioning_sources +=		\
+ vnet/ip/ip4_forward.c				\
  vnet/ip/ip4_input.c
 
+########################################
+# Layer 2/3 ARP
+########################################
+libvnet_la_SOURCES +=               \
+ vnet/ethernet/arp.c
+
+nobase_include_HEADERS +=           \
+ vnet/ethernet/arp_packet.h         \
+ vnet/ethernet/arp.h
+
 ########################################
 # Bidirectional Forwarding Detection
 ########################################
@@ -500,7 +510,6 @@ libvnet_la_SOURCES +=				\
  vnet/tcp/tcp_output.c				\
  vnet/tcp/tcp_input.c				\
  vnet/tcp/tcp_newreno.c				\
- vnet/tcp/tcp_test.c				\
  vnet/tcp/tcp.c
 
 nobase_include_HEADERS +=			\
@@ -508,6 +517,7 @@ nobase_include_HEADERS +=			\
  vnet/tcp/tcp_timer.h				\
  vnet/tcp/tcp_debug.h				\
  vnet/tcp/tcp.h					\
+ vnet/tcp/tcp_error.def				\
  vnet/tcp/tcp.api.h
 
 API_FILES += vnet/tcp/tcp.api
@@ -917,16 +927,22 @@ API_FILES += vnet/pg/pg.api
 libvnet_la_SOURCES +=				\
   vnet/devices/virtio/device.c			\
   vnet/devices/virtio/node.c			\
-  vnet/devices/virtio/vhost-user.c		\
+  vnet/devices/virtio/vhost_user.c		\
+  vnet/devices/virtio/vhost_user_input.c	\
+  vnet/devices/virtio/vhost_user_output.c	\
   vnet/devices/virtio/vhost_user_api.c		\
   vnet/devices/virtio/virtio.c
 
 
 nobase_include_HEADERS +=			\
   vnet/devices/virtio/virtio.h			\
-  vnet/devices/virtio/vhost-user.h		\
+  vnet/devices/virtio/vhost_user.h		\
   vnet/devices/virtio/vhost_user.api.h
 
+libvnet_multiversioning_sources +=		\
+  vnet/devices/virtio/vhost_user_input.c	\
+  vnet/devices/virtio/vhost_user_output.c
+
 API_FILES += vnet/devices/virtio/vhost_user.api
 
 ########################################
@@ -953,7 +969,8 @@ libvnet_la_SOURCES += 				\
   vnet/devices/pipe/pipe.c
 
 nobase_include_HEADERS += 			\
-  vnet/devices/pipe/pipe.h
+  vnet/devices/pipe/pipe.h			\
+  vnet/devices/pipe/pipe.api.h
 
 API_FILES += vnet/devices/pipe/pipe.api