X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl.am;h=45cf80c142416da29679d7a3ef727091b89d6cef;hb=993683150202254c6ba8dd43e087a7229edd5d4c;hp=763efc220f54dfa8c3fa3b463f4a462fc3614b6d;hpb=6476b3c1484eed25eeab23774a248a3f8593578e;p=vpp.git

diff --git a/src/vcl.am b/src/vcl.am
index 763efc220f5..45cf80c1424 100644
--- a/src/vcl.am
+++ b/src/vcl.am
@@ -15,59 +15,68 @@ lib_LTLIBRARIES += libvppcom.la libvcl_ldpreload.la
 
 libvppcom_la_SOURCES =
 libvcl_ldpreload_la_SOURCES =
-libvppcom_la_DEPENDENCIES = 	\
-	libvppinfra.la		\
-	libvlib.la		\
-	libsvm.la 		\
+libvppcom_la_DEPENDENCIES =			\
+	libsvm.la				\
 	libvlibmemoryclient.la
 
-libvppcom_la_LIBADD = $(libvppcom_la_DEPENDENCIES) -lpthread -lrt
-libvcl_ldpreload_la_LIBADD = -lpthread -lrt -ldl
+libvppcom_la_LIBADD = $(libvppcom_la_DEPENDENCIES) -lpthread -lrt -ldl
 
 libvppcom_la_SOURCES +=				\
-  vcl/vppcom.c
+  vcl/vppcom.c					\
+  vcl/vcl_bapi.c				\
+  vcl/vcl_cfg.c					\
+  vcl/vcl_debug.h				\
+  vcl/vcl_event.c				\
+  vcl/vcl_private.h				\
+  vcl/vcl_private.c				\
+  $(libvppinfra_la_SOURCES)			\
+  $(libsvm_la_SOURCES)				\
+  $(libvlibmemoryclient_la_SOURCES)
 
 nobase_include_HEADERS +=			\
+  vcl/vcl_event.h				\
   vcl/vppcom.h
 
+libvcl_ldpreload_la_LIBADD =  $(libvppcom_la_DEPENDENCIES) -lpthread -lrt -ldl
+
 libvcl_ldpreload_la_SOURCES +=			\
-  vcl/vcom_socket_wrapper.c			\
-  vcl/vcom.c					\
-  vcl/vcom_socket.c				\
-  $(libvppcom_la_SOURCES)			\
-  $(libvppinfra_la_SOURCES)			\
-  $(libvlib_la_SOURCES)				\
-  $(libsvm_la_SOURCES)				\
-  $(libvlibmemoryclient_la_SOURCES)
+  vcl/ldp_socket_wrapper.c			\
+  vcl/ldp.c					\
+  $(libvppcom_la_SOURCES)
 
 nobase_include_HEADERS +=			\
-  vcl/vcom_socket_wrapper.h			\
-  vcl/vcom_glibc_socket.h			\
-  vcl/vcom.h					\
-  vcl/vcom_socket.h
+  vcl/ldp_socket_wrapper.h			\
+  vcl/ldp_glibc_socket.h			\
+  vcl/ldp.h
 
 noinst_PROGRAMS +=				\
 	vcl_test_server				\
 	vcl_test_client				\
 	sock_test_server			\
-	sock_test_client
+	sock_test_client			\
+	test_vcl_listener_server		\
+	test_vcl_listener_client
+
+
+test_vcl_listener_server_SOURCES = vcl/test_vcl_listener_server.c
+test_vcl_listener_server_LDADD = libvppcom.la
+
+test_vcl_listener_client_SOURCES = vcl/test_vcl_listener_client.c
+test_vcl_listener_client_LDADD = libvppcom.la
 
 vcl_test_server_SOURCES = vcl/vcl_test_server.c
 vcl_test_server_LDADD = libvppcom.la
 
-vcl_test_client_SOURCES = vcl/vcl_test_client.c
 
-# Link libvcl_ldpreload.la instead of vppcom.la
-# to validate that all symbols are included in
-# libvcl_ldpreload.la at build time.
-#
-# Not recommended for production VCL apps as
-# it includes extraneous code which will never
-# be executed.
-vcl_test_client_LDADD = libvcl_ldpreload.la
+vcl_test_client_SOURCES = vcl/vcl_test_client.c
+vcl_test_client_LDADD = libvppcom.la
 
 sock_test_server_SOURCES = vcl/sock_test_server.c
 sock_test_client_SOURCES = vcl/sock_test_client.c
 
 nobase_include_HEADERS +=			\
-  vcl/sock_test.h
+  vcl/sock_test_common.h			\
+  vcl/sock_test.h				\
+  vcl/vcl_test.h
+
+# vi:syntax=automake