X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib-api.am;h=5bbd4599729a45b10a9711a72ba6d0531529f89f;hb=faf9d7730828b80814a233eeecf7affc046193d3;hp=128cc07a1d54b76d65694761bd8bb0aa1f33eaad;hpb=45a00c44d1dd893474819e88a7d7eed1c7947c4d;p=vpp.git

diff --git a/src/vlib-api.am b/src/vlib-api.am
index 128cc07a1d5..5bbd4599729 100644
--- a/src/vlib-api.am
+++ b/src/vlib-api.am
@@ -11,71 +11,62 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-lib_LTLIBRARIES += libvlibapi.la libvlibmemory.la libvlibmemoryclient.la \
-	           libvlibsocket.la
+lib_LTLIBRARIES += libvlibmemory.la libvlibmemoryclient.la
 
-libvlibapi_la_LIBADD = libvppinfra.la
-libvlibapi_la_DEPENDENCIES = libvppinfra.la libvlib.la
-libvlibapi_la_SOURCES = 			\
+libvlibmemory_la_DEPENDENCIES = libvppinfra.la libsvm.la libvlib.la
+libvlibmemory_la_LIBADD = $(libvlibmemory_la_DEPENDENCIES) -lpthread
+libvlibmemory_la_SOURCES =			\
 	vlibapi/api.h				\
         vlibapi/api_helper_macros.h		\
 	vlibapi/api_shared.c			\
-	vlibapi/node_serialize.c
-
-nobase_include_HEADERS += vlibapi/api.h vlibapi/api_helper_macros.h
-
-libvlibmemory_la_LIBADD = libvppinfra.la libsvm.la -lpthread
-libvlibmemory_la_DEPENDENCIES = libvppinfra.la libsvm.la libvlib.la
-libvlibmemory_la_SOURCES =			\
+	vlibapi/node_serialize.c		\
 	vlibmemory/api.h			\
 	vlibmemory/memclnt.api			\
 	vlibmemory/memory_shared.c		\
 	vlibmemory/memory_vlib.c		\
-	vlibmemory/vl_memory_api_h.h		\
-	vlibmemory/vl_memory_msg_enum.h		\
+	vlibmemory/socksvr_vlib.c		\
 	vlibmemory/unix_shared_memory_queue.c	\
-	vlibmemory/unix_shared_memory_queue.h
+	vlibmemory/unix_shared_memory_queue.h	\
+	vlibmemory/vl_memory_api_h.h		\
+	vlibmemory/vl_memory_msg_enum.h
 
-libvlibmemoryclient_la_LIBADD = libvppinfra.la libsvm.la -lpthread
-libvlibmemoryclient_la_DEPENDENCIES = libvppinfra.la libsvm.la libvlib.la
+nobase_include_HEADERS += vlibapi/api.h		\
+	vlibapi/api_common.h			\
+	vlibapi/api_helper_macros.h		\
+	vlibapi/vat_helper_macros.h
+
+libvlibmemoryclient_la_DEPENDENCIES = libvppinfra.la libsvm.la
+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			\
 	vlibmemory/memclnt.api			\
-	vlibmemory/memory_shared.c		\
 	vlibmemory/memory_client.c		\
-	vlibmemory/vl_memory_api_h.h		\
-	vlibmemory/vl_memory_msg_enum.h		\
+	vlibmemory/memory_shared.c		\
+	vlibmemory/socket_client.c		\
 	vlibmemory/unix_shared_memory_queue.c	\
-	vlibmemory/unix_shared_memory_queue.h
+	vlibmemory/unix_shared_memory_queue.h	\
+	vlibmemory/vl_memory_api_h.h		\
+	vlibmemory/vl_memory_msg_enum.h
 
 nobase_include_HEADERS +=			\
 	vlibmemory/api.h			\
+	vlibmemory/api_common.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_LIBADD = libvppinfra.la
-libvlibsocket_la_DEPENDENCIES = libvppinfra.la
-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		\
+BUILT_SOURCES +=				\
 	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