X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=823dd0d69654733556d526bb7da2cc9371a84440;hb=8db1de83ec540e01bb0577b726770bbb2338edcb;hp=ca24c9c596e8f367accf7cee9c29ada15078de8b;hpb=6f6f52aeb689fdaee628e7fa132749928694f01f;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index ca24c9c596e..823dd0d6965 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -19,9 +19,7 @@ libvnet_la_DEPENDENCIES = \
 	libvlib.la		\
 	libsvmdb.la		\
 	libsvm.la 		\
-	libvlibapi.la		\
-	libvlibmemory.la	\
-	libvlibmemoryclient.la
+	libvlibmemory.la
 
 libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt
 
@@ -42,7 +40,7 @@ libvnet_la_SOURCES +=				\
   vnet/interface_format.c			\
   vnet/interface_output.c			\
   vnet/misc.c					\
-  vnet/replication.c				\
+  vnet/replication.c                            \
   vnet/rewrite.c
 
 nobase_include_HEADERS +=			\
@@ -114,14 +112,16 @@ libvnet_la_SOURCES +=				\
  vnet/ethernet/init.c				\
  vnet/ethernet/interface.c			\
  vnet/ethernet/node.c				\
- vnet/ethernet/pg.c
+ vnet/ethernet/pg.c				\
+ vnet/ethernet/sfp.c
 
 nobase_include_HEADERS +=			\
  vnet/ethernet/arp_packet.h			\
  vnet/ethernet/error.def			\
  vnet/ethernet/ethernet.h			\
  vnet/ethernet/packet.h				\
- vnet/ethernet/types.def
+ vnet/ethernet/types.def			\
+ vnet/ethernet/sfp.h
 
 ########################################
 # Layer 2 protocol: Ethernet bridging
@@ -445,8 +445,7 @@ test_map_SOURCES =                             \
 test_map_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 
 test_map_LDADD = libvnet.la libvppinfra.la libvlib.la	\
-  -lpthread -lvlibmemory -lvlibapi \
-  -ldl -lsvm -lrt
+  -lpthread -lvlibmemory -ldl -lsvm -lrt
 
 test_map_LDFLAGS = -static
 endif
@@ -461,12 +460,15 @@ libvnet_la_SOURCES +=				\
  vnet/tcp/tcp_output.c				\
  vnet/tcp/tcp_input.c				\
  vnet/tcp/tcp_newreno.c				\
+ vnet/tcp/builtin_client.c			\
  vnet/tcp/builtin_server.c			\
+ vnet/tcp/tcp_test.c				\
  vnet/tcp/tcp.c
 
 nobase_include_HEADERS +=			\
  vnet/tcp/tcp_packet.h				\
  vnet/tcp/tcp_timer.h				\
+ vnet/tcp/tcp_debug.h				\
  vnet/tcp/tcp.h
 
 ########################################
@@ -528,7 +530,7 @@ libvnet_la_SOURCES +=				\
  vnet/mpls/mpls_lookup.c			\
  vnet/mpls/mpls_output.c			\
  vnet/mpls/mpls_features.c			\
- vnet/mpls/node.c				\
+ vnet/mpls/mpls_input.c				\
  vnet/mpls/interface.c			        \
  vnet/mpls/mpls_tunnel.c		        \
  vnet/mpls/pg.c			        \
@@ -614,7 +616,6 @@ LDS = \
   libvlib.la  \
   libsvm.la \
   libsvmdb.la \
-  libvlibapi.la \
   libvlibmemory.la \
   -lpthread -ldl -lrt -lm
 
@@ -792,14 +793,6 @@ nobase_include_HEADERS +=			\
   vnet/pg/pg.h					\
   vnet/pg/edit.h
 
-if !WITH_DPDK
-libvnet_la_SOURCES +=				\
-  vnet/devices/nic/ixge.c                       \
-  vnet/devices/nic/ixge.h                       \
-  vnet/devices/nic/sfp.c                        \
-  vnet/devices/nic/sfp.h
-endif
-
 ########################################
 # virtio
 ########################################
@@ -843,6 +836,7 @@ nobase_include_HEADERS +=			\
   vnet/session/application.h			\
   vnet/session/transport.h			\
   vnet/session/application_interface.h		\
+  vnet/session/session_debug.h			\
   vnet/session/session.api.h
 
 API_FILES += vnet/session/session.api