api: refactor vlibmemory

[vpp.git] / src / vlib-api.am

diff --git a/src/vlib-api.am b/src/vlib-api.am
index c05929b..f1fdb8d 100644 (file)
--- a/src/vlib-api.am
+++ b/src/vlib-api.am
@@ -11,71 +11,63 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-lib_LTLIBRARIES += libvlibmemory.la libvlibapi.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
 libvlibmemory_la_SOURCES =                     \
+       vlibapi/api.h                           \
+        vlibapi/api_helper_macros.h            \
+       vlibapi/api_shared.c                    \
+       vlibapi/node_serialize.c                \
        vlibmemory/api.h                        \
        vlibmemory/memclnt.api                  \
+       vlibmemory/memory_api.c                 \
        vlibmemory/memory_shared.c              \
-       vlibmemory/memory_vlib.c                \
+       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         \
-       vlibmemory/unix_shared_memory_queue.c   \
-       vlibmemory/unix_shared_memory_queue.h
+       vlibmemory/vl_memory_msg_enum.h
 
-libvlibapi_la_DEPENDENCIES = libvppinfra.la libvlib.la libvlibmemory.la
-libvlibapi_la_LIBADD = $(libvlibapi_la_DEPENDENCIES)
-libvlibapi_la_SOURCES =                        \
+nobase_include_HEADERS +=                      \
        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 vlibapi/vat_helper_macros.h
+       vlibapi/api_common.h                    \
+       vlibapi/api_helper_macros.h             \
+       vlibapi/vat_helper_macros.h
 
-libvlibmemoryclient_la_DEPENDENCIES = libvppinfra.la libsvm.la libvlib.la libvlibmemory.la libvlibapi.la
+libvlibmemoryclient_la_DEPENDENCIES = libvppinfra.la libsvm.la
 libvlibmemoryclient_la_LIBADD = $(libvlibmemoryclient_la_DEPENDENCIES) -lpthread
 libvlibmemoryclient_la_SOURCES =               \
-       vlibmemory/api.h                        \
+        vlibapi/api_helper_macros.h            \
+       vlibapi/api_shared.c                    \
+       vlibapi/node_serialize.c                \
        vlibmemory/memclnt.api                  \
-       vlibmemory/memory_shared.c              \
        vlibmemory/memory_client.c              \
+       vlibmemory/memory_shared.c              \
+       vlibmemory/socket_client.c              \
        vlibmemory/vl_memory_api_h.h            \
-       vlibmemory/vl_memory_msg_enum.h         \
-       vlibmemory/unix_shared_memory_queue.c   \
-       vlibmemory/unix_shared_memory_queue.h
+       vlibmemory/vl_memory_msg_enum.h
 
 nobase_include_HEADERS +=                      \
        vlibmemory/api.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 libvlibapi.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               \
+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