X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Furi.am;h=ae6feb6f35b591d7ce1efd14c6455b60d988f794;hb=28ab9cc13bb0b6adf68277f12cfcd33b69f40b00;hp=09b5b15b13e00b09ef526a6125a30b3d93780f08;hpb=e04c29942af6a130591059679531c9ffa3d7237a;p=vpp.git

diff --git a/src/uri.am b/src/uri.am
index 09b5b15b13e..ae6feb6f35b 100644
--- a/src/uri.am
+++ b/src/uri.am
@@ -11,12 +11,57 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-noinst_PROGRAMS += uri_udp_test uri_tcp_test
+lib_LTLIBRARIES += libvppcom.la
+
+libvppcom_la_SOURCES =
+libvppcom_la_DEPENDENCIES = 	\
+	libvppinfra.la		\
+	libvlib.la		\
+	libsvmdb.la		\
+	libsvm.la 		\
+	libvlibmemory.la 	\
+	libvlibmemoryclient.la
+
+libvppcom_la_LIBADD = $(libvppcom_la_DEPENDENCIES) -lpthread
+
+libvppcom_la_SOURCES +=				\
+  uri/vppcom.c
+
+nobase_include_HEADERS +=			\
+  uri/vppcom.h
+
+noinst_PROGRAMS +=				\
+	uri_udp_test				\
+	uri_tcp_test				\
+	uri_socket_test				\
+	uri_socket_server			\
+	vcl_test_server				\
+	vcl_test_client				\
+	sock_test_server			\
+	sock_test_client
 
 uri_udp_test_SOURCES = uri/uri_udp_test.c
-uri_udp_test_LDADD = libvlibmemoryclient.la libvlibapi.la libsvm.la \
+uri_udp_test_LDADD = libvlibmemoryclient.la libsvm.la \
 	libvppinfra.la -lpthread -lm -lrt
 
 uri_tcp_test_SOURCES = uri/uri_tcp_test.c
-uri_tcp_test_LDADD = libvlibmemoryclient.la libvlibapi.la libsvm.la \
+uri_tcp_test_LDADD = libvlibmemoryclient.la libsvm.la \
 	libvppinfra.la -lpthread -lm -lrt
+
+uri_socket_test_SOURCES = uri/uri_socket_test.c
+uri_socket_test_LDADD = libvppinfra.la -lpthread -lm -lrt
+
+uri_socket_server_SOURCES = uri/uri_socket_server.c
+uri_socket_server_LDADD = libvppinfra.la -lpthread -lm -lrt
+
+vcl_test_server_SOURCES = uri/vcl_test_server.c
+vcl_test_server_LDADD = libvppcom.la
+
+vcl_test_client_SOURCES = uri/vcl_test_client.c
+vcl_test_client_LDADD = libvppcom.la 
+
+sock_test_server_SOURCES = uri/sock_test_server.c
+sock_test_client_SOURCES = uri/sock_test_client.c
+
+nobase_include_HEADERS +=			\
+  uri/sock_test.h