diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2017-10-24 04:12:18 -0400 |
|---|---|---|
| committer |   Keith Burns <alagalah@gmail.com> | 2017-10-24 18:25:31 +0000 |
| commit | 5c7cf1cc5358d137160be1619981e7eea9a7402f (patch) | |
| tree | e981f6fc831e9c4e240e765d506ac8d58be43123 /src/uri.am | |
| parent | 4c151b5fa13312639b0a5ef0d0efb1866bf4ed5e (diff) | |
VCL-LDPRELOAD: statically link vppcom into libvcl-ldpreload.so
- Move VCL & VCL-LDPRELOAD source into src/vcl
- Statically link vppcom into libvcl-ldpreload.so
Change-Id: I778300b37e8b06640d9dbc01caf297edf7a6edb7
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'src/uri.am')
| -rw-r--r-- | src/uri.am | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/src/uri.am b/src/uri.am index 660f897dd71..176eac88859 100644 --- a/src/uri.am +++ b/src/uri.am @@ -11,34 +11,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -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_socket_server uri_udp_test_SOURCES = uri/uri_udp_test.c uri_udp_test_LDADD = libvlibmemoryclient.la libsvm.la \ @@ -49,19 +26,8 @@ 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_test_LDADD = libvppinfra.la libvcl_ldpreload.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 +uri_socket_server_LDADD = libvppinfra.la libvcl_ldpreload.la -lpthread -lm -lrt -nobase_include_HEADERS += \ - uri/sock_test.h |