X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Furi.am;h=660f897dd713bc6dd109e1c356db6d908150521c;hb=d3c008d108aa2187d1a2afe2833b4de25ca2c2ab;hp=8cdd77c6a8c9f1e267d8c9e8395fbd8e55e41556;hpb=68b0fb0c620c7451ef1a6380c43c39de6614db51;p=vpp.git

diff --git a/src/uri.am b/src/uri.am
index 8cdd77c6a8c..660f897dd71 100644
--- a/src/uri.am
+++ b/src/uri.am
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2017 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -11,12 +11,57 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-noinst_PROGRAMS += uri_udp_test2 uri_tcp_test
+lib_LTLIBRARIES += libvppcom.la
 
-uri_udp_test2_SOURCES = uri/uri_udp_test2.c			
-uri_udp_test2_LDADD = libvlibmemoryclient.la libvlibapi.la libsvm.la \
-	libvppinfra.la -lpthread -lm -lrt 
+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 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 \
-	libvppinfra.la -lpthread -lm -lrt 
+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