Adjacency layout change and move to vnet/adj

[vpp.git] / src / vnet.am

diff --git a/src/vnet.am b/src/vnet.am
index 9c55e33..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                             \
@@ -58,6 +55,7 @@ nobase_include_HEADERS +=                     \
   vnet/l3_types.h                              \
   vnet/pipeline.h                              \
   vnet/replication.h                           \
+  vnet/rewrite.h                               \
   vnet/vnet.h                                  \
   vnet/vnet_all_api_h.h                                \
   vnet/vnet_msg_enum.h                         \
@@ -446,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
@@ -618,7 +615,6 @@ LDS = \
   libvlib.la  \
   libsvm.la \
   libsvmdb.la \
-  libvlibapi.la \
   libvlibmemory.la \
   -lpthread -ldl -lrt -lm
 
@@ -966,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