From e4d5a652a392c9f74501da5778a7fe161b183476 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Sun, 24 Jun 2018 21:21:21 -0400 Subject: VCL: Refactor VCL test (part 1) Change-Id: I6a326e24ed953b1cef63bd4010a3bedd6c4a7b1c Signed-off-by: Dave Wallace --- src/vcl.am | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'src/vcl.am') diff --git a/src/vcl.am b/src/vcl.am index ccb323a033b..554ebfc893a 100644 --- a/src/vcl.am +++ b/src/vcl.am @@ -15,21 +15,21 @@ lib_LTLIBRARIES += libvppcom.la libvcl_ldpreload.la libvppcom_la_SOURCES = libvcl_ldpreload_la_SOURCES = -libvppcom_la_DEPENDENCIES = \ - libsvm.la \ +libvppcom_la_DEPENDENCIES = \ + libsvm.la \ libvlibmemoryclient.la libvppcom_la_LIBADD = $(libvppcom_la_DEPENDENCIES) -lpthread -lrt -ldl libvppcom_la_SOURCES += \ - vcl/vcl_event.c \ + vcl/vcl_event.c \ vcl/vppcom.c \ $(libvppinfra_la_SOURCES) \ $(libsvm_la_SOURCES) \ $(libvlibmemoryclient_la_SOURCES) nobase_include_HEADERS += \ - vcl/vcl_event.h \ + vcl/vcl_event.h \ vcl/vppcom.h libvcl_ldpreload_la_LIBADD = $(libvppcom_la_DEPENDENCIES) -lpthread -lrt -ldl @@ -48,8 +48,8 @@ noinst_PROGRAMS += \ vcl_test_server \ vcl_test_client \ sock_test_server \ - sock_test_client \ - test_vcl_listener_server \ + sock_test_client \ + test_vcl_listener_server \ test_vcl_listener_client @@ -64,20 +64,14 @@ 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_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 -- cgit 1.2.3-korg