Adjacency layout change and move to vnet/adj

[vpp.git] / src / vnet.am

diff --git a/src/vnet.am b/src/vnet.am
index ca24c9c..f95ec2f 100644 (file)
--- 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,8 +40,7 @@ libvnet_la_SOURCES +=                         \
   vnet/interface_format.c                      \
   vnet/interface_output.c                      \
   vnet/misc.c                                  \
-  vnet/replication.c                           \
-  vnet/rewrite.c
+  vnet/replication.c
 
 nobase_include_HEADERS +=                      \
   vnet/api_errno.h                             \
@@ -114,14 +111,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 +444,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 +459,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 +529,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 +615,6 @@ LDS = \
   libvlib.la  \
   libsvm.la \
   libsvmdb.la \
-  libvlibapi.la \
   libvlibmemory.la \
   -lpthread -ldl -lrt -lm
 
@@ -792,14 +792,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 +835,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
@@ -969,14 +962,16 @@ libvnet_la_SOURCES +=                             \
   vnet/adj/adj_mcast.c                         \
   vnet/adj/adj_l2.c                            \
   vnet/adj/adj_nsh.c                           \
-  vnet/adj/adj.c
+  vnet/adj/adj.c                               \
+  vnet/adj/rewrite.c
 
 nobase_include_HEADERS +=                      \
   vnet/adj/adj.h                               \
   vnet/adj/adj_types.h                         \
   vnet/adj/adj_glean.h                         \
   vnet/adj/adj_nsh.h                           \
-  vnet/adj/adj_nbr.h
+  vnet/adj/adj_nbr.h                           \
+  vnet/adj/rewrite.h
 
 ########################################
 # Data-Plane Objects