X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib-api.am;h=f1fdb8d2228bb6fa1b151b5afeb8f86436396ed4;hb=0012fccda812cb4625355baaf5e76dab4cefcdb5;hp=677811bc8956594f32b8e8f5064188209f644e3d;hpb=58eb866b15a45514dc356170f28640d6c9db8034;p=vpp.git

diff --git a/src/vlib-api.am b/src/vlib-api.am
index 677811bc895..f1fdb8d2228 100644
--- a/src/vlib-api.am
+++ b/src/vlib-api.am
@@ -11,8 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-lib_LTLIBRARIES += libvlibmemory.la libvlibmemoryclient.la \
-	           libvlibsocket.la
+lib_LTLIBRARIES += libvlibmemory.la libvlibmemoryclient.la
 
 libvlibmemory_la_DEPENDENCIES = libvppinfra.la libsvm.la libvlib.la
 libvlibmemory_la_LIBADD = $(libvlibmemory_la_DEPENDENCIES) -lpthread
@@ -23,14 +22,16 @@ libvlibmemory_la_SOURCES =			\
 	vlibapi/node_serialize.c		\
 	vlibmemory/api.h			\
 	vlibmemory/memclnt.api			\
+	vlibmemory/memory_api.c			\
 	vlibmemory/memory_shared.c		\
-	vlibmemory/memory_vlib.c		\
-	vlibmemory/unix_shared_memory_queue.c	\
-	vlibmemory/unix_shared_memory_queue.h	\
+	vlibmemory/socket_api.c			\
+	vlibmemory/vlib_api.c			\
+	vlibmemory/vlib_api_cli.c		\
 	vlibmemory/vl_memory_api_h.h		\
 	vlibmemory/vl_memory_msg_enum.h
 
-nobase_include_HEADERS += vlibapi/api.h		\
+nobase_include_HEADERS += 			\
+	vlibapi/api.h				\
 	vlibapi/api_common.h			\
 	vlibapi/api_helper_macros.h		\
 	vlibapi/vat_helper_macros.h
@@ -40,45 +41,33 @@ libvlibmemoryclient_la_LIBADD = $(libvlibmemoryclient_la_DEPENDENCIES) -lpthread
 libvlibmemoryclient_la_SOURCES = 		\
         vlibapi/api_helper_macros.h		\
 	vlibapi/api_shared.c			\
-	vlibapi/node_unserialize.c		\
-	vlibmemory/api.h			\
+	vlibapi/node_serialize.c		\
 	vlibmemory/memclnt.api			\
 	vlibmemory/memory_client.c		\
 	vlibmemory/memory_shared.c		\
-	vlibmemory/unix_shared_memory_queue.c	\
-	vlibmemory/unix_shared_memory_queue.h	\
+	vlibmemory/socket_client.c		\
 	vlibmemory/vl_memory_api_h.h		\
 	vlibmemory/vl_memory_msg_enum.h
 
 nobase_include_HEADERS +=			\
 	vlibmemory/api.h			\
-	vlibmemory/api_common.h			\
+	vlibmemory/memory_api.h			\
+	vlibmemory/memory_shared.h		\
+	vlibmemory/memory_client.h		\
+	vlibmemory/socket_api.h			\
+	vlibmemory/socket_client.h		\
 	vlibmemory/vl_memory_api_h.h		\
 	vlibmemory/vl_memory_msg_enum.h		\
-	vlibmemory/unix_shared_memory_queue.h 	\
 	vlibmemory/memclnt.api.h
 
-libvlibsocket_la_DEPENDENCIES = libvppinfra.la libvlib.la libvlibmemory.la
-libvlibsocket_la_LIBADD = $(libvlibsocket_la_DEPENDENCIES)
-libvlibsocket_la_SOURCES =			\
-	vlibsocket/api.h			\
-	vlibsocket/sockclnt.api			\
-	vlibsocket/sockclnt_vlib.c		\
-	vlibsocket/socksvr_vlib.c		\
-	vlibsocket/vl_socket_api_h.h		\
-	vlibsocket/vl_socket_msg_enum.h
-
-nobase_include_HEADERS +=			\
-	vlibsocket/api.h			\
-	vlibsocket/vl_socket_api_h.h		\
-	vlibsocket/vl_socket_msg_enum.h		\
-	vlibsocket/sockclnt.api.h
-
 BUILT_SOURCES +=				\
-	vlibsocket/sockclnt.api.h		\
 	vlibmemory/memclnt.api.h		\
 	vlibmemory/memclnt.api.json
 
-API_FILES += vlibmemory/memclnt.api
+noinst_PROGRAMS += sock_test
+
+sock_test_SOURCES = vlibsocket/sock_test.c
+
+API_FILES += vlibmemory/memclnt.api 
 
 # vi:syntax=automake