# See the License for the specific language governing permissions and
# limitations under the License.
-libvnet_la_SOURCES =
-libvnetplugin_la_SOURCES =
+lib_LTLIBRARIES += libvnet.la
-libvnet_la_LIBADD = libvppinfra.la libsvm.la
-libvnet_la_DEPENDENCIES = libvppinfra.la libvlib.la libsvmdb.la libsvm.la libvlibapi.la libvlibmemory.la libvlibmemoryclient.la
+libvnet_la_SOURCES =
+libvnet_la_DEPENDENCIES = \
+ libvppinfra.la \
+ libvlib.la \
+ libsvmdb.la \
+ libsvm.la \
+ libvlibapi.la \
+ libvlibmemory.la \
+ libvlibmemoryclient.la
+
+libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt $(DPDK_LD_ADD)
+libvnet_la_LDFLAGS = $(DPDK_LD_FLAGS)
if WITH_IPV6SR
libvnet_la_LIBADD += -lcrypto
libsvmdb.la \
libvlibapi.la \
libvlibmemory.la \
- -lpthread -ldl -lrt -lm -lcrypto
+ -lpthread -ldl -lrt -lm
TESTS += test_cp_serdes test_lisp_types
test_cp_serdes_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
test_lisp_types_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_cp_serdes_LDFLAGS = $(DPDK_LD_FLAGS)
-test_cp_serdes_LDADD = $(LDS) $(DPDK_LD_ADD)
-test_lisp_types_LDFLAGS = $(DPDK_LD_FLAGS)
-test_lisp_types_LDADD = $(LDS) $(DPDK_LD_ADD)
+test_cp_serdes_LDADD = $(LDS)
+test_lisp_types_LDADD = $(LDS)
endif
########################################
########################################
if WITH_DPDK
libvnet_la_SOURCES += \
+ vnet/devices/dpdk/buffer.c \
vnet/devices/dpdk/dpdk_priv.h \
vnet/devices/dpdk/device.c \
vnet/devices/dpdk/format.c \
vnet/devices/dpdk/init.c \
vnet/devices/dpdk/node.c \
+ vnet/devices/dpdk/thread.c \
vnet/devices/dpdk/hqos.c \
vnet/devices/dpdk/cli.c \
vnet/devices/dpdk/dpdk_api.c
# Plugin client library
########################################
-libvnetplugin_la_SOURCES += \
- vnet/plugin/p1.c
-
nobase_include_HEADERS += \
vnet/plugin/plugin.h
-libvnetdir = ${libdir}
-libvnet_LTLIBRARIES = libvnet.la libvnetplugin.la
-
pcap2pg_SOURCES = \
vnet/unix/pcap2pg.c \
vnet/unix/pcap.h